media: camss: vfe: simplify vfe_get_wm_sizes()

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.

Signed-off-by: Tom Rix <trix@redhat.com>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
index 7b7c9a0aaab282b4350447923e7dde2ec51ee9e0..42047b11ba529e97c0ff2cac1c54a7c64246ec93 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
@@ -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,

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
index 2836b12ec98915ea065c630ef5dca3310beec454..ab2d57bdf5e71c7e5de9ba029c901a071e2d6218 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
@@ -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;
-
        }
 }
 

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
index 19519234f727c15872aff1c76a7f21ee24c110f4..7e6b62c930ac8abe23992ae781b6e8ca4536fcbb 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
@@ -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;
        }