[i2c] [PATCH 09/12, updated] i2c-algo-bit: Discard the mdelay data struct member
Jean Delvare
khali at linux-fr.org
Sun Aug 27 11:46:49 CEST 2006
Hi Greg,
Please replace with this new version of the patch.
Adrian Bunk pointed out that I had missed driver scx200_i2c, I merged
his fixup patch in this new version.
Adrian Bunk also pointed out that the original patch improperly included
driver i2c-elektor, which does not rely on i2c-algo-bit but
i2c-algo-pcf. The new version excludes i2c-elektor. I'll provide a
separate patch for i2c-algo-pcf, which also has an unused "mdelay"
struct member.
Thanks.
* * * * *
Content-Disposition: inline; filename=i2c-algo-bit-kill-mdelay.patch
i2c-algo-bit: Discard the mdelay data struct member
The i2c_algo_bit_data structure has an mdelay member, which is not
used by the algorithm code (the code has always been ifdef'd out.)
Let's discard it to save some code and memory.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Mauro Carvalho Chehab <mchehab at brturbo.com.br>
Cc: Adrian Bunk <bunk at stusta.de>
---
drivers/acorn/char/i2c.c | 1 -
drivers/i2c/algos/i2c-algo-bit.c | 4 ----
drivers/i2c/busses/i2c-hydra.c | 1 -
drivers/i2c/busses/i2c-i810.c | 2 --
drivers/i2c/busses/i2c-ixp2000.c | 1 -
drivers/i2c/busses/i2c-ixp4xx.c | 1 -
drivers/i2c/busses/i2c-parport-light.c | 1 -
drivers/i2c/busses/i2c-parport.c | 1 -
drivers/i2c/busses/i2c-prosavage.c | 1 -
drivers/i2c/busses/i2c-savage4.c | 1 -
drivers/i2c/busses/i2c-via.c | 1 -
drivers/i2c/busses/i2c-voodoo3.c | 2 --
drivers/i2c/busses/scx200_i2c.c | 12 ++++++------
drivers/ieee1394/pcilynx.c | 1 -
drivers/media/video/bt8xx/bttv-i2c.c | 1 -
drivers/media/video/cx88/cx88-i2c.c | 1 -
drivers/media/video/cx88/cx88-vp3054-i2c.c | 1 -
drivers/media/video/zoran_card.c | 1 -
drivers/video/i810/i810-i2c.c | 1 -
drivers/video/matrox/i2c-matroxfb.c | 1 -
drivers/video/savage/savagefb-i2c.c | 1 -
include/linux/i2c-algo-bit.h | 1 -
22 files changed, 6 insertions(+), 32 deletions(-)
--- linux-2.6.18-rc4.orig/drivers/i2c/algos/i2c-algo-bit.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/algos/i2c-algo-bit.c 2006-08-27 10:44:34.000000000 +0200
@@ -354,10 +354,6 @@
return (retval<0)? retval : -EFAULT;
/* got a better one ?? */
}
-#if 0
- /* from asm/delay.h */
- __delay(adap->mdelay * (loops_per_sec / 1000) );
-#endif
}
return wrcount;
}
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-hydra.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-hydra.c 2006-08-26 18:42:55.000000000 +0200
@@ -99,7 +99,6 @@
.getsda = hydra_bit_getsda,
.getscl = hydra_bit_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = HZ
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-i810.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-i810.c 2006-08-26 18:42:55.000000000 +0200
@@ -166,7 +166,6 @@
.getsda = bit_i810i2c_getsda,
.getscl = bit_i810i2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT,
};
@@ -182,7 +181,6 @@
.getsda = bit_i810ddc_getsda,
.getscl = bit_i810ddc_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT,
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-ixp2000.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-ixp2000.c 2006-08-26 18:42:55.000000000 +0200
@@ -114,7 +114,6 @@
drv_data->algo_data.getsda = ixp2000_bit_getsda;
drv_data->algo_data.getscl = ixp2000_bit_getscl;
drv_data->algo_data.udelay = 6;
- drv_data->algo_data.mdelay = 6;
drv_data->algo_data.timeout = 100;
drv_data->adapter.id = I2C_HW_B_IXP2000,
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-ixp4xx.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-ixp4xx.c 2006-08-26 18:42:55.000000000 +0200
@@ -122,7 +122,6 @@
drv_data->algo_data.getsda = ixp4xx_bit_getsda;
drv_data->algo_data.getscl = ixp4xx_bit_getscl;
drv_data->algo_data.udelay = 10;
- drv_data->algo_data.mdelay = 10;
drv_data->algo_data.timeout = 100;
drv_data->adapter.id = I2C_HW_B_IXP4XX;
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-parport-light.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-parport-light.c 2006-08-26 18:42:55.000000000 +0200
@@ -103,7 +103,6 @@
.getsda = parport_getsda,
.getscl = parport_getscl,
.udelay = 50,
- .mdelay = 50,
.timeout = HZ,
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-parport.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-parport.c 2006-08-26 21:00:31.000000000 +0200
@@ -138,7 +138,6 @@
.getsda = parport_getsda,
.getscl = parport_getscl,
.udelay = 60,
- .mdelay = 60,
.timeout = HZ,
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-prosavage.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-prosavage.c 2006-08-26 18:42:55.000000000 +0200
@@ -180,7 +180,6 @@
p->algo.getsda = bit_s3via_getsda;
p->algo.getscl = bit_s3via_getscl;
p->algo.udelay = CYCLE_DELAY;
- p->algo.mdelay = CYCLE_DELAY;
p->algo.timeout = TIMEOUT;
p->algo.data = p;
p->mmvga = mmvga;
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-savage4.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-savage4.c 2006-08-26 18:42:55.000000000 +0200
@@ -140,7 +140,6 @@
.getsda = bit_savi2c_getsda,
.getscl = bit_savi2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-via.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-via.c 2006-08-26 18:42:55.000000000 +0200
@@ -81,7 +81,6 @@
.getsda = bit_via_getsda,
.getscl = bit_via_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = HZ
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-voodoo3.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-voodoo3.c 2006-08-26 18:42:55.000000000 +0200
@@ -160,7 +160,6 @@
.getsda = bit_vooi2c_getsda,
.getscl = bit_vooi2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT
};
@@ -177,7 +176,6 @@
.getsda = bit_vooddc_getsda,
.getscl = bit_vooddc_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT
};
--- linux-2.6.18-rc4.orig/drivers/ieee1394/pcilynx.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/ieee1394/pcilynx.c 2006-08-26 18:42:55.000000000 +0200
@@ -137,7 +137,6 @@
.getsda = bit_getsda,
.getscl = bit_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = 100,
};
--- linux-2.6.18-rc4.orig/drivers/media/video/bt8xx/bttv-i2c.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/media/video/bt8xx/bttv-i2c.c 2006-08-26 18:42:55.000000000 +0200
@@ -100,7 +100,6 @@
.getsda = bttv_bit_getsda,
.getscl = bttv_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
--- linux-2.6.18-rc4.orig/drivers/media/video/cx88/cx88-i2c.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/media/video/cx88/cx88-i2c.c 2006-08-26 18:42:56.000000000 +0200
@@ -155,7 +155,6 @@
.getsda = cx8800_bit_getsda,
.getscl = cx8800_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
--- linux-2.6.18-rc4.orig/drivers/media/video/cx88/cx88-vp3054-i2c.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/media/video/cx88/cx88-vp3054-i2c.c 2006-08-26 18:42:56.000000000 +0200
@@ -100,7 +100,6 @@
.getsda = vp3054_bit_getsda,
.getscl = vp3054_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
--- linux-2.6.18-rc4.orig/drivers/media/video/zoran_card.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/media/video/zoran_card.c 2006-08-26 18:42:56.000000000 +0200
@@ -820,7 +820,6 @@
.getsda = zoran_i2c_getsda,
.getscl = zoran_i2c_getscl,
.udelay = 10,
- .mdelay = 0,
.timeout = 100,
};
--- linux-2.6.18-rc4.orig/drivers/video/i810/i810-i2c.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/video/i810/i810-i2c.c 2006-08-26 18:42:56.000000000 +0200
@@ -98,7 +98,6 @@
chan->algo.getsda = i810i2c_getsda;
chan->algo.getscl = i810i2c_getscl;
chan->algo.udelay = 10;
- chan->algo.mdelay = 10;
chan->algo.timeout = (HZ/2);
chan->algo.data = chan;
--- linux-2.6.18-rc4.orig/drivers/video/savage/savagefb-i2c.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/video/savage/savagefb-i2c.c 2006-08-26 18:42:56.000000000 +0200
@@ -148,7 +148,6 @@
chan->adapter.algo_data = &chan->algo;
chan->adapter.dev.parent = &chan->par->pcidev->dev;
chan->algo.udelay = 40;
- chan->algo.mdelay = 5;
chan->algo.timeout = 20;
chan->algo.data = chan;
--- linux-2.6.18-rc4.orig/include/linux/i2c-algo-bit.h 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/include/linux/i2c-algo-bit.h 2006-08-26 18:42:56.000000000 +0200
@@ -40,7 +40,6 @@
/* local settings */
int udelay; /* half-clock-cycle time in microsecs */
/* i.e. clock is (500 / udelay) KHz */
- int mdelay; /* in millisecs, unused */
int timeout; /* in jiffies */
};
--- linux-2.6.18-rc4.orig/drivers/video/matrox/i2c-matroxfb.c 2006-08-26 18:42:55.000000000 +0200
+++ linux-2.6.18-rc4/drivers/video/matrox/i2c-matroxfb.c 2006-08-26 18:42:56.000000000 +0200
@@ -100,7 +100,6 @@
.getsda = matroxfb_gpio_getsda,
.getscl = matroxfb_gpio_getscl,
.udelay = 10,
- .mdelay = 10,
.timeout = 100,
};
--- linux-2.6.18-rc4.orig/drivers/acorn/char/i2c.c 2006-08-26 09:35:38.000000000 +0200
+++ linux-2.6.18-rc4/drivers/acorn/char/i2c.c 2006-08-26 18:42:56.000000000 +0200
@@ -308,7 +308,6 @@
.getsda = ioc_getsda,
.getscl = ioc_getscl,
.udelay = 80,
- .mdelay = 80,
.timeout = 100
};
--- linux-2.6.18-rc4.orig/drivers/i2c/busses/scx200_i2c.c 2006-08-27 10:44:34.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/scx200_i2c.c 2006-08-27 11:21:12.000000000 +0200
@@ -71,12 +71,12 @@
*/
static struct i2c_algo_bit_data scx200_i2c_data = {
- NULL,
- scx200_i2c_setsda,
- scx200_i2c_setscl,
- scx200_i2c_getsda,
- scx200_i2c_getscl,
- 10, 10, 100, /* waits, timeout */
+ .setsda = scx200_i2c_setsda,
+ .setscl = scx200_i2c_setscl,
+ .getsda = scx200_i2c_getsda,
+ .getscl = scx200_i2c_getscl,
+ .udelay = 10,
+ .timeout = 100,
};
static struct i2c_adapter scx200_i2c_ops = {
--
Jean Delvare
More information about the i2c
mailing list