Skip to contentSkip to conversation

media: camss: vfe: simplify vfe_get_wm_sizes()

PATCH In review [email protected] 2 participants 2 messages Aug 18, 2021 – Aug 31, 2021

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

PATCH 1/1 media: camss: vfe: simplify vfe_get_wm_sizes()

From: Tom Rix <[email protected]>

Static analysis reports this representative problem camss-vfe-4-1.c:333: The result of the left shift is undefined because
the left operand is negative
reg |= (height - 1) << 4;
~~~~~~~~~ ^

The is a false positive. height is set in vfe_get_wm_sizes() which has a switch statement without a default.

Reviewing the switch, the cases contain redundant assignments. So simplify to assignments.

---
 .../media/platform/qcom/camss/camss-vfe-4-1.c | 20 ++++++-------------
 .../media/platform/qcom/camss/camss-vfe-4-7.c | 10 +++-------
 .../media/platform/qcom/camss/camss-vfe-4-8.c |  9 +++------
 3 files changed, 12 insertions(+), 27 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +6 -14
index 7b7c9a0aaab282..42047b11ba529e 100644
@@ -290,22 +290,14 @@ static void vfe_wm_frame_based(struct vfe_device *vfe, u8 wm, u8 enable)
 static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
 			     u16 *width, u16 *height, u16 *bytesperline)
 {
-	switch (pix->pixelformat) {
-	case V4L2_PIX_FMT_NV12:
-	case V4L2_PIX_FMT_NV21:
-		*width = pix->width;
-		*height = pix->height;
-		*bytesperline = pix->plane_fmt[0].bytesperline;
+	*width = pix->width;
+	*height = pix->height;
+	*bytesperline = pix->plane_fmt[0].bytesperline;
+
+	if (pix->pixelformat == V4L2_PIX_FMT_NV12 ||
+	    pix->pixelformat == V4L2_PIX_FMT_NV21)
 		if (plane == 1)
 			*height /= 2;
-		break;
-	case V4L2_PIX_FMT_NV16:
-	case V4L2_PIX_FMT_NV61:
-		*width = pix->width;
-		*height = pix->height;
-		*bytesperline = pix->plane_fmt[0].bytesperline;
-		break;
-	}
 }
 
 static void vfe_wm_line_based(struct vfe_device *vfe, u32 wm,
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +3 -7
index 2836b12ec98915..ab2d57bdf5e71c 100644
@@ -370,30 +370,26 @@ static int vfe_word_per_line_by_bytes(u32 bytes_per_line)
 static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
 			     u16 *width, u16 *height, u16 *bytesperline)
 {
+	*width = pix->width;
+	*height = pix->height;
+
 	switch (pix->pixelformat) {
 	case V4L2_PIX_FMT_NV12:
 	case V4L2_PIX_FMT_NV21:
-		*width = pix->width;
-		*height = pix->height;
 		*bytesperline = pix->plane_fmt[0].bytesperline;
 		if (plane == 1)
 			*height /= 2;
 		break;
 	case V4L2_PIX_FMT_NV16:
 	case V4L2_PIX_FMT_NV61:
-		*width = pix->width;
-		*height = pix->height;
 		*bytesperline = pix->plane_fmt[0].bytesperline;
 		break;
 	case V4L2_PIX_FMT_YUYV:
 	case V4L2_PIX_FMT_YVYU:
 	case V4L2_PIX_FMT_VYUY:
 	case V4L2_PIX_FMT_UYVY:
-		*width = pix->width;
-		*height = pix->height;
 		*bytesperline = pix->plane_fmt[plane].bytesperline;
 		break;
-
 	}
 }
 
drivers/media/platform/qcom/camss/camss-vfe-4-8.c +3 -6
index 19519234f727c1..7e6b62c930ac8a 100644
@@ -343,27 +343,24 @@ static int vfe_word_per_line_by_bytes(u32 bytes_per_line)
 static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
 			     u16 *width, u16 *height, u16 *bytesperline)
 {
+	*width = pix->width;
+	*height = pix->height;
+
 	switch (pix->pixelformat) {
 	case V4L2_PIX_FMT_NV12:
 	case V4L2_PIX_FMT_NV21:
-		*width = pix->width;
-		*height = pix->height;
 		*bytesperline = pix->plane_fmt[0].bytesperline;
 		if (plane == 1)
 			*height /= 2;
 		break;
 	case V4L2_PIX_FMT_NV16:
 	case V4L2_PIX_FMT_NV61:
-		*width = pix->width;
-		*height = pix->height;
 		*bytesperline = pix->plane_fmt[0].bytesperline;
 		break;
 	case V4L2_PIX_FMT_YUYV:
 	case V4L2_PIX_FMT_YVYU:
 	case V4L2_PIX_FMT_VYUY:
 	case V4L2_PIX_FMT_UYVY:
-		*width = pix->width;
-		*height = pix->height;
 		*bytesperline = pix->plane_fmt[plane].bytesperline;
 		break;
 	}
Signature · 1 line
2.26.3
Reviewed-by on v1 1/1
#1 lore raw

Hey Tom,

Thanks for the patch!

Quoted 118 lines · On Wed, 18 Aug 2021 at 21:41, <[email protected]> wrote:

From: Tom Rix <[email protected]>

Static analysis reports this representative problem camss-vfe-4-1.c:333: The result of the left shift is undefined because
the left operand is negative
reg |= (height - 1) << 4;
~~~~~~~~~ ^

The is a false positive. height is set in vfe_get_wm_sizes() which has a switch statement without a default.

Reviewing the switch, the cases contain redundant assignments. So simplify to assignments.

---
 .../media/platform/qcom/camss/camss-vfe-4-1.c | 20 ++++++-------------
 .../media/platform/qcom/camss/camss-vfe-4-7.c | 10 +++-------
 .../media/platform/qcom/camss/camss-vfe-4-8.c |  9 +++------
 3 files changed, 12 insertions(+), 27 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +6 -14
index 7b7c9a0aaab282..42047b11ba529e 100644
@@ -290,22 +290,14 @@ static void vfe_wm_frame_based(struct vfe_device *vfe, u8 wm, u8 enable)
 static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
                             u16 *width, u16 *height, u16 *bytesperline)
 {
-       switch (pix->pixelformat) {
-       case V4L2_PIX_FMT_NV12:
-       case V4L2_PIX_FMT_NV21:
-               *width = pix->width;
-               *height = pix->height;
-               *bytesperline = pix->plane_fmt[0].bytesperline;
+       *width = pix->width;
+       *height = pix->height;
+       *bytesperline = pix->plane_fmt[0].bytesperline;
+
+       if (pix->pixelformat == V4L2_PIX_FMT_NV12 ||
+           pix->pixelformat == V4L2_PIX_FMT_NV21)
                if (plane == 1)
                        *height /= 2;
-               break;
-       case V4L2_PIX_FMT_NV16:
-       case V4L2_PIX_FMT_NV61:
-               *width = pix->width;
-               *height = pix->height;
-               *bytesperline = pix->plane_fmt[0].bytesperline;
-               break;
-       }
 }
 
 static void vfe_wm_line_based(struct vfe_device *vfe, u32 wm,
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +3 -7
index 2836b12ec98915..ab2d57bdf5e71c 100644
@@ -370,30 +370,26 @@ static int vfe_word_per_line_by_bytes(u32 bytes_per_line)
 static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
                             u16 *width, u16 *height, u16 *bytesperline)
 {
+       *width = pix->width;
+       *height = pix->height;
+
        switch (pix->pixelformat) {
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV21:
-               *width = pix->width;
-               *height = pix->height;
                *bytesperline = pix->plane_fmt[0].bytesperline;
                if (plane == 1)
                        *height /= 2;
                break;
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
-               *width = pix->width;
-               *height = pix->height;
                *bytesperline = pix->plane_fmt[0].bytesperline;
                break;
        case V4L2_PIX_FMT_YUYV:
        case V4L2_PIX_FMT_YVYU:
        case V4L2_PIX_FMT_VYUY:
        case V4L2_PIX_FMT_UYVY:
-               *width = pix->width;
-               *height = pix->height;
                *bytesperline = pix->plane_fmt[plane].bytesperline;
                break;
-
        }
 }
 
drivers/media/platform/qcom/camss/camss-vfe-4-8.c +3 -4
index 19519234f727c1..7e6b62c930ac8a 100644
@@ -343,27 +343,24 @@ static int vfe_word_per_line_by_bytes(u32 bytes_per_line)
 static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
                             u16 *width, u16 *height, u16 *bytesperline)
 {
+       *width = pix->width;
+       *height = pix->height;
+
        switch (pix->pixelformat) {
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV21:
-               *width = pix->width;
-               *height = pix->height;
                *bytesperline = pix->plane_fmt[0].bytesperline;
                if (plane == 1)
                        *height /= 2;
                break;
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
-               *width = pix->width;
-               *height = pix->height;
                *bytesperline = pix->plane_fmt[0].bytesperline;

drivers/media/platform/qcom/camss/camss-vfe-4-8.c static int vfe_word_per_line_by_bytes(u32 bytes_per_line) · line 366

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-4-8.c +0 -2
                break;
        case V4L2_PIX_FMT_YUYV:
        case V4L2_PIX_FMT_YVYU:
        case V4L2_PIX_FMT_VYUY:
        case V4L2_PIX_FMT_UYVY:
-               *width = pix->width;
-               *height = pix->height;
                *bytesperline = pix->plane_fmt[plane].bytesperline;
                break;
        }