From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> To: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org, w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> Subject: [PATCHv7 23/23] i2c: omap: sanitize exit path Date: Tue, 11 Sep 2012 15:12:18 +0530 [thread overview] Message-ID: <1347356538-23835-24-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1347356538-23835-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> From: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> move the goto out label one line down, so that it can be used when stat is read as zero. All other exits, can be done with a break statement. While at that, also break out as soon as we complete draining IRQ, since at that time we know we transferred everything there was to be transferred. Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> --- drivers/i2c/busses/i2c-omap.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 122f517..b149e32 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -901,27 +901,26 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) if (!stat) { /* my work here is done */ - spin_unlock_irqrestore(&dev->lock, flags); - return IRQ_HANDLED; + 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"); - goto out; + break; } if (stat & OMAP_I2C_STAT_NACK) { err |= OMAP_I2C_STAT_NACK; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); - goto out; + break; } 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_AL); - goto out; + break; } /* @@ -934,7 +933,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR | OMAP_I2C_STAT_ARDY)); - goto out; + break; } if (stat & OMAP_I2C_STAT_RDR) { @@ -949,7 +948,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) i2c_omap_errata_i207(dev, stat); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); - continue; + break; } if (stat & OMAP_I2C_STAT_RRDY) { @@ -972,10 +971,10 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) ret = omap_i2c_transmit_data(dev, num_bytes, true); if (ret < 0) - goto out; + break; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); - continue; + break; } if (stat & OMAP_I2C_STAT_XRDY) { @@ -987,7 +986,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) ret = omap_i2c_transmit_data(dev, num_bytes, false); if (ret < 0) - goto out; + break; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); continue; @@ -997,19 +996,20 @@ omap_i2c_isr_thread(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); - goto out; + break; } 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); - goto out; + break; } } while (stat); -out: omap_i2c_complete_cmd(dev, err); + +out: spin_unlock_irqrestore(&dev->lock, flags); 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: [PATCHv7 23/23] i2c: omap: sanitize exit path Date: Tue, 11 Sep 2012 15:12:18 +0530 [thread overview] Message-ID: <1347356538-23835-24-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1347356538-23835-1-git-send-email-shubhrajyoti@ti.com> From: Felipe Balbi <balbi@ti.com> move the goto out label one line down, so that it can be used when stat is read as zero. All other exits, can be done with a break statement. While at that, also break out as soon as we complete draining IRQ, since at that time we know we transferred everything there was to be transferred. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- drivers/i2c/busses/i2c-omap.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 122f517..b149e32 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -901,27 +901,26 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) if (!stat) { /* my work here is done */ - spin_unlock_irqrestore(&dev->lock, flags); - return IRQ_HANDLED; + 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"); - goto out; + break; } if (stat & OMAP_I2C_STAT_NACK) { err |= OMAP_I2C_STAT_NACK; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); - goto out; + break; } 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_AL); - goto out; + break; } /* @@ -934,7 +933,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR | OMAP_I2C_STAT_ARDY)); - goto out; + break; } if (stat & OMAP_I2C_STAT_RDR) { @@ -949,7 +948,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) i2c_omap_errata_i207(dev, stat); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); - continue; + break; } if (stat & OMAP_I2C_STAT_RRDY) { @@ -972,10 +971,10 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) ret = omap_i2c_transmit_data(dev, num_bytes, true); if (ret < 0) - goto out; + break; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); - continue; + break; } if (stat & OMAP_I2C_STAT_XRDY) { @@ -987,7 +986,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) ret = omap_i2c_transmit_data(dev, num_bytes, false); if (ret < 0) - goto out; + break; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); continue; @@ -997,19 +996,20 @@ omap_i2c_isr_thread(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); - goto out; + break; } 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); - goto out; + break; } } while (stat); -out: omap_i2c_complete_cmd(dev, err); + +out: spin_unlock_irqrestore(&dev->lock, flags); return IRQ_HANDLED; -- 1.7.5.4
next prev parent reply other threads:[~2012-09-11 9:42 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-11 9:41 [PATCHv7 00/23]I2C big cleanup Shubhrajyoti D 2012-09-11 9:41 ` Shubhrajyoti D 2012-09-11 9:41 ` [PATCHv7 01/23] i2c: omap: switch to devm_* API Shubhrajyoti D 2012-09-11 9:41 ` Shubhrajyoti D 2012-09-11 9:41 ` [PATCHv7 02/23] i2c: omap: simplify num_bytes handling Shubhrajyoti D 2012-09-11 9:41 ` Shubhrajyoti D 2012-09-11 9:41 ` [PATCHv7 04/23] i2c: omap: add blank lines Shubhrajyoti D 2012-09-11 9:41 ` Shubhrajyoti D [not found] ` <1347356538-23835-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-09-11 9:41 ` [PATCHv7 03/23] i2c: omap: decrease indentation level on data handling Shubhrajyoti D 2012-09-11 9:41 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 05/23] i2c: omap: simplify omap_i2c_ack_stat() Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 06/23] i2c: omap: split out [XR]DR and [XR]RDY Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 09/23] i2c: omap: switch over to do {} while loop Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 15/23] i2c: omap: simplify IRQ exit path Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 18/23] i2c: omap: remove redundant status read Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D [not found] ` <1347356538-23835-19-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-09-11 21:54 ` Wolfram Sang 2012-09-11 21:54 ` Wolfram Sang [not found] ` <20120911215441.GC27031-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-09-12 6:51 ` Shubhrajyoti 2012-09-12 6:51 ` Shubhrajyoti 2012-09-11 9:42 ` [PATCHv7 20/23] i2c: omap: switch to threaded IRQ support Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 21:51 ` Wolfram Sang 2012-09-11 21:51 ` Wolfram Sang [not found] ` <20120911215112.GA27031-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-09-12 6:25 ` Shubhrajyoti 2012-09-12 6:25 ` Shubhrajyoti 2012-09-12 11:51 ` Wolfram Sang 2012-09-12 11:51 ` Wolfram Sang 2012-09-11 9:42 ` [PATCHv7 22/23] i2c: omap: switch over to autosuspend API Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D [this message] 2012-09-11 9:42 ` [PATCHv7 23/23] i2c: omap: sanitize exit path Shubhrajyoti D 2012-09-11 22:00 ` [PATCHv7 00/23]I2C big cleanup Wolfram Sang 2012-09-11 22:00 ` Wolfram Sang 2012-09-12 10:11 ` Shubhrajyoti 2012-09-12 10:11 ` Shubhrajyoti [not found] ` <50505FDC.4090500-l0cyMroinI0@public.gmane.org> 2012-09-12 10:18 ` Wolfram Sang 2012-09-12 10:18 ` Wolfram Sang [not found] ` <20120912101850.GB2624-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-09-12 13:44 ` Wolfram Sang 2012-09-12 13:44 ` Wolfram Sang [not found] ` <20120912134427.GC16547-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-09-12 14:40 ` Shubhrajyoti Datta 2012-09-12 14:40 ` Shubhrajyoti Datta 2012-09-11 9:42 ` [PATCHv7 07/23] i2c: omap: improve i462 errata handling Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 08/23] i2c: omap: re-factor receive/transmit data loop Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 10/23] i2c: omap: ack IRQ in parts Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 11/23] i2c: omap: switch to platform_get_irq() Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 12/23] i2c: omap: bus: add a receiver flag Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 13/23] i2c: omap: simplify errata check Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 14/23] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 16/23] i2c: omap: resize fifos before each message Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 17/23] i2c: omap: get rid of the "complete" label Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 9:42 ` [PATCHv7 19/23] i2c: omap: always return IRQ_HANDLED Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D [not found] ` <1347356538-23835-20-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2012-09-11 21:53 ` Wolfram Sang 2012-09-11 21:53 ` Wolfram Sang [not found] ` <20120911215341.GB27031-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-09-12 6:42 ` Shubhrajyoti 2012-09-12 6:42 ` Shubhrajyoti 2012-09-11 9:42 ` [PATCHv7 21/23] i2c: omap: remove unnecessary pm_runtime_suspended check Shubhrajyoti D 2012-09-11 9:42 ` Shubhrajyoti D 2012-09-11 10:18 ` [PATCHv7 00/23]I2C big cleanup Shubhrajyoti 2012-09-11 10:18 ` Shubhrajyoti 2012-09-11 12:05 ` Felipe Balbi 2012-09-11 12:05 ` Felipe Balbi
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=1347356538-23835-24-git-send-email-shubhrajyoti@ti.com \ --to=shubhrajyoti-l0cymroini0@public.gmane.org \ --cc=balbi-l0cyMroinI0@public.gmane.org \ --cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \ --cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ /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: linkBe 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.