diff options
-rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
5 files changed, 0 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 67679882ebef..cce5a614758d 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct platform_device *pdev) | |||
510 | 510 | ||
511 | /* FIXME */ | 511 | /* FIXME */ |
512 | adap->timeout = 1; | 512 | adap->timeout = 1; |
513 | adap->retries = 1; | ||
514 | 513 | ||
515 | adap->nr = pdev->id; | 514 | adap->nr = pdev->id; |
516 | r = i2c_add_numbered_adapter(adap); | 515 | r = i2c_add_numbered_adapter(adap); |
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index d0cf39b8c1f1..7c7eb0cfeceb 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct ocp_device *ocp){ | |||
736 | adap->client_register = NULL; | 736 | adap->client_register = NULL; |
737 | adap->client_unregister = NULL; | 737 | adap->client_unregister = NULL; |
738 | adap->timeout = 1; | 738 | adap->timeout = 1; |
739 | adap->retries = 1; | ||
740 | 739 | ||
741 | /* | 740 | /* |
742 | * If "dev->idx" is negative we consider it as zero. | 741 | * If "dev->idx" is negative we consider it as zero. |
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index c70146e4c2c0..ab41400c883e 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device *pdev) | |||
490 | * Default values...should these come in from board code? | 490 | * Default values...should these come in from board code? |
491 | */ | 491 | */ |
492 | new_adapter->timeout = 100; | 492 | new_adapter->timeout = 100; |
493 | new_adapter->retries = 3; | ||
494 | new_adapter->algo = &iop3xx_i2c_algo; | 493 | new_adapter->algo = &iop3xx_i2c_algo; |
495 | 494 | ||
496 | init_waitqueue_head(&adapter_data->waitq); | 495 | init_waitqueue_head(&adapter_data->waitq); |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index d8de4ac88b7d..81335b76c425 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -309,7 +309,6 @@ static struct i2c_adapter mpc_ops = { | |||
309 | .algo = &mpc_algo, | 309 | .algo = &mpc_algo, |
310 | .class = I2C_CLASS_HWMON, | 310 | .class = I2C_CLASS_HWMON, |
311 | .timeout = 1, | 311 | .timeout = 1, |
312 | .retries = 1 | ||
313 | }; | 312 | }; |
314 | 313 | ||
315 | static int fsl_i2c_probe(struct platform_device *pdev) | 314 | static int fsl_i2c_probe(struct platform_device *pdev) |
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index f2552b19ea60..da6639707ea3 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) | |||
362 | 362 | ||
363 | omap_i2c_enable_clocks(dev); | 363 | omap_i2c_enable_clocks(dev); |
364 | 364 | ||
365 | /* REVISIT: initialize and use adap->retries. This is an optional | ||
366 | * feature */ | ||
367 | if ((r = omap_i2c_wait_for_bb(dev)) < 0) | 365 | if ((r = omap_i2c_wait_for_bb(dev)) < 0) |
368 | goto out; | 366 | goto out; |
369 | 367 | ||