aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-11-22 10:58:08 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 10:04:01 -0500
commit2f0a8df40ff008822e5570b3323c56622cd92c95 (patch)
treebfb22fc90d83f57b67255bb8c2c3ac676364e54c /drivers/i2c
parenta0832798c05241f15e793805b6024919c07b8292 (diff)
[I2C] i2c-mv64xxx: Don't set i2c_adapter.retries
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> Acked-by: Mark A. Greer <mgreer@mvista.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index cdd1ef99fcff..036e6a883e67 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -532,7 +532,6 @@ mv64xxx_i2c_probe(struct platform_device *pd)
532 drv_data->adapter.owner = THIS_MODULE; 532 drv_data->adapter.owner = THIS_MODULE;
533 drv_data->adapter.class = I2C_CLASS_HWMON; 533 drv_data->adapter.class = I2C_CLASS_HWMON;
534 drv_data->adapter.timeout = pdata->timeout; 534 drv_data->adapter.timeout = pdata->timeout;
535 drv_data->adapter.retries = pdata->retries;
536 drv_data->adapter.nr = pd->id; 535 drv_data->adapter.nr = pd->id;
537 platform_set_drvdata(pd, drv_data); 536 platform_set_drvdata(pd, drv_data);
538 i2c_set_adapdata(&drv_data->adapter, drv_data); 537 i2c_set_adapdata(&drv_data->adapter, drv_data);