提交 2caeac81 编写于 作者: J Jean Delvare 提交者: Jean Delvare

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: NJean Delvare <khali@linux-fr.org>
上级 05c7abae
...@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct platform_device *pdev) ...@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct platform_device *pdev)
/* FIXME */ /* FIXME */
adap->timeout = 1; adap->timeout = 1;
adap->retries = 1;
adap->nr = pdev->id; adap->nr = pdev->id;
r = i2c_add_numbered_adapter(adap); r = i2c_add_numbered_adapter(adap);
......
...@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct ocp_device *ocp){ ...@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct ocp_device *ocp){
adap->client_register = NULL; adap->client_register = NULL;
adap->client_unregister = NULL; adap->client_unregister = NULL;
adap->timeout = 1; adap->timeout = 1;
adap->retries = 1;
/* /*
* If "dev->idx" is negative we consider it as zero. * If "dev->idx" is negative we consider it as zero.
......
...@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device *pdev) ...@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device *pdev)
* Default values...should these come in from board code? * Default values...should these come in from board code?
*/ */
new_adapter->timeout = 100; new_adapter->timeout = 100;
new_adapter->retries = 3;
new_adapter->algo = &iop3xx_i2c_algo; new_adapter->algo = &iop3xx_i2c_algo;
init_waitqueue_head(&adapter_data->waitq); init_waitqueue_head(&adapter_data->waitq);
......
...@@ -309,7 +309,6 @@ static struct i2c_adapter mpc_ops = { ...@@ -309,7 +309,6 @@ static struct i2c_adapter mpc_ops = {
.algo = &mpc_algo, .algo = &mpc_algo,
.class = I2C_CLASS_HWMON, .class = I2C_CLASS_HWMON,
.timeout = 1, .timeout = 1,
.retries = 1
}; };
static int fsl_i2c_probe(struct platform_device *pdev) static int fsl_i2c_probe(struct platform_device *pdev)
......
...@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) ...@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
omap_i2c_enable_clocks(dev); 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) if ((r = omap_i2c_wait_for_bb(dev)) < 0)
goto out; goto out;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册