diff options
-rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 6 | ||||
-rw-r--r-- | arch/ppc/syslib/mv64x60.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 1 | ||||
-rw-r--r-- | include/linux/mv643xx_i2c.h | 1 |
4 files changed, 0 insertions, 9 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c index 548a32082e4a..4316f5a48a0f 100644 --- a/arch/powerpc/sysdev/mv64x60_dev.c +++ b/arch/powerpc/sysdev/mv64x60_dev.c | |||
@@ -361,12 +361,6 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id) | |||
361 | else | 361 | else |
362 | pdata.timeout = 1000; /* 1 second */ | 362 | pdata.timeout = 1000; /* 1 second */ |
363 | 363 | ||
364 | prop = of_get_property(np, "retries", NULL); | ||
365 | if (prop) | ||
366 | pdata.retries = *prop; | ||
367 | else | ||
368 | pdata.retries = 1; | ||
369 | |||
370 | pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id); | 364 | pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id); |
371 | if (!pdev) | 365 | if (!pdev) |
372 | return -ENOMEM; | 366 | return -ENOMEM; |
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c index 2744b8a6f66a..90fe904d3614 100644 --- a/arch/ppc/syslib/mv64x60.c +++ b/arch/ppc/syslib/mv64x60.c | |||
@@ -411,7 +411,6 @@ static struct mv64xxx_i2c_pdata mv64xxx_i2c_pdata = { | |||
411 | .freq_m = 8, | 411 | .freq_m = 8, |
412 | .freq_n = 3, | 412 | .freq_n = 3, |
413 | .timeout = 1000, /* Default timeout of 1 second */ | 413 | .timeout = 1000, /* Default timeout of 1 second */ |
414 | .retries = 1, | ||
415 | }; | 414 | }; |
416 | 415 | ||
417 | static struct resource mv64xxx_i2c_resources[] = { | 416 | static struct resource mv64xxx_i2c_resources[] = { |
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); |
diff --git a/include/linux/mv643xx_i2c.h b/include/linux/mv643xx_i2c.h index adb629b15477..5db5152e9de5 100644 --- a/include/linux/mv643xx_i2c.h +++ b/include/linux/mv643xx_i2c.h | |||
@@ -17,7 +17,6 @@ struct mv64xxx_i2c_pdata { | |||
17 | u32 freq_m; | 17 | u32 freq_m; |
18 | u32 freq_n; | 18 | u32 freq_n; |
19 | u32 timeout; /* In milliseconds */ | 19 | u32 timeout; /* In milliseconds */ |
20 | u32 retries; | ||
21 | }; | 20 | }; |
22 | 21 | ||
23 | #endif /*_MV64XXX_I2C_H_*/ | 22 | #endif /*_MV64XXX_I2C_H_*/ |