From mboxrd@z Thu Jan 1 00:00:00 1970 From: w.sang@pengutronix.de (Wolfram Sang) Date: Mon, 12 Nov 2012 18:26:51 +0100 Subject: [PATCH 1/7] I2c-nomadik: Fix the usage of wait_for_completion_timeout In-Reply-To: <1352222317.15558.1584.camel@cliu38-desktop-build> References: <1352222317.15558.1584.camel@cliu38-desktop-build> Message-ID: <20121112172651.GC15159@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Nov 07, 2012 at 01:18:37AM +0800, Chuansheng Liu wrote: > > The return value of wait_for_completion_timeout() is always > >= 0 with unsigned int type. > > So the condition "ret < 0" or "ret >= 0" is pointless. > > Signed-off-by: liu chuansheng You forgot to add the i2c-list, so I nearly overlooked this patch. Luckily I haven't, so applied to for-next, thanks! Did you use a script to find all occurences? Would be nice to know. Also, please take care of the subject line. "I2c" is misspelled. @Linus: I am not pushing out today, so if you want to add acks or so... Thanks, Wolfram > --- > drivers/i2c/busses/i2c-nomadik.c | 14 -------------- > 1 files changed, 0 insertions(+), 14 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c > index 02c3115..8b2ffcf 100644 > --- a/drivers/i2c/busses/i2c-nomadik.c > +++ b/drivers/i2c/busses/i2c-nomadik.c > @@ -435,13 +435,6 @@ static int read_i2c(struct nmk_i2c_dev *dev, u16 flags) > timeout = wait_for_completion_timeout( > &dev->xfer_complete, dev->adap.timeout); > > - if (timeout < 0) { > - dev_err(&dev->adev->dev, > - "wait_for_completion_timeout " > - "returned %d waiting for event\n", timeout); > - status = timeout; > - } > - > if (timeout == 0) { > /* Controller timed out */ > dev_err(&dev->adev->dev, "read from slave 0x%x timed out\n", > @@ -523,13 +516,6 @@ static int write_i2c(struct nmk_i2c_dev *dev, u16 flags) > timeout = wait_for_completion_timeout( > &dev->xfer_complete, dev->adap.timeout); > > - if (timeout < 0) { > - dev_err(&dev->adev->dev, > - "wait_for_completion_timeout " > - "returned %d waiting for event\n", timeout); > - status = timeout; > - } > - > if (timeout == 0) { > /* Controller timed out */ > dev_err(&dev->adev->dev, "write to slave 0x%x timed out\n", > -- > 1.7.0.4 > > > -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: