Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0a8df4 authored by Jean Delvare's avatar Jean Delvare Committed by Russell King
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarMark A. Greer <mgreer@mvista.com>
parent a0832798

arch/powerpc/sysdev/mv64x60_dev.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

arch/ppc/syslib/mv64x60.c

+0 −1
Original line number Diff line number Diff line
@@ -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[] = {

drivers/i2c/busses/i2c-mv64xxx.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/mv643xx_i2c.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ struct mv64xxx_i2c_pdata { 
	u32	freq_m;

	u32	freq_n;

	u32	timeout;	/* In milliseconds */

	u32	retries;

};



#endif /*_MV64XXX_I2C_H_*/