Skip to contentSkip to conversation

Fix some W=1 clang Werror at staging/media

PATCH In review Mauro Carvalho Chehab 5 participants 11 messages Nov 11, 2021 – Nov 16, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover Fix some W=1 clang Werror at staging/media

Currently, there are three errors produced when building with clang with CONFIG_WERROR and W=1. Address them.

Mauro Carvalho Chehab (3):
media: ipu3: drop an unused variable
media: atomisp-gc2235: drop an unused var
media: atomisp: handle errors at sh_css_create_isp_params()

 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 8 +++++---
 drivers/staging/media/atomisp/pci/sh_css_params.c  | 4 ++++
 drivers/staging/media/ipu3/ipu3-css-params.c       | 3 ---
 3 files changed, 9 insertions(+), 6 deletions(-)
Signature · 1 line
2.33.1
#1 lore raw

PATCH 1/3 media: ipu3: drop an unused variable

Fix this clang Werror with W=1:

	drivers/staging/media/ipu3/ipu3-css-params.c:774:8: error: variable 'pin_scale' set but not used [-Werror,-Wunused-but-set-variable]
	                        int pin_scale = 0;
	                            ^

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/ipu3/ipu3-css-params.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/staging/media/ipu3/ipu3-css-params.c +0 -3
index e9d6bd9e9332..d9e3c3785075 100644
@@ -771,7 +771,6 @@ static int imgu_css_osys_calc_frame_and_stripe_params(
 		 */
 		{
 			unsigned int i;
-			int pin_scale = 0;
 			/*Input resolution */
 
 			stripe_params[s].input_width = stripe_input_width_y;
@@ -791,8 +790,6 @@ static int imgu_css_osys_calc_frame_and_stripe_params(
 						reso.pin_height[i];
 					stripe_params[s].output_offset[i] =
 						stripe_offset_out_y;
-
-					pin_scale += frame_params[i].scaled;
 				} else {
 					/* Unscaled pin */
 					stripe_params[s].output_width[i] =
Signature · 1 line
2.33.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] media: ipu3: drop an unused variable

Quoted 7 lines · Mauro Carvalho Chehab

Fix this clang Werror with W=1:

	drivers/staging/media/ipu3/ipu3-css-params.c:774:8: error: variable 'pin_scale' set but not used [-Werror,-Wunused-but-set-variable]
	                        int pin_scale = 0;
	                            ^
Quoted 33 lines

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/ipu3/ipu3-css-params.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/staging/media/ipu3/ipu3-css-params.c +0 -3
index e9d6bd9e9332..d9e3c3785075 100644
@@ -771,7 +771,6 @@ static int imgu_css_osys_calc_frame_and_stripe_params(
 		 */
 		{
 			unsigned int i;
-			int pin_scale = 0;
 			/*Input resolution */
 
 			stripe_params[s].input_width = stripe_input_width_y;
@@ -791,8 +790,6 @@ static int imgu_css_osys_calc_frame_and_stripe_params(
 						reso.pin_height[i];
 					stripe_params[s].output_offset[i] =
 						stripe_offset_out_y;
-
-					pin_scale += frame_params[i].scaled;
 				} else {
 					/* Unscaled pin */
 					stripe_params[s].output_width[i] =
Signature · 1 line
2.33.1
maintainer Acked-by on v1 1/3
#3 lore raw

Re: [PATCH 1/3] media: ipu3: drop an unused variable

In reply to Mauro Carvalho Chehab
Quoted 7 lines · Mauro Carvalho Chehab

Fix this clang Werror with W=1:

	drivers/staging/media/ipu3/ipu3-css-params.c:774:8: error: variable 'pin_scale' set but not used [-Werror,-Wunused-but-set-variable]
	                        int pin_scale = 0;
	                            ^

Thanks!

I.e. feel free to merge through your tree, I don't think there's a chance for conflicts here.

Signature · 1 line
Sakari Ailus
#4 lore raw

PATCH 2/3 media: atomisp-gc2235: drop an unused var

In reply to Mauro Carvalho Chehab

Fix this clang Werror with W=1:

drivers/staging/media/atomisp/i2c/atomisp-gc2235.c:573:6: error: variable 'ret' set but not used [-Werror,-Wunused-but-set-variable]

        int ret = -1;
            ^

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +5 -3
index 5e7085264189..0e6b2e6100d1 100644
@@ -570,14 +570,16 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
 static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
 {
 	struct gc2235_device *dev = to_gc2235_sensor(sd);
-	int ret = -1;
+	int ret;
 
 	if (!dev || !dev->platform_data)
 		return -ENODEV;
 
-	ret |= dev->platform_data->gpio1_ctrl(sd, !flag);
+	ret = dev->platform_data->gpio1_ctrl(sd, !flag);
 	usleep_range(60, 90);
-	return dev->platform_data->gpio0_ctrl(sd, flag);
+	ret |= dev->platform_data->gpio0_ctrl(sd, flag);
+
+	return ret;
 }
 
 static int power_up(struct v4l2_subdev *sd)
Signature · 1 line
2.33.1
Reviewed-by on v1 2/3
#5 lore raw

Re: [PATCH 2/3] media: atomisp-gc2235: drop an unused var

Quoted 7 lines · Mauro Carvalho Chehab

Fix this clang Werror with W=1:

drivers/staging/media/atomisp/i2c/atomisp-gc2235.c:573:6: error: variable 'ret' set but not used [-Werror,-Wunused-but-set-variable]

        int ret = -1;
            ^
Quoted 36 lines

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +5 -3
index 5e7085264189..0e6b2e6100d1 100644
@@ -570,14 +570,16 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
 static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
 {
 	struct gc2235_device *dev = to_gc2235_sensor(sd);
-	int ret = -1;
+	int ret;
 
 	if (!dev || !dev->platform_data)
 		return -ENODEV;
 
-	ret |= dev->platform_data->gpio1_ctrl(sd, !flag);
+	ret = dev->platform_data->gpio1_ctrl(sd, !flag);
 	usleep_range(60, 90);
-	return dev->platform_data->gpio0_ctrl(sd, flag);
+	ret |= dev->platform_data->gpio0_ctrl(sd, flag);
+
+	return ret;
 }
 
 static int power_up(struct v4l2_subdev *sd)
Signature · 1 line
2.33.1
#6 lore raw

Re: [PATCH 2/3] media: atomisp-gc2235: drop an unused var

In reply to Mauro Carvalho Chehab
Quoted 9 lines · Mauro Carvalho Chehab

Fix this clang Werror with W=1:

drivers/staging/media/atomisp/i2c/atomisp-gc2235.c:573:6: error: variable 'ret' set but not used [-Werror,-Wunused-but-set-variable]

        int ret = -1;
            ^

---

Looks good.

There should be warning for "int x = -1;" followed by |= because that's a no-op OR assignment.

I'm surprised that clang doesn't print errors about the other implementations of power_ctrl().

drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
448 static int power_ctrl(struct v4l2_subdev *sd, bool flag) 449 {
450 int ret;
451 struct mt9m114_device *dev = to_mt9m114_sensor(sd);
452
453 if (!dev || !dev->platform_data)
454 return -ENODEV;
455
456 if (flag) {
457 ret = dev->platform_data->v2p8_ctrl(sd, 1);
458 if (ret == 0) {
459 ret = dev->platform_data->v1p8_ctrl(sd, 1);
460 if (ret)
461 ret = dev->platform_data->v2p8_ctrl(sd, 0);
462 }
463 } else {
464 ret = dev->platform_data->v2p8_ctrl(sd, 0);

   465                  ret = dev->platform_data->v1p8_ctrl(sd, 0);
                        ^^^^^^
   466          }
   467          return ret;
   468  }
   469  
   470  static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
   471  {
   472          int ret;
   473          struct mt9m114_device *dev = to_mt9m114_sensor(sd);
   474  
   475          if (!dev || !dev->platform_data)
   476                  return -ENODEV;
   477  
   478          /*
   479           * Note: current modules wire only one GPIO signal (RESET#),
   480           * but the schematic wires up two to the connector.  BIOS
   481           * versions have been unfortunately inconsistent with which
   482           * ACPI index RESET# is on, so hit both
   483           */
   484  
   485          if (flag) {
   486                  ret = dev->platform_data->gpio0_ctrl(sd, 0);
   487                  ret = dev->platform_data->gpio1_ctrl(sd, 0);
                        ^^^^^^^

   488                  msleep(60);
   489                  ret |= dev->platform_data->gpio0_ctrl(sd, 1);
   490                  ret |= dev->platform_data->gpio1_ctrl(sd, 1);
   491          } else {

regards,
dan carpenter

#7 lore raw

Re: [PATCH 2/3] media: atomisp-gc2235: drop an unused var

Quoted 12 lines · Dan Carpenter
Quoted 9 lines · Mauro Carvalho Chehab

Fix this clang Werror with W=1:

drivers/staging/media/atomisp/i2c/atomisp-gc2235.c:573:6: error: variable 'ret' set but not used [-Werror,-Wunused-but-set-variable]

        int ret = -1;
            ^

---

Quoted 7 lines

Looks good.

There should be warning for "int x = -1;" followed by |= because that's a no-op OR assignment.

I'm surprised that clang doesn't print errors about the other implementations of power_ctrl().

clang-tidy and scan-build will report dead stores. You may have seen patches from reports from Abaci Robot which is running those checks continuously.

Quoted 54 lines

drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
448 static int power_ctrl(struct v4l2_subdev *sd, bool flag)

   449  {
   450          int ret;
   451          struct mt9m114_device *dev = to_mt9m114_sensor(sd);
   452
   453          if (!dev || !dev->platform_data)
   454                  return -ENODEV;
   455
   456          if (flag) {
   457                  ret = dev->platform_data->v2p8_ctrl(sd, 1);
   458                  if (ret == 0) {
   459                          ret = dev->platform_data->v1p8_ctrl(sd, 1);
   460                          if (ret)
   461                                  ret = dev->platform_data->v2p8_ctrl(sd, 0);
   462                  }
   463          } else {
   464                  ret = dev->platform_data->v2p8_ctrl(sd, 0);
   465                  ret = dev->platform_data->v1p8_ctrl(sd, 0);
                        ^^^^^^

   466          }
   467          return ret;
   468  }
   469
   470  static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
   471  {
   472          int ret;
   473          struct mt9m114_device *dev = to_mt9m114_sensor(sd);
   474
   475          if (!dev || !dev->platform_data)
   476                  return -ENODEV;
   477
   478          /*
   479           * Note: current modules wire only one GPIO signal (RESET#),
   480           * but the schematic wires up two to the connector.  BIOS
   481           * versions have been unfortunately inconsistent with which
   482           * ACPI index RESET# is on, so hit both
   483           */
   484
   485          if (flag) {
   486                  ret = dev->platform_data->gpio0_ctrl(sd, 0);
   487                  ret = dev->platform_data->gpio1_ctrl(sd, 0);
                        ^^^^^^^

   488                  msleep(60);
   489                  ret |= dev->platform_data->gpio0_ctrl(sd, 1);
   490                  ret |= dev->platform_data->gpio1_ctrl(sd, 1);
   491          } else {

regards,
dan carpenter

Signature · 2 lines
Thanks,
~Nick Desaulniers
#8 lore raw

PATCH 3/3 media: atomisp: handle errors at sh_css_create_isp_params()

In reply to Mauro Carvalho Chehab

The succ var tracks memory allocation erros on this function.

Fix it, in order to stop this W=1 Werror in clang:

drivers/staging/media/atomisp/pci/sh_css_params.c:2430:7: error: variable 'succ' set but not used [-Werror,-Wunused-but-set-variable]

        bool succ = true;
             ^

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/atomisp/pci/sh_css_params.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/staging/media/atomisp/pci/sh_css_params.c +4 -0
index dbd3bfe3d343..3cc5b82a8a31 100644
@@ -2473,6 +2473,10 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
 	succ &= (ddr_ptrs->macc_tbl != mmgr_NULL);
 
 	*isp_params_out = params;
+
+	if (!succ)
+		return -ENOMEM;
+
 	return err;
 }
 
Signature · 1 line
2.33.1
Reviewed-by on v1 3/3
#9 lore raw

Re: [PATCH 3/3] media: atomisp: handle errors at sh_css_create_isp_params()

Quoted 9 lines · Mauro Carvalho Chehab

The succ var tracks memory allocation erros on this function.

Fix it, in order to stop this W=1 Werror in clang:

drivers/staging/media/atomisp/pci/sh_css_params.c:2430:7: error: variable 'succ' set but not used [-Werror,-Wunused-but-set-variable]

        bool succ = true;
             ^
Quoted 27 lines

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/atomisp/pci/sh_css_params.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/staging/media/atomisp/pci/sh_css_params.c +4 -0
index dbd3bfe3d343..3cc5b82a8a31 100644
@@ -2473,6 +2473,10 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
 	succ &= (ddr_ptrs->macc_tbl != mmgr_NULL);
 
 	*isp_params_out = params;
+
+	if (!succ)
+		return -ENOMEM;
+
 	return err;
 }
 
Signature · 1 line
2.33.1
#10 lore raw

Re: [PATCH 3/3] media: atomisp: handle errors at sh_css_create_isp_params()

In reply to Mauro Carvalho Chehab
Quoted 22 lines · Mauro Carvalho Chehab

The succ var tracks memory allocation erros on this function.

Fix it, in order to stop this W=1 Werror in clang:

drivers/staging/media/atomisp/pci/sh_css_params.c:2430:7: error: variable 'succ' set but not used [-Werror,-Wunused-but-set-variable]

        bool succ = true;
             ^

---

To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/3] at: https://lore.kernel.org/all/[email protected]/

 drivers/staging/media/atomisp/pci/sh_css_params.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/staging/media/atomisp/pci/sh_css_params.c +0 -0
index dbd3bfe3d343..3cc5b82a8a31 100644

drivers/staging/media/atomisp/pci/sh_css_params.c sh_css_create_isp_params(struct ia_css_stream *stream, · line 2480

Quoted 8 lines
drivers/staging/media/atomisp/pci/sh_css_params.c +4 -0
@@ -2473,6 +2473,10 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
 	succ &= (ddr_ptrs->macc_tbl != mmgr_NULL);
 
 	*isp_params_out = params;
+
+	if (!succ)
+		return -ENOMEM;
+
 	return err;

Better to "return 0;"

regards,
dan carpenter