[i2c] i2c: Don't uselessly set i2c_adapter.retries

[Jean Delvare]

I2C adapter drivers are supposed to handle retries on nack by themselves
if they do, so there's no point in setting .retries if they don't.

As this retry mechanism is going away (at least in its current form),
clean this up now so that we don't get build failures later.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 arch/powerpc/sysdev/mv64x60_dev.c |    6 ------
 arch/ppc/syslib/mv64x60.c         |    1 -
 drivers/i2c/algos/i2c-algo-pca.c  |    3 +--
 drivers/i2c/busses/i2c-davinci.c  |    1 -
 drivers/i2c/busses/i2c-ibm_iic.c  |    1 -
 drivers/i2c/busses/i2c-iop3xx.c   |    1 -
 drivers/i2c/busses/i2c-mpc.c      |    1 -
 drivers/i2c/busses/i2c-mv64xxx.c  |    1 -
 drivers/i2c/busses/i2c-omap.c     |    2 --
 include/linux/mv643xx_i2c.h       |    1 -
 10 files changed, 1 insertion(+), 17 deletions(-)

--- linux-2.6.24-rc3.orig/arch/powerpc/sysdev/mv64x60_dev.c	2007-11-19 15:19:06.000000000 +0100
+++ linux-2.6.24-rc3/arch/powerpc/sysdev/mv64x60_dev.c	2007-11-21 12:31:03.000000000 +0100
@@ -361,12 +361,6 @@ static int __init mv64x60_i2c_device_set
 	else
 		pdata.timeout = 1000;	/* 1 second */
 
-	prop = of_get_property(np, "retries", NULL);
-	if (prop)
-		pdata.retries = *prop;
-	else
-		pdata.retries = 1;
-
 	pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
 	if (!pdev)
 		return -ENOMEM;
--- linux-2.6.24-rc3.orig/arch/ppc/syslib/mv64x60.c	2007-11-19 15:19:06.000000000 +0100
+++ linux-2.6.24-rc3/arch/ppc/syslib/mv64x60.c	2007-11-21 12:31:03.000000000 +0100
@@ -411,7 +411,6 @@ static struct mv64xxx_i2c_pdata mv64xxx_
 	.freq_m			= 8,
 	.freq_n			= 3,
 	.timeout		= 1000, /* Default timeout of 1 second */
-	.retries		= 1,
 };
 
 static struct resource mv64xxx_i2c_resources[] = {
--- linux-2.6.24-rc3.orig/drivers/i2c/algos/i2c-algo-pca.c	2007-11-19 15:19:06.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/algos/i2c-algo-pca.c	2007-11-21 12:31:03.000000000 +0100
@@ -371,8 +371,7 @@ int i2c_pca_add_bus(struct i2c_adapter *
 	/* register new adapter to i2c module... */
 	adap->algo = &pca_algo;
 
-	adap->timeout = 100;		/* default values, should	*/
-	adap->retries = 3;		/* be replaced by defines	*/
+	adap->timeout = 100;		/* default value */
 
 	if ((rval = pca_init(pca_adap)))
 		return rval;
--- linux-2.6.24-rc3.orig/drivers/i2c/busses/i2c-davinci.c	2007-11-20 20:43:59.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/busses/i2c-davinci.c	2007-11-21 12:31:03.000000000 +0100
@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct plat
 
 	/* FIXME */
 	adap->timeout = 1;
-	adap->retries = 1;
 
 	adap->nr = pdev->id;
 	r = i2c_add_numbered_adapter(adap);
--- linux-2.6.24-rc3.orig/drivers/i2c/busses/i2c-ibm_iic.c	2007-11-20 20:52:16.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/busses/i2c-ibm_iic.c	2007-11-21 12:31:03.000000000 +0100
@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct oc
 	adap->client_register = NULL;
 	adap->client_unregister = NULL;
 	adap->timeout = 1;
-	adap->retries = 1;
 
 	/*
 	 * If "dev->idx" is negative we consider it as zero.
--- linux-2.6.24-rc3.orig/drivers/i2c/busses/i2c-iop3xx.c	2007-11-19 15:19:06.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/busses/i2c-iop3xx.c	2007-11-21 12:31:03.000000000 +0100
@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device 
 	 * Default values...should these come in from board code?
 	 */
 	new_adapter->timeout = 100;	
-	new_adapter->retries = 3;
 	new_adapter->algo = &iop3xx_i2c_algo;
 
 	init_waitqueue_head(&adapter_data->waitq);
--- linux-2.6.24-rc3.orig/drivers/i2c/busses/i2c-mpc.c	2007-11-19 15:19:06.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/busses/i2c-mpc.c	2007-11-21 12:31:03.000000000 +0100
@@ -309,7 +309,6 @@ static struct i2c_adapter mpc_ops = {
 	.algo = &mpc_algo,
 	.class = I2C_CLASS_HWMON,
 	.timeout = 1,
-	.retries = 1
 };
 
 static int fsl_i2c_probe(struct platform_device *pdev)
--- linux-2.6.24-rc3.orig/drivers/i2c/busses/i2c-mv64xxx.c	2007-11-21 12:20:50.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/busses/i2c-mv64xxx.c	2007-11-21 12:31:03.000000000 +0100
@@ -532,7 +532,6 @@ mv64xxx_i2c_probe(struct platform_device
 	drv_data->adapter.owner = THIS_MODULE;
 	drv_data->adapter.class = I2C_CLASS_HWMON;
 	drv_data->adapter.timeout = pdata->timeout;
-	drv_data->adapter.retries = pdata->retries;
 	drv_data->adapter.nr = pd->id;
 	platform_set_drvdata(pd, drv_data);
 	i2c_set_adapdata(&drv_data->adapter, drv_data);
--- linux-2.6.24-rc3.orig/drivers/i2c/busses/i2c-omap.c	2007-11-20 20:43:59.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/busses/i2c-omap.c	2007-11-21 12:31:03.000000000 +0100
@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, 
 
 	omap_i2c_enable_clocks(dev);
 
-	/* REVISIT: initialize and use adap->retries. This is an optional
-	 * feature */
 	if ((r = omap_i2c_wait_for_bb(dev)) < 0)
 		goto out;
 
--- linux-2.6.24-rc3.orig/include/linux/mv643xx_i2c.h	2007-11-21 12:20:50.000000000 +0100
+++ linux-2.6.24-rc3/include/linux/mv643xx_i2c.h	2007-11-21 12:31:03.000000000 +0100
@@ -17,7 +17,6 @@ struct mv64xxx_i2c_pdata {
 	u32	freq_m;
 	u32	freq_n;
 	u32	timeout;	/* In milliseconds */
-	u32	retries;
 };
 
 #endif /*_MV64XXX_I2C_H_*/


-- 
Jean Delvare