2017-03-11 19:32:18

by Colin King

Subject: [PATCH] staging: atomisp: clean up return logic, remove redunant code

From: Colin Ian King <[email protected]>

There is no need to check if ret is non-zero, remove this
redundant check and just return the error status from the call
to mt9m114_write_reg_array.

Detected by CoverityScan, CID#1416577 ("Identical code for
different branches")

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/staging/media/atomisp/i2c/mt9m114.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.c b/drivers/staging/media/atomisp/i2c/mt9m114.c
index 8762124..a555aec 100644
--- a/drivers/staging/media/atomisp/i2c/mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/mt9m114.c
@@ -444,12 +444,8 @@ static int mt9m114_set_suspend(struct v4l2_subdev *sd)
static int mt9m114_init_common(struct v4l2_subdev *sd)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
- int ret;

- ret = mt9m114_write_reg_array(client, mt9m114_common, PRE_POLLING);
- if (ret)
- return ret;
- return ret;
+ return mt9m114_write_reg_array(client, mt9m114_common, PRE_POLLING);
}

static int power_ctrl(struct v4l2_subdev *sd, bool flag)
--
2.10.2

2017-03-12 14:57:07

by walter harms

Subject: Re: [PATCH] staging: atomisp: clean up return logic, remove redunant code

Am 11.03.2017 20:32, schrieb Colin King:
> From: Colin Ian King <[email protected]>
>
> There is no need to check if ret is non-zero, remove this
> redundant check and just return the error status from the call
> to mt9m114_write_reg_array.
>
> Detected by CoverityScan, CID#1416577 ("Identical code for
> different branches")
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/staging/media/atomisp/i2c/mt9m114.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.c b/drivers/staging/media/atomisp/i2c/mt9m114.c
> index 8762124..a555aec 100644
> --- a/drivers/staging/media/atomisp/i2c/mt9m114.c
> +++ b/drivers/staging/media/atomisp/i2c/mt9m114.c
> @@ -444,12 +444,8 @@ static int mt9m114_set_suspend(struct v4l2_subdev *sd)
> static int mt9m114_init_common(struct v4l2_subdev *sd)
> {
> struct i2c_client *client = v4l2_get_subdevdata(sd);
> - int ret;
>
> - ret = mt9m114_write_reg_array(client, mt9m114_common, PRE_POLLING);
> - if (ret)
> - return ret;
> - return ret;
> + return mt9m114_write_reg_array(client, mt9m114_common, PRE_POLLING);
> }


any use for "client" ?

re,
wh

>
> static int power_ctrl(struct v4l2_subdev *sd, bool flag)

2017-03-12 15:00:59

by Julia Lawall

Subject: Re: [PATCH] staging: atomisp: clean up return logic, remove redunant code

On Sun, 12 Mar 2017, walter harms wrote:

>
>
> Am 11.03.2017 20:32, schrieb Colin King:
> > From: Colin Ian King <[email protected]>
> >
> > There is no need to check if ret is non-zero, remove this
> > redundant check and just return the error status from the call
> > to mt9m114_write_reg_array.
> >
> > Detected by CoverityScan, CID#1416577 ("Identical code for
> > different branches")
> >
> > Signed-off-by: Colin Ian King <[email protected]>
> > ---
> > drivers/staging/media/atomisp/i2c/mt9m114.c | 6 +-----
> > 1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.c b/drivers/staging/media/atomisp/i2c/mt9m114.c
> > index 8762124..a555aec 100644
> > --- a/drivers/staging/media/atomisp/i2c/mt9m114.c
> > +++ b/drivers/staging/media/atomisp/i2c/mt9m114.c
> > @@ -444,12 +444,8 @@ static int mt9m114_set_suspend(struct v4l2_subdev *sd)
> > static int mt9m114_init_common(struct v4l2_subdev *sd)
> > {
> > struct i2c_client *client = v4l2_get_subdevdata(sd);
> > - int ret;
> >
> > - ret = mt9m114_write_reg_array(client, mt9m114_common, PRE_POLLING);
> > - if (ret)
> > - return ret;
> > - return ret;
> > + return mt9m114_write_reg_array(client, mt9m114_common, PRE_POLLING);
> > }
>
>
> any use for "client" ?

I guess the code would be on two lines in any case. It looks like a nice
decomposition as is.

julia