diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 6 | ||||
-rw-r--r-- | arch/ppc/syslib/mv64x60.c | 1 |
2 files changed, 0 insertions, 7 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[] = { |