All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shubhrajyoti D <shubhrajyoti@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	ben-linux@fluff.org, tony@atomide.com, w.sang@pengutronix.de,
	Felipe Balbi <balbi@ti.com>, Shubhrajyoti D <shubhrajyoti@ti.com>
Subject: [PATCHv3 15/17] i2c: omap: simplify IRQ exit path
Date: Fri, 29 Jun 2012 15:43:35 +0530	[thread overview]
Message-ID: <1340964817-8599-16-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1340964817-8599-1-git-send-email-shubhrajyoti@ti.com>

From: Felipe Balbi <balbi@ti.com>

instead of having multiple return points, use
a goto statement to make that clearer.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/i2c/busses/i2c-omap.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 2cd3b9a..1196417 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -873,24 +873,21 @@ omap_i2c_isr(int this_irq, void *dev_id)
 		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;
 		}
 
 complete:
 		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;
 		}
 
 		/*
@@ -903,8 +900,7 @@ complete:
 						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) {
@@ -973,19 +969,19 @@ complete:
 			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.5.4


WARNING: multiple messages have this Message-ID (diff)
From: shubhrajyoti@ti.com (Shubhrajyoti D)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 15/17] i2c: omap: simplify IRQ exit path
Date: Fri, 29 Jun 2012 15:43:35 +0530	[thread overview]
Message-ID: <1340964817-8599-16-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1340964817-8599-1-git-send-email-shubhrajyoti@ti.com>

From: Felipe Balbi <balbi@ti.com>

instead of having multiple return points, use
a goto statement to make that clearer.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/i2c/busses/i2c-omap.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 2cd3b9a..1196417 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -873,24 +873,21 @@ omap_i2c_isr(int this_irq, void *dev_id)
 		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;
 		}
 
 complete:
 		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;
 		}
 
 		/*
@@ -903,8 +900,7 @@ complete:
 						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) {
@@ -973,19 +969,19 @@ complete:
 			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.5.4

  parent reply	other threads:[~2012-06-29 10:13 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-29 10:13 [PATCHv3 00/17] I2C Big cleanup Shubhrajyoti D
2012-06-29 10:13 ` Shubhrajyoti D
2012-06-29 10:13 ` [PATCHv3 02/17] i2c: omap: simplify num_bytes handling Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D
2012-06-29 10:13 ` [PATCHv3 03/17] i2c: omap: decrease indentation level on data handling Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D
2012-06-29 10:13 ` [PATCHv3 04/17] i2c: omap: add blank lines Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D
2012-06-29 10:13 ` [PATCHv3 06/17] i2c: omap: split out [XR]DR and [XR]RDY Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D
     [not found]   ` <1340964817-8599-7-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-07-02 11:56     ` Felipe Balbi
2012-07-02 11:56       ` Felipe Balbi
     [not found]       ` <20120702115620.GD2730-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-07-02 12:00         ` Shubhrajyoti Datta
2012-07-02 12:00           ` Shubhrajyoti Datta
2012-06-29 10:13 ` [PATCHv3 07/17] i2c: omap: improve i462 errata handling Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D
2012-06-29 10:13 ` [PATCHv3 11/17] i2c: omap: switch to platform_get_irq() Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D
     [not found] ` <1340964817-8599-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-06-29 10:13   ` [PATCHv3 01/17] i2c: omap: switch to devm_* API Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 05/17] i2c: omap: simplify omap_i2c_ack_stat() Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 08/17] i2c: omap: re-factor receive/transmit data loop Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 09/17] i2c: omap: switch over to do {} while loop Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 10/17] i2c: omap: ack IRQ in parts Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 12/17] i2c: omap: bus: add a receiver flag Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 13/17] i2c: omap: simplify errata check Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 14/17] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
2012-06-29 10:13   ` [PATCHv3 17/17] i2c: omap: get rid of the "complete" label Shubhrajyoti D
2012-06-29 10:13     ` Shubhrajyoti D
     [not found]     ` <1340964817-8599-18-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-07-02 11:59       ` Felipe Balbi
2012-07-02 11:59         ` Felipe Balbi
2012-06-29 10:13 ` Shubhrajyoti D [this message]
2012-06-29 10:13   ` [PATCHv3 15/17] i2c: omap: simplify IRQ exit path Shubhrajyoti D
2012-06-29 10:13 ` [PATCHv3 16/17] i2c: omap: resize fifos before each message Shubhrajyoti D
2012-06-29 10:13   ` Shubhrajyoti D

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340964817-8599-16-git-send-email-shubhrajyoti@ti.com \
    --to=shubhrajyoti@ti.com \
    --cc=balbi@ti.com \
    --cc=ben-linux@fluff.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    --cc=w.sang@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.