Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932214Ab2FNQ1b (ORCPT ); Thu, 14 Jun 2012 12:27:31 -0400 Received: from na3sys009aob106.obsmtp.com ([74.125.149.76]:57960 "EHLO na3sys009aog106.obsmtp.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756605Ab2FNQ11 (ORCPT ); Thu, 14 Jun 2012 12:27:27 -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 16/17] i2c: omap: simplify IRQ exit path Date: Thu, 14 Jun 2012 19:24:26 +0300 Message-Id: <1339691067-919-17-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 Content-Length: 3082 Lines: 112 instead of having multiple return points, use a goto statement to make that clearer. Signed-off-by: Felipe Balbi --- drivers/i2c/busses/i2c-omap.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 572fad7..82cb7d4 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -889,32 +889,26 @@ omap_i2c_isr(int this_irq, void *dev_id) stat &= ~(OMAP_I2C_STAT_RDR | OMAP_I2C_STAT_RRDY); } - if (!stat) { - /* my work here is done */ - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; - } + if (!stat) + goto out; dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat); if (count++ == 100) { dev_warn(dev->dev, "Too much work in one IRQ\n"); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } if (stat & OMAP_I2C_STAT_NACK) { err |= OMAP_I2C_STAT_NACK; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } if (stat & OMAP_I2C_STAT_AL) { dev_err(dev->dev, "Arbitration lost\n"); err |= OMAP_I2C_STAT_AL; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } /* @@ -927,8 +921,7 @@ omap_i2c_isr(int this_irq, void *dev_id) OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR | OMAP_I2C_STAT_ARDY)); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } if (stat & OMAP_I2C_STAT_RDR) { @@ -969,8 +962,7 @@ omap_i2c_isr(int this_irq, void *dev_id) err |= OMAP_I2C_STAT_XUDF; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF | OMAP_I2C_STAT_XDR); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); @@ -989,8 +981,7 @@ omap_i2c_isr(int this_irq, void *dev_id) err |= OMAP_I2C_STAT_XUDF; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF | OMAP_I2C_STAT_XRDY); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); @@ -1001,19 +992,19 @@ omap_i2c_isr(int this_irq, void *dev_id) dev_err(dev->dev, "Receive overrun\n"); err |= OMAP_I2C_STAT_ROVR; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } if (stat & OMAP_I2C_STAT_XUDF) { dev_err(dev->dev, "Transmit underflow\n"); err |= OMAP_I2C_STAT_XUDF; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF); - omap_i2c_complete_cmd(dev, err); - return IRQ_HANDLED; + goto out; } } while (stat); +out: + omap_i2c_complete_cmd(dev, err); return IRQ_HANDLED; } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/