Skip to content

Commit

Permalink
i2c: Don't uselessly set i2c_adapter.retries
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Jan 27, 2008
1 parent 05c7aba commit 2caeac8
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion drivers/i2c/busses/i2c-davinci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/i2c/busses/i2c-ibm_iic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion drivers/i2c/busses/i2c-iop3xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/i2c/busses/i2c-mpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 2caeac8

Please sign in to comment.