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

Commit 2caeac81 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

i2c: Don't uselessly 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>
parent 05c7abae

drivers/i2c/busses/i2c-davinci.c

+0 −1
Original line number Diff line number Diff line
@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct platform_device *pdev) 


	/* FIXME */

	adap->timeout = 1;

	adap->retries = 1;



	adap->nr = pdev->id;

	r = i2c_add_numbered_adapter(adap);

drivers/i2c/busses/i2c-ibm_iic.c

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct ocp_device *ocp){ 
	adap->client_register = NULL;

	adap->client_unregister = NULL;

	adap->timeout = 1;

	adap->retries = 1;



	/*

	 * If "dev->idx" is negative we consider it as zero.

drivers/i2c/busses/i2c-iop3xx.c

+0 −1
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device *pdev) 
	 * Default values...should these come in from board code?

	 */

	new_adapter->timeout = 100;	

	new_adapter->retries = 3;

	new_adapter->algo = &iop3xx_i2c_algo;



	init_waitqueue_head(&adapter_data->waitq);

drivers/i2c/busses/i2c-mpc.c

+0 −1
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ static struct i2c_adapter mpc_ops = { 
	.algo = &mpc_algo,

	.class = I2C_CLASS_HWMON,

	.timeout = 1,

	.retries = 1

};



static int fsl_i2c_probe(struct platform_device *pdev)

drivers/i2c/busses/i2c-omap.c

+0 −2
Original line number Diff line number Diff line
@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) 


	omap_i2c_enable_clocks(dev);



	/* REVISIT: initialize and use adap->retries. This is an optional

	 * feature */

	if ((r = omap_i2c_wait_for_bb(dev)) < 0)

		goto out;