mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Felipe Balbi <balbi@ti.com>
To: ben-linux@fluff.org
Cc: Tony Lindgren <tony@atomide.com>,
	w.sang@pengutronix.de,
	Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
	linux-i2c@vger.kernel.org,
	Linux ARM Kernel Mailing List 
	<linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Felipe Balbi <balbi@ti.com>
Subject: [PATCH 04/17] i2c: omap: simplify omap_i2c_ack_stat()
Date: Thu, 14 Jun 2012 13:20:37 +0300	[thread overview]
Message-ID: <1339669250-9183-5-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1339669250-9183-1-git-send-email-balbi@ti.com>

stat & BIT(1) is the same as BIT(1), so let's
simplify things a bit by removing "stat &" from
all omap_i2c_ack_stat() calls.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/i2c/busses/i2c-omap.c |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 07ae391..fa9ddb6 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -774,8 +774,8 @@ static int errata_omap3_1p153(struct omap_i2c_dev *dev, u16 *stat, int *err)
 
 	while (--timeout && !(*stat & OMAP_I2C_STAT_XUDF)) {
 		if (*stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) {
-			omap_i2c_ack_stat(dev, *stat & (OMAP_I2C_STAT_XRDY |
-							OMAP_I2C_STAT_XDR));
+			omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY |
+					OMAP_I2C_STAT_XDR));
 			*err |= OMAP_I2C_STAT_XUDF;
 			return -ETIMEDOUT;
 		}
@@ -835,10 +835,11 @@ complete:
 		 */
 		if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
 					OMAP_I2C_STAT_AL)) {
-			omap_i2c_ack_stat(dev, stat &
-				(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |
-				OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR |
-				OMAP_I2C_STAT_ARDY));
+			omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |
+						OMAP_I2C_STAT_RDR |
+						OMAP_I2C_STAT_XRDY |
+						OMAP_I2C_STAT_XDR |
+						OMAP_I2C_STAT_ARDY));
 			omap_i2c_complete_cmd(dev, err);
 			return IRQ_HANDLED;
 		}
@@ -885,8 +886,8 @@ complete:
 					}
 				}
 			}
-			omap_i2c_ack_stat(dev,
-				stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR));
+			omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |
+						OMAP_I2C_STAT_RDR));
 			continue;
 		}
 
@@ -933,8 +934,8 @@ complete:
 
 				omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
 			}
-			omap_i2c_ack_stat(dev,
-				stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
+			omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY |
+						OMAP_I2C_STAT_XDR));
 			continue;
 		}
 
-- 
1.7.10.4


  parent reply	other threads:[~2012-06-14 10:23 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-14 10:20 [PATCH 00/17] Big OMAP I2C Cleanup Felipe Balbi
2012-06-14 10:20 ` [PATCH 01/17] i2c: omap: simplify num_bytes handling Felipe Balbi
2012-06-14 10:33   ` Shilimkar, Santosh
2012-06-14 10:20 ` [PATCH 02/17] i2c: omap: decrease indentation level on data handling Felipe Balbi
2012-06-14 10:41   ` Shilimkar, Santosh
2012-06-14 10:40     ` Felipe Balbi
2012-06-14 10:20 ` [PATCH 03/17] i2c: omap: add blank lines Felipe Balbi
2012-06-14 10:43   ` Shilimkar, Santosh
2012-06-14 10:20 ` Felipe Balbi [this message]
2012-06-14 10:45   ` [PATCH 04/17] i2c: omap: simplify omap_i2c_ack_stat() Shilimkar, Santosh
2012-06-14 11:13   ` Russell King - ARM Linux
2012-06-14 11:45     ` Felipe Balbi
2012-06-14 10:20 ` [PATCH 05/17] i2c: omap: split out [XR]DR and [XR]RDY Felipe Balbi
2012-06-14 10:20 ` [PATCH 06/17] i2c: omap: improve 1p153 errata handling Felipe Balbi
2012-06-14 11:01   ` Shilimkar, Santosh
2012-06-14 11:17   ` Russell King - ARM Linux
2012-06-14 11:48     ` Felipe Balbi
2012-06-14 10:20 ` [PATCH 07/17] i2c: omap: re-factor receive/transmit data loop Felipe Balbi
2012-06-14 10:20 ` [PATCH 08/17] i2c: omap: switch over to do {} while loop Felipe Balbi
2012-06-14 11:03   ` Shilimkar, Santosh
2012-06-14 11:05     ` Felipe Balbi
2012-06-14 10:20 ` [PATCH 09/17] i2c: omap: ack IRQ in parts Felipe Balbi
2012-06-14 11:11   ` Shilimkar, Santosh
2012-06-14 11:46     ` Felipe Balbi
2012-06-14 11:20   ` Russell King - ARM Linux
2012-06-14 11:47     ` Felipe Balbi
2012-06-14 10:20 ` [PATCH 10/17] i2c: omap: get rid of the "complete" label Felipe Balbi
2012-06-14 10:20 ` [PATCH 11/17] i2c: omap: switch to devm_* API Felipe Balbi
2012-06-14 10:20 ` [PATCH 12/17] i2c: omap: switch to platform_get_irq() Felipe Balbi
2012-06-14 10:20 ` [PATCH 13/17] i2c: omap: bus: add a receiver flag Felipe Balbi
2012-06-14 10:20 ` [PATCH 14/17] i2c: omap: simplify errata check Felipe Balbi
2012-06-14 10:20 ` [PATCH 15/17] i2c: omap: always return IRQ_HANDLED Felipe Balbi
2012-06-14 11:18   ` Shilimkar, Santosh
2012-06-14 11:23     ` Russell King - ARM Linux
2012-06-14 11:25       ` Shilimkar, Santosh
2012-06-14 10:20 ` [PATCH 16/17] i2c: omap: simplify IRQ exit path Felipe Balbi
2012-06-14 10:20 ` [PATCH 17/17] i2c: omap: resize fifos before each message Felipe Balbi
2012-06-14 11:23 ` [PATCH 00/17] Big OMAP I2C Cleanup Shilimkar, Santosh

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=1339669250-9183-5-git-send-email-balbi@ti.com \
    --to=balbi@ti.com \
    --cc=ben-linux@fluff.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®