Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2f0a8df40ff008822e5570b3323c56622cd92c95

Authored by Jean Delvare
Committed by Russell King
1 parent a0832798c0
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[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>

Showing 4 changed files with 0 additions and 9 deletions Side-by-side Diff

arch/powerpc/sysdev/mv64x60_dev.c
Diff comments   View file @ 2f0a8df
... ... @@ -361,12 +361,6 @@
361 361 else
362 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 364 pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
371 365 if (!pdev)
372 366 return -ENOMEM;
arch/ppc/syslib/mv64x60.c
Diff comments   View file @ 2f0a8df
... ... @@ -411,7 +411,6 @@
411 411 .freq_m = 8,
412 412 .freq_n = 3,
413 413 .timeout = 1000, /* Default timeout of 1 second */
414   - .retries = 1,
415 414 };
416 415  
417 416 static struct resource mv64xxx_i2c_resources[] = {
drivers/i2c/busses/i2c-mv64xxx.c
Diff comments   View file @ 2f0a8df
... ... @@ -532,7 +532,6 @@
532 532 drv_data->adapter.owner = THIS_MODULE;
533 533 drv_data->adapter.class = I2C_CLASS_HWMON;
534 534 drv_data->adapter.timeout = pdata->timeout;
535   - drv_data->adapter.retries = pdata->retries;
536 535 drv_data->adapter.nr = pd->id;
537 536 platform_set_drvdata(pd, drv_data);
538 537 i2c_set_adapdata(&drv_data->adapter, drv_data);
include/linux/mv643xx_i2c.h
Diff comments   View file @ 2f0a8df
... ... @@ -17,7 +17,6 @@
17 17 u32 freq_m;
18 18 u32 freq_n;
19 19 u32 timeout; /* In milliseconds */
20   - u32 retries;
21 20 };
22 21  
23 22 #endif /*_MV64XXX_I2C_H_*/