Re: [PATCH] [media] ov5645: Move an error code assignment in ov5645_probe()
Hi, On 15.03.2018 00:17, Sakari Ailus wrote: > On Wed, Mar 14, 2018 at 10:15:43PM +0100, SF Markus Elfring wrote: >> From: Markus Elfring >> Date: Wed, 14 Mar 2018 22:02:52 +0100 >> >> Move an assignment for a specific error code so that it is stored only once >> in this function implementation. >> >> This issue was detected by using the Coccinelle software. > > How? > >> >> Signed-off-by: Markus Elfring >> --- >> drivers/media/i2c/ov5645.c | 6 +- >> 1 file changed, 1 insertion(+), 5 deletions(-) >> >> diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c >> index d28845f7356f..374576380fd4 100644 >> --- a/drivers/media/i2c/ov5645.c >> +++ b/drivers/media/i2c/ov5645.c >> @@ -1284,13 +1284,11 @@ static int ov5645_probe(struct i2c_client *client, >> ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_HIGH, &chip_id_high); >> if (ret < 0 || chip_id_high != OV5645_CHIP_ID_HIGH_BYTE) { >> dev_err(dev, "could not read ID high\n"); >> -ret = -ENODEV; >> goto power_down; >> } >> ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_LOW, &chip_id_low); >> if (ret < 0 || chip_id_low != OV5645_CHIP_ID_LOW_BYTE) { >> dev_err(dev, "could not read ID low\n"); >> -ret = -ENODEV; >> goto power_down; >> } >> >> @@ -1300,7 +1298,6 @@ static int ov5645_probe(struct i2c_client *client, >>&ov5645->aec_pk_manual); >> if (ret < 0) { >> dev_err(dev, "could not read AEC/AGC mode\n"); >> -ret = -ENODEV; >> goto power_down; >> } >> >> @@ -1308,7 +1305,6 @@ static int ov5645_probe(struct i2c_client *client, >>&ov5645->timing_tc_reg20); >> if (ret < 0) { >> dev_err(dev, "could not read vflip value\n"); >> -ret = -ENODEV; >> goto power_down; >> } >> >> @@ -1316,7 +1312,6 @@ static int ov5645_probe(struct i2c_client *client, >>&ov5645->timing_tc_reg21); >> if (ret < 0) { >> dev_err(dev, "could not read hflip value\n"); >> -ret = -ENODEV; >> goto power_down; >> } >> >> @@ -1334,6 +1329,7 @@ static int ov5645_probe(struct i2c_client *client, >> >> power_down: >> ov5645_s_power(&ov5645->sd, false); >> +ret = -ENODEV; > > I don't think this is where people would expect you to set the error code > in general. It should rather take place before goto, not after it. That'd > mean another variable, and I'm not convinced the result would improve the > driver. I agree with Sakari. > >> free_entity: >> media_entity_cleanup(&ov5645->sd.entity); >> free_ctrl: > -- Best regards, Todor Tomov
Re: [PATCH] [media] ov5645: Move an error code assignment in ov5645_probe()
On Wed, Mar 14, 2018 at 10:15:43PM +0100, SF Markus Elfring wrote: > From: Markus Elfring > Date: Wed, 14 Mar 2018 22:02:52 +0100 > > Move an assignment for a specific error code so that it is stored only once > in this function implementation. > > This issue was detected by using the Coccinelle software. How? > > Signed-off-by: Markus Elfring > --- > drivers/media/i2c/ov5645.c | 6 +- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c > index d28845f7356f..374576380fd4 100644 > --- a/drivers/media/i2c/ov5645.c > +++ b/drivers/media/i2c/ov5645.c > @@ -1284,13 +1284,11 @@ static int ov5645_probe(struct i2c_client *client, > ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_HIGH, &chip_id_high); > if (ret < 0 || chip_id_high != OV5645_CHIP_ID_HIGH_BYTE) { > dev_err(dev, "could not read ID high\n"); > - ret = -ENODEV; > goto power_down; > } > ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_LOW, &chip_id_low); > if (ret < 0 || chip_id_low != OV5645_CHIP_ID_LOW_BYTE) { > dev_err(dev, "could not read ID low\n"); > - ret = -ENODEV; > goto power_down; > } > > @@ -1300,7 +1298,6 @@ static int ov5645_probe(struct i2c_client *client, > &ov5645->aec_pk_manual); > if (ret < 0) { > dev_err(dev, "could not read AEC/AGC mode\n"); > - ret = -ENODEV; > goto power_down; > } > > @@ -1308,7 +1305,6 @@ static int ov5645_probe(struct i2c_client *client, > &ov5645->timing_tc_reg20); > if (ret < 0) { > dev_err(dev, "could not read vflip value\n"); > - ret = -ENODEV; > goto power_down; > } > > @@ -1316,7 +1312,6 @@ static int ov5645_probe(struct i2c_client *client, > &ov5645->timing_tc_reg21); > if (ret < 0) { > dev_err(dev, "could not read hflip value\n"); > - ret = -ENODEV; > goto power_down; > } > > @@ -1334,6 +1329,7 @@ static int ov5645_probe(struct i2c_client *client, > > power_down: > ov5645_s_power(&ov5645->sd, false); > + ret = -ENODEV; I don't think this is where people would expect you to set the error code in general. It should rather take place before goto, not after it. That'd mean another variable, and I'm not convinced the result would improve the driver. > free_entity: > media_entity_cleanup(&ov5645->sd.entity); > free_ctrl: -- Regards, Sakari Ailus sakari.ai...@linux.intel.com
[PATCH] [media] ov5645: Move an error code assignment in ov5645_probe()
From: Markus Elfring Date: Wed, 14 Mar 2018 22:02:52 +0100 Move an assignment for a specific error code so that it is stored only once in this function implementation. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/media/i2c/ov5645.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c index d28845f7356f..374576380fd4 100644 --- a/drivers/media/i2c/ov5645.c +++ b/drivers/media/i2c/ov5645.c @@ -1284,13 +1284,11 @@ static int ov5645_probe(struct i2c_client *client, ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_HIGH, &chip_id_high); if (ret < 0 || chip_id_high != OV5645_CHIP_ID_HIGH_BYTE) { dev_err(dev, "could not read ID high\n"); - ret = -ENODEV; goto power_down; } ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_LOW, &chip_id_low); if (ret < 0 || chip_id_low != OV5645_CHIP_ID_LOW_BYTE) { dev_err(dev, "could not read ID low\n"); - ret = -ENODEV; goto power_down; } @@ -1300,7 +1298,6 @@ static int ov5645_probe(struct i2c_client *client, &ov5645->aec_pk_manual); if (ret < 0) { dev_err(dev, "could not read AEC/AGC mode\n"); - ret = -ENODEV; goto power_down; } @@ -1308,7 +1305,6 @@ static int ov5645_probe(struct i2c_client *client, &ov5645->timing_tc_reg20); if (ret < 0) { dev_err(dev, "could not read vflip value\n"); - ret = -ENODEV; goto power_down; } @@ -1316,7 +1312,6 @@ static int ov5645_probe(struct i2c_client *client, &ov5645->timing_tc_reg21); if (ret < 0) { dev_err(dev, "could not read hflip value\n"); - ret = -ENODEV; goto power_down; } @@ -1334,6 +1329,7 @@ static int ov5645_probe(struct i2c_client *client, power_down: ov5645_s_power(&ov5645->sd, false); + ret = -ENODEV; free_entity: media_entity_cleanup(&ov5645->sd.entity); free_ctrl: -- 2.16.2