public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed
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,
	Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
Subject: [PATCHv8 10/18] I2C: OMAP: Don't check if wait_for_completion_timeout() returns less than zero
Date: Thu, 12 Apr 2012 18:36:27 +0530	[thread overview]
Message-ID: <1334235995-6727-11-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334235995-6727-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>

By definition, wait_for_completion_timeout() returns an unsigned value and
therefore, it is not necessary to check if the return value is less than zero
as this is not possible.

This is based on a patch from Jon Hunter <jon-hunter-l0cyMroinI0@public.gmane.org>
Changes from his patch
- Declare a long as the wait_for_completion_timeout returns long.

Original patch is
http://git.omapzoom.org/?p=kernel/omap.git;a=commitdiff;h=ea02cece7b0000bc736e60c4188a11aaa74bc6e6

Cc : Jon Hunter <jon-hunter-l0cyMroinI0@public.gmane.org>
Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
 drivers/i2c/busses/i2c-omap.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 959e97c..121c52e 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -502,7 +502,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
 			     struct i2c_msg *msg, int stop)
 {
 	struct omap_i2c_dev *dev = i2c_get_adapdata(adap);
-	int r;
+	unsigned long timeout;
 	u16 w;
 
 	dev_dbg(dev->dev, "addr: 0x%04x, len: %d, flags: 0x%x, stop: %d\n",
@@ -570,12 +570,10 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
 	 * REVISIT: We should abort the transfer on signals, but the bus goes
 	 * into arbitration and we're currently unable to recover from it.
 	 */
-	r = wait_for_completion_timeout(&dev->cmd_complete,
-					OMAP_I2C_TIMEOUT);
+	timeout = wait_for_completion_timeout(&dev->cmd_complete,
+						OMAP_I2C_TIMEOUT);
 	dev->buf_len = 0;
-	if (r < 0)
-		return r;
-	if (r == 0) {
+	if (timeout == 0) {
 		dev_err(dev->dev, "controller timed out\n");
 		omap_i2c_reset(dev);
 		omap_i2c_init(dev);
-- 
1.7.4.1

  parent reply	other threads:[~2012-04-12 13:06 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-12 13:06 [PATCHv8 00/18] I2C Updates Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 02/18] I2C: OMAP: Remove reset at init Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 05/18] I2C: OMAP: Fix the interrupt clearing in OMAP4 Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 06/18] I2C: OMAP: Fix the mismatch of pm_runtime enable and disable Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 07/18] I2C: OMAP: Optimise the remove code Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 11/18] I2C: OMAP: use devm_* functions Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 14/18] I2C: OMAP: Use SET_RUNTIME_PM_OPS Shubhrajyoti D
2012-04-12 13:06 ` [PATCHv8 16/18] I2C: OMAP: fix missing handling of errata I2C_OMAP3_1P153 Shubhrajyoti D
     [not found] ` <1334235995-6727-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-12 13:06   ` [PATCHv8 01/18] I2C: OMAP: make omap_i2c_unidle/idle functions depend on CONFIG_PM_RUNTIME Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 03/18] I2C: OMAP: Recover from Bus Busy condition Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 04/18] I2C: OMAP: I2C register restore only if context is lost Shubhrajyoti D
2012-04-16 18:13     ` Tony Lindgren
2012-04-17  5:50       ` Shubhrajyoti
     [not found]     ` <1334235995-6727-5-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-17 13:45       ` Kevin Hilman
     [not found]         ` <87d376zd2v.fsf-l0cyMroinI0@public.gmane.org>
2012-04-17 15:08           ` Shubhrajyoti Datta
2012-04-18  7:19             ` Datta, Shubhrajyoti
2012-04-18 14:08               ` Kevin Hilman
     [not found]                 ` <CANQgH-af1VCutKqpq8jK1yTPHybgvnUNA3zdfQq4AYcWcJRtvA@mail.gmail.com>
     [not found]                   ` <CANQgH-af1VCutKqpq8jK1yTPHybgvnUNA3zdfQq4AYcWcJRtvA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-04-20 14:17                     ` Datta, Shubhrajyoti
2012-04-12 13:06   ` [PATCHv8 08/18] I2C: OMAP: Fix the error handling Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 09/18] I2C: OMAP: Correct I2C revision for OMAP3 Shubhrajyoti D
2012-04-12 13:06   ` Shubhrajyoti D [this message]
2012-04-12 13:06   ` [PATCHv8 12/18] I2C: OMAP: Fix the crash in i2c remove Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 13/18] I2C: OMAP: Handle error check for pm runtime Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 15/18] I2C: OMAP: make the read ready processing a separate function Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 17/18] I2C: OMAP: Do not set the XUDF if the underflow is not reached Shubhrajyoti D
2012-04-12 13:06   ` [PATCHv8 18/18] I2C: OMAP: Rename the 1p153 to the erratum id i462 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=1334235995-6727-11-git-send-email-shubhrajyoti@ti.com \
    --to=shubhrajyoti-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: 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