i2c: Don't uselessly set i2c_adapter.retries
authorJean Delvare <khali@linux-fr.org>
Sun, 27 Jan 2008 17:14:47 +0000 (18:14 +0100)
committerJean Delvare <khali@hyperion.delvare>
Sun, 27 Jan 2008 17:14:47 +0000 (18:14 +0100)
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@linux-fr.org>
drivers/i2c/busses/i2c-davinci.c
drivers/i2c/busses/i2c-ibm_iic.c
drivers/i2c/busses/i2c-iop3xx.c
drivers/i2c/busses/i2c-mpc.c
drivers/i2c/busses/i2c-omap.c

index 67679882ebef8f36d2722035c09b4f700c4105fd..cce5a614758d37b84f8de5e93670b1a93f2e3179 100644 (file)
@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct platform_device *pdev)
 
        /* FIXME */
        adap->timeout = 1;
-       adap->retries = 1;
 
        adap->nr = pdev->id;
        r = i2c_add_numbered_adapter(adap);
index d0cf39b8c1f164cf410f9edb0ca034ed81c6e5db..7c7eb0cfecebee8eee4b1091a39f92c6ba1bc396 100644 (file)
@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct ocp_device *ocp){
        adap->client_register = NULL;
        adap->client_unregister = NULL;
        adap->timeout = 1;
-       adap->retries = 1;
 
        /*
         * If "dev->idx" is negative we consider it as zero.
index c70146e4c2c026726b5cdb1c64f9785c4e8a9d91..ab41400c883e32b36a4446c5f90148beb43b1e66 100644 (file)
@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device *pdev)
         * 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);
index d8de4ac88b7d9d7718b9693eb1506f8ec45709a6..81335b76c425e93fc06130f6e6f3898e10dcf072 100644 (file)
@@ -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)
index f2552b19ea607d741082ca54aec28c4984b614f8..da6639707ea31e32f944d9cccae70e7827c4cb2a 100644 (file)
@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 
        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;