| Message ID | 1423393458-30334-1-git-send-email-hofrat@osadl.org |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, 08 Feb 2015, Nicholas Mc Guire wrote: > return type of wait_for_completion_timeout is unsigned long not int. as > time_left is used for wait_for_completion_timeout exclusively here its > type is simply changed to unsigned long. > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> > --- > > Patch was only compile tested with > > Patch is against 3.19.0-rc7 (localversion-next is -next-20150204) > > drivers/i2c/busses/i2c-bcm2835.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Lee Jones <lee.jones@linaro.org> > diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c > index 5d6feb9..c9336a3 100644 > --- a/drivers/i2c/busses/i2c-bcm2835.c > +++ b/drivers/i2c/busses/i2c-bcm2835.c > @@ -147,7 +147,7 @@ static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev, > struct i2c_msg *msg) > { > u32 c; > - int time_left; > + unsigned long time_left; > > i2c_dev->msg_buf = msg->buf; > i2c_dev->msg_buf_remaining = msg->len;
On Sun, Feb 08, 2015 at 06:04:18AM -0500, Nicholas Mc Guire wrote: > return type of wait_for_completion_timeout is unsigned long not int. as > time_left is used for wait_for_completion_timeout exclusively here its > type is simply changed to unsigned long. > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index 5d6feb9..c9336a3 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -147,7 +147,7 @@ static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev, struct i2c_msg *msg) { u32 c; - int time_left; + unsigned long time_left; i2c_dev->msg_buf = msg->buf; i2c_dev->msg_buf_remaining = msg->len;
return type of wait_for_completion_timeout is unsigned long not int. as time_left is used for wait_for_completion_timeout exclusively here its type is simply changed to unsigned long. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> --- Patch was only compile tested with Patch is against 3.19.0-rc7 (localversion-next is -next-20150204) drivers/i2c/busses/i2c-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)