From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756617Ab2FNQ3Q (ORCPT ); Thu, 14 Jun 2012 12:29:16 -0400 Received: from na3sys009aog135.obsmtp.com ([74.125.149.84]:34686 "EHLO na3sys009aog135.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932100Ab2FNQ1F (ORCPT ); Thu, 14 Jun 2012 12:27:05 -0400 From: Felipe Balbi To: ben-linux@fluff.org Cc: Tony Lindgren , Santosh Shilimkar , Russell King , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Linux Kernel Mailing List , w.sang@pengutronix.de, Shubhrajyoti Datta , Felipe Balbi Subject: [PATCH v2 10/17] i2c: omap: get rid of the "complete" label Date: Thu, 14 Jun 2012 19:24:20 +0300 Message-Id: <1339691067-919-11-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1339691067-919-1-git-send-email-balbi@ti.com> References: <1339691067-919-1-git-send-email-balbi@ti.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 83ae06a..7171ea1 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) { err |= OMAP_I2C_STAT_NACK; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); @@ -957,10 +956,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); @@ -975,10 +976,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