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: [PATCHv3 17/17] i2c: omap: get rid of the "complete" label Date: Fri, 29 Jun 2012 15:43:37 +0530 [thread overview] Message-ID: <1340964817-8599-18-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1340964817-8599-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> From: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> we can ack stat and complete the command from the errata handling itself. 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 | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index ac3bdae..bd8d282 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -794,6 +794,17 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev) if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); + if (stat & OMAP_I2C_STAT_NACK) { + dev->cmd_err |= OMAP_I2C_STAT_NACK; + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); + } + + if (stat & OMAP_I2C_STAT_AL) { + dev_err(dev->dev, "Arbitration lost\n"); + dev->cmd_err |= OMAP_I2C_STAT_AL; + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); + } + return -EIO; } @@ -895,7 +906,6 @@ omap_i2c_isr(int this_irq, void *dev_id) goto out; } -complete: if (stat & OMAP_I2C_STAT_NACK) { err |= OMAP_I2C_STAT_NACK; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); @@ -962,7 +972,7 @@ complete: ret = omap_i2c_transmit_data(dev, num_bytes, true); stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); if (ret < 0) - goto complete; + goto out; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); continue; @@ -978,7 +988,7 @@ complete: ret = omap_i2c_transmit_data(dev, num_bytes, false); stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); if (ret < 0) - goto complete; + goto out; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); continue; -- 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 17/17] i2c: omap: get rid of the "complete" label Date: Fri, 29 Jun 2012 15:43:37 +0530 [thread overview] Message-ID: <1340964817-8599-18-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> we can ack stat and complete the command from the errata handling itself. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- drivers/i2c/busses/i2c-omap.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index ac3bdae..bd8d282 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -794,6 +794,17 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev) if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); + if (stat & OMAP_I2C_STAT_NACK) { + dev->cmd_err |= OMAP_I2C_STAT_NACK; + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); + } + + if (stat & OMAP_I2C_STAT_AL) { + dev_err(dev->dev, "Arbitration lost\n"); + dev->cmd_err |= OMAP_I2C_STAT_AL; + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); + } + return -EIO; } @@ -895,7 +906,6 @@ omap_i2c_isr(int this_irq, void *dev_id) goto out; } -complete: if (stat & OMAP_I2C_STAT_NACK) { err |= OMAP_I2C_STAT_NACK; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); @@ -962,7 +972,7 @@ complete: ret = omap_i2c_transmit_data(dev, num_bytes, true); stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); if (ret < 0) - goto complete; + goto out; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); continue; @@ -978,7 +988,7 @@ complete: ret = omap_i2c_transmit_data(dev, num_bytes, false); stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG); if (ret < 0) - goto complete; + goto out; omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); continue; -- 1.7.5.4
next prev 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 ` Shubhrajyoti D [this message] 2012-06-29 10:13 ` [PATCHv3 17/17] i2c: omap: get rid of the "complete" label 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 ` [PATCHv3 15/17] i2c: omap: simplify IRQ exit path Shubhrajyoti D 2012-06-29 10:13 ` 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-18-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.