2015-02-08 16:16:20

by Nicholas Mc Guire

Subject: [PATCH] i2c: at91: fixup return type of wait_for_completion_timeout

Return type of wait_for_completion_timeout is unsigned long not int. This
patch adds a timeout variable of appropriate type and fixes up the assignment.

Signed-off-by: Nicholas Mc Guire <[email protected]>
---

Patch was only compile tested with at91_dt_defconfig
(implies CONFIG_I2C_AT91=y)

Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)

drivers/i2c/busses/i2c-at91.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 636fd2e..79c6404 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -381,6 +381,7 @@ static irqreturn_t atmel_twi_interrupt(int irq, void *dev_id)
static int at91_do_twi_transfer(struct at91_twi_dev *dev)
{
int ret;
+ unsigned long timeout;
bool has_unre_flag = dev->pdata->has_unre_flag;

dev_dbg(dev->dev, "transfer: %s %d bytes.\n",
@@ -436,9 +437,9 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
}
}

- ret = wait_for_completion_timeout(&dev->cmd_complete,
- dev->adapter.timeout);
- if (ret == 0) {
+ timeout = wait_for_completion_timeout(&dev->cmd_complete,
+ dev->adapter.timeout);
+ if (timeout == 0) {
dev_err(dev->dev, "controller timed out\n");
at91_init_twi_bus(dev);
ret = -ETIMEDOUT;
--
1.7.10.4

2015-02-10 16:39:28

by Ludovic Desroches

Subject: Re: [PATCH] i2c: at91: fixup return type of wait_for_completion_timeout

On Sun, Feb 08, 2015 at 11:12:07AM -0500, Nicholas Mc Guire wrote:
> Return type of wait_for_completion_timeout is unsigned long not int. This
> patch adds a timeout variable of appropriate type and fixes up the assignment.
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>
Acked-by: Ludovic Desroches <[email protected]>

Thanks

> ---
>
> Patch was only compile tested with at91_dt_defconfig
> (implies CONFIG_I2C_AT91=y)
>
> Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
>
> drivers/i2c/busses/i2c-at91.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
> index 636fd2e..79c6404 100644
> --- a/drivers/i2c/busses/i2c-at91.c
> +++ b/drivers/i2c/busses/i2c-at91.c
> @@ -381,6 +381,7 @@ static irqreturn_t atmel_twi_interrupt(int irq, void *dev_id)
> static int at91_do_twi_transfer(struct at91_twi_dev *dev)
> {
> int ret;
> + unsigned long timeout;
> bool has_unre_flag = dev->pdata->has_unre_flag;
>
> dev_dbg(dev->dev, "transfer: %s %d bytes.\n",
> @@ -436,9 +437,9 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
> }
> }
>
> - ret = wait_for_completion_timeout(&dev->cmd_complete,
> - dev->adapter.timeout);
> - if (ret == 0) {
> + timeout = wait_for_completion_timeout(&dev->cmd_complete,
> + dev->adapter.timeout);
> + if (timeout == 0) {
> dev_err(dev->dev, "controller timed out\n");
> at91_init_twi_bus(dev);
> ret = -ETIMEDOUT;
> --
> 1.7.10.4
>