aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2008-07-14 16:38:20 -0400
committerJean Delvare <khali@mahadeva.delvare>2008-07-14 16:38:20 -0400
commit0ab56e20674b41dd0203d16b602aac8d9d26a70a (patch)
tree8351896de0b48bd4ea68df1405797bc00e01a2d5
parentd868caa177d4487ce1935926498f542a8f67c1cf (diff)
i2c-davinci: Remove useless IVR read
Interrupts are enabled at the point where the DAVINCI_I2C_IVR_REG is read, so unless an interrupt happened just at that moment, no interrupt would be pending. Even though documentation implies you should do this, I see no reason. If slave support is added, this read would cause a hard to reproduce bug. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Kevin Hilman <khilman@mvista.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--drivers/i2c/busses/i2c-davinci.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 85097fdc75e4..c56f8fe4efe5 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -240,7 +240,6 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
240 struct davinci_i2c_dev *dev = i2c_get_adapdata(adap); 240 struct davinci_i2c_dev *dev = i2c_get_adapdata(adap);
241 struct davinci_i2c_platform_data *pdata = dev->dev->platform_data; 241 struct davinci_i2c_platform_data *pdata = dev->dev->platform_data;
242 u32 flag; 242 u32 flag;
243 u32 stat;
244 u16 w; 243 u16 w;
245 int r; 244 int r;
246 245
@@ -264,9 +263,6 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
264 init_completion(&dev->cmd_complete); 263 init_completion(&dev->cmd_complete);
265 dev->cmd_err = 0; 264 dev->cmd_err = 0;
266 265
267 /* Clear any pending interrupts by reading the IVR */
268 stat = davinci_i2c_read_reg(dev, DAVINCI_I2C_IVR_REG);
269
270 /* Take I2C out of reset, configure it as master and set the 266 /* Take I2C out of reset, configure it as master and set the
271 * start bit */ 267 * start bit */
272 flag = DAVINCI_I2C_MDR_IRS | DAVINCI_I2C_MDR_MST | DAVINCI_I2C_MDR_STT; 268 flag = DAVINCI_I2C_MDR_IRS | DAVINCI_I2C_MDR_MST | DAVINCI_I2C_MDR_STT;