[PATCH 10/17] i2c: omap: get rid of the "complete" label
From: Felipe Balbi <hidden>
Date: 2012-06-14 10:26:15
Also in:
linux-i2c, linux-omap, lkml
Subsystem:
i2c subsystem, i2c subsystem host drivers, omap i2c driver, omap1 support, omap2+ support, the rest · Maintainers:
Wolfram Sang, Andi Shyti, Vignesh R, Aaro Koskinen, Janusz Krzysztofik, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
we can ack stat and complete the command from the errata handling itself. Signed-off-by: Felipe Balbi <redacted> --- drivers/i2c/busses/i2c-omap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index c00ba7d..c20c45f 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c@@ -893,7 +893,6 @@ omap_i2c_isr(int this_irq, void *dev_id) return IRQ_HANDLED; } -complete: if (stat & OMAP_I2C_STAT_NACK) { dev_err(dev->dev, "No Acknowledge\n"); err |= OMAP_I2C_STAT_NACK;
@@ -958,10 +957,12 @@ complete: num_bytes = dev->fifo_size; ret = omap_i2c_transmit_data(dev, num_bytes, true); - stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); if (ret < 0) { err |= OMAP_I2C_STAT_XUDF; - goto complete; + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF | + OMAP_I2C_STAT_XDR); + omap_i2c_complete_cmd(dev, err); + return IRQ_HANDLED; } omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR);
@@ -976,10 +977,12 @@ complete: num_bytes = dev->fifo_size; ret = omap_i2c_transmit_data(dev, num_bytes, false); - stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); if (ret < 0) { err |= OMAP_I2C_STAT_XUDF; - goto complete; + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF | + OMAP_I2C_STAT_XRDY); + omap_i2c_complete_cmd(dev, err); + return IRQ_HANDLED; } omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
--
1.7.10.4