i2c-algo-bit: Discard the mdelay data struct member

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@linux-fr.org>
Acked-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

12 files changed, 6 insertions, 22 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index ab230c033f99..761df16838b4 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -354,10 +354,6 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         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;
 }
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index e0cb3b0f92fa..457d48a0ab9d 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -99,7 +99,6 @@ static struct i2c_algo_bit_data hydra_bit_data = {
         .getsda         = hydra_bit_getsda,
         .getscl         = hydra_bit_getscl,
         .udelay         = 5,
-        .mdelay         = 5,
         .timeout        = HZ
 };
 
diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c
index 748be30f2bae..b66fb6bb1870 100644
--- a/drivers/i2c/busses/i2c-i810.c
+++ b/drivers/i2c/busses/i2c-i810.c
@@ -166,7 +166,6 @@ static struct i2c_algo_bit_data i810_i2c_bit_data = {
         .getsda         = bit_i810i2c_getsda,
         .getscl         = bit_i810i2c_getscl,
         .udelay         = CYCLE_DELAY,
-        .mdelay         = CYCLE_DELAY,
         .timeout        = TIMEOUT,
 };
 
@@ -182,7 +181,6 @@ static struct i2c_algo_bit_data i810_ddc_bit_data = {
         .getsda         = bit_i810ddc_getsda,
         .getscl         = bit_i810ddc_getscl,
         .udelay         = CYCLE_DELAY,
-        .mdelay         = CYCLE_DELAY,
         .timeout        = TIMEOUT,
 };
 
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index cd6f45d186ab..dd3f4cd3aa68 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -114,7 +114,6 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
         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,
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index 2ed07112d683..ab573254a8aa 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -122,7 +122,6 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
         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;
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index e09ebbb2f9f0..5eb2bd294fd9 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -103,7 +103,6 @@ static struct i2c_algo_bit_data parport_algo_data = {
         .getsda         = parport_getsda,
         .getscl         = parport_getscl,
         .udelay         = 50,
-        .mdelay         = 50,
         .timeout        = HZ,
 }; 
 
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 934bd55bae15..48a829431c7b 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -138,7 +138,6 @@ static struct i2c_algo_bit_data parport_algo_data = {
         .getsda         = parport_getsda,
         .getscl         = parport_getscl,
         .udelay         = 60,
-        .mdelay         = 60,
         .timeout        = HZ,
 }; 
 
diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c
index 9479525892e3..7745e21874a8 100644
--- a/drivers/i2c/busses/i2c-prosavage.c
+++ b/drivers/i2c/busses/i2c-prosavage.c
@@ -180,7 +180,6 @@ static int i2c_register_bus(struct pci_dev *dev, struct s_i2c_bus *p, void __iom
         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;
diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c
index 0c8518298e4d..209f47ea1750 100644
--- a/drivers/i2c/busses/i2c-savage4.c
+++ b/drivers/i2c/busses/i2c-savage4.c
@@ -140,7 +140,6 @@ static struct i2c_algo_bit_data sav_i2c_bit_data = {
         .getsda         = bit_savi2c_getsda,
         .getscl         = bit_savi2c_getscl,
         .udelay         = CYCLE_DELAY,
-        .mdelay         = CYCLE_DELAY,
         .timeout        = TIMEOUT
 };
 
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 484bbacfce6b..910e200ad500 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -81,7 +81,6 @@ static struct i2c_algo_bit_data bit_data = {
         .getsda         = bit_via_getsda,
         .getscl         = bit_via_getscl,
         .udelay         = 5,
-        .mdelay         = 5,
         .timeout        = HZ
 };
 
diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index b675773b0cc1..6c8d25183382 100644
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -160,7 +160,6 @@ static struct i2c_algo_bit_data voo_i2c_bit_data = {
         .getsda         = bit_vooi2c_getsda,
         .getscl         = bit_vooi2c_getscl,
         .udelay         = CYCLE_DELAY,
-        .mdelay         = CYCLE_DELAY,
         .timeout        = TIMEOUT
 };
 
@@ -177,7 +176,6 @@ static struct i2c_algo_bit_data voo_ddc_bit_data = {
         .getsda         = bit_vooddc_getsda,
         .getscl         = bit_vooddc_getscl,
         .udelay         = CYCLE_DELAY,
-        .mdelay         = CYCLE_DELAY,
         .timeout        = TIMEOUT
 };
 
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index cb3ef5ac99fd..8b65a5cf8251 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -71,12 +71,12 @@ static int scx200_i2c_getsda(void *data)
  */
 
 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 = {