diff options
author | Shubhrajyoti D <shubhrajyoti@ti.com> | 2012-06-28 11:11:29 -0400 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-07-12 08:18:26 -0400 |
commit | 0e33bbb25436949cc100d40edfbe0f96dfa25882 (patch) | |
tree | dbe275daada581fc7ba67f7991aa8f388156a8af /drivers/i2c | |
parent | 5692d2a22ed9c1a1bc3030bd8188f335b1b0b58c (diff) |
i2c: omap: Do not initialise the completion everytime
Use INIT_COMPLETION instead of init_completion in transfer.
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index b9915bb9343d..6d05f1878ca0 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -490,7 +490,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, | |||
490 | w |= OMAP_I2C_BUF_RXFIF_CLR | OMAP_I2C_BUF_TXFIF_CLR; | 490 | w |= OMAP_I2C_BUF_RXFIF_CLR | OMAP_I2C_BUF_TXFIF_CLR; |
491 | omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, w); | 491 | omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, w); |
492 | 492 | ||
493 | init_completion(&dev->cmd_complete); | 493 | INIT_COMPLETION(dev->cmd_complete); |
494 | dev->cmd_err = 0; | 494 | dev->cmd_err = 0; |
495 | 495 | ||
496 | w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT; | 496 | w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT; |
@@ -999,6 +999,7 @@ omap_i2c_probe(struct platform_device *pdev) | |||
999 | } | 999 | } |
1000 | 1000 | ||
1001 | platform_set_drvdata(pdev, dev); | 1001 | platform_set_drvdata(pdev, dev); |
1002 | init_completion(&dev->cmd_complete); | ||
1002 | 1003 | ||
1003 | dev->reg_shift = (dev->flags >> OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3; | 1004 | dev->reg_shift = (dev->flags >> OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3; |
1004 | 1005 | ||