[PATCH] i2c: axxia: match return type of wait_for_completion_timeout

[PATCH] i2c: axxia: match return type of wait_for_completion_timeout

[Nicholas Mc Guire]

return type of wait_for_completion_timeout is unsigned long not int. as ret
is only used for wait_for_completion_timeout here the type is simply changed
unsigned long.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---

Patch was only compile tested with axm55xx_defconfig
(implies CONFIG_I2C_AXXIA=y)

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

 drivers/i2c/busses/i2c-axxia.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index 1decc88..9434824 100644
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -408,7 +408,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)
 static int axxia_i2c_stop(struct axxia_i2c_dev *idev)
 {
 	u32 int_mask = MST_STATUS_ERR | MST_STATUS_SCC;
-	int ret;
+	unsigned long ret;
 
 	reinit_completion(&idev->msg_complete);
 
-- 
1.7.10.4

Re: [PATCH] i2c: axxia: match return type of wait_for_completion_timeout

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]

On Sun, Feb 08, 2015 at 05:31:25AM -0500, Nicholas Mc Guire wrote:
> return type of wait_for_completion_timeout is unsigned long not int. as ret
> is only used for wait_for_completion_timeout here the type is simply changed
> unsigned long.
> 
> Signed-off-by: Nicholas Mc Guire <hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.org>
> ---
> 
> Patch was only compile tested with axm55xx_defconfig
> (implies CONFIG_I2C_AXXIA=y)
> 
> Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
> 
>  drivers/i2c/busses/i2c-axxia.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
> index 1decc88..9434824 100644
> --- a/drivers/i2c/busses/i2c-axxia.c
> +++ b/drivers/i2c/busses/i2c-axxia.c
> @@ -408,7 +408,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)
>  static int axxia_i2c_stop(struct axxia_i2c_dev *idev)
>  {
>  	u32 int_mask = MST_STATUS_ERR | MST_STATUS_SCC;
> -	int ret;
> +	unsigned long ret;

'ret' being an int is kind of an idiom, so I'd rather see the variable
renamed, too, like the other patches do.

Also, please combine the two axxia patches into one.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] i2c: axxia: match return type of wait_for_completion_timeout

[Nicholas Mc Guire]

On Sun, 08 Feb 2015, Wolfram Sang wrote:

> On Sun, Feb 08, 2015 at 05:31:25AM -0500, Nicholas Mc Guire wrote:
> > return type of wait_for_completion_timeout is unsigned long not int. as ret
> > is only used for wait_for_completion_timeout here the type is simply changed
> > unsigned long.
> > 
> > Signed-off-by: Nicholas Mc Guire <hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.org>
> > ---
> > 
> > Patch was only compile tested with axm55xx_defconfig
> > (implies CONFIG_I2C_AXXIA=y)
> > 
> > Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
> > 
> >  drivers/i2c/busses/i2c-axxia.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
> > index 1decc88..9434824 100644
> > --- a/drivers/i2c/busses/i2c-axxia.c
> > +++ b/drivers/i2c/busses/i2c-axxia.c
> > @@ -408,7 +408,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)
> >  static int axxia_i2c_stop(struct axxia_i2c_dev *idev)
> >  {
> >  	u32 int_mask = MST_STATUS_ERR | MST_STATUS_SCC;
> > -	int ret;
> > +	unsigned long ret;
> 
> 'ret' being an int is kind of an idiom, so I'd rather see the variable
> renamed, too, like the other patches do.
>
thanks - was not renaming variables - only if a new one was introduced I
gave it a name that was related to the timeout use. Will consider that 
for some of the other cleanups then as well.
 
> Also, please combine the two axxia patches into one.
> 
done and resent.

thx!
hofrat