From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: [PATCH 10/17] i2c: omap: get rid of the "complete" label Date: Thu, 14 Jun 2012 13:20:43 +0300 Message-ID: <1339669250-9183-11-git-send-email-balbi@ti.com> References: <1339669250-9183-1-git-send-email-balbi@ti.com> Return-path: In-Reply-To: <1339669250-9183-1-git-send-email-balbi@ti.com> Sender: linux-omap-owner@vger.kernel.org To: ben-linux@fluff.org Cc: Tony Lindgren , w.sang@pengutronix.de, Linux OMAP Mailing List , linux-i2c@vger.kernel.org, Linux ARM Kernel Mailing List , Linux Kernel Mailing List , Felipe Balbi List-Id: linux-i2c@vger.kernel.org we can ack stat and complete the command from the errata handling itself. Signed-off-by: Felipe Balbi --- 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