Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2f0a8df40ff008822e5570b3323c56622cd92c95
Commit:     2f0a8df40ff008822e5570b3323c56622cd92c95
Parent:     a0832798c05241f15e793805b6024919c07b8292
Author:     Jean Delvare <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 22 16:58:08 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 15:04:01 2008 +0000

    [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 <[EMAIL PROTECTED]>
    Acked-by: Mark A. Greer <[EMAIL PROTECTED]>
---
 arch/powerpc/sysdev/mv64x60_dev.c |    6 ------
 arch/ppc/syslib/mv64x60.c         |    1 -
 drivers/i2c/busses/i2c-mv64xxx.c  |    1 -
 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 548a320..4316f5a 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 2744b8a..90fe904 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[] = {
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index cdd1ef9..036e6a8 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)
        drv_data->adapter.owner = THIS_MODULE;
        drv_data->adapter.class = I2C_CLASS_HWMON;
        drv_data->adapter.timeout = pdata->timeout;
-       drv_data->adapter.retries = pdata->retries;
        drv_data->adapter.nr = pd->id;
        platform_set_drvdata(pd, drv_data);
        i2c_set_adapdata(&drv_data->adapter, drv_data);
diff --git a/include/linux/mv643xx_i2c.h b/include/linux/mv643xx_i2c.h
index adb629b..5db5152 100644
--- a/include/linux/mv643xx_i2c.h
+++ b/include/linux/mv643xx_i2c.h
@@ -17,7 +17,6 @@ struct mv64xxx_i2c_pdata {
        u32     freq_m;
        u32     freq_n;
        u32     timeout;        /* In milliseconds */
-       u32     retries;
 };
 
 #endif /*_MV64XXX_I2C_H_*/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to