aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-11-22 16:58:08 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 15:04:01 +0000
commit2f0a8df40ff008822e5570b3323c56622cd92c95 (patch)
treebfb22fc90d83f57b67255bb8c2c3ac676364e54c /arch
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 'arch')
-rw-r--r--arch/powerpc/sysdev/mv64x60_dev.c6
-rw-r--r--arch/ppc/syslib/mv64x60.c1
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 548a32082e4..4316f5a48a0 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)
else
pdata.timeout = 1000; /* 1 second */
- prop = of_get_property(np, "retries", NULL);
- if (prop)
- pdata.retries = *prop;
- else
- pdata.retries = 1;
-
pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
if (!pdev)
return -ENOMEM;
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 2744b8a6f66..90fe904d361 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 = {
.freq_m = 8,
.freq_n = 3,
.timeout = 1000, /* Default timeout of 1 second */
- .retries = 1,
};
static struct resource mv64xxx_i2c_resources[] = {