media: xilinx: Fix coding style

Minor cleanup.
Remove enum, extra lines/comments and refactored
few variables names.

Signed-off-by: Radhey Shyam Pandey <radheys@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
Tested-by: Christian Kohn <christian.kohn@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/media/platform/xilinx/xilinx-tpg.c b/drivers/media/platform/xilinx/xilinx-tpg.c
index 257f4ef24a975f259847809986dc78ffe4c9df55..9d154d84278f06cde6e5341ab73cde836081e1eb 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-tpg.c
+++ b/drivers/media/platform/xilinx/xilinx-tpg.c
@@ -67,10 +67,14 @@
  */
 #define XTPG_HLS_BG_PATTERN                    0x0020
 #define XTPG_HLS_FG_PATTERN                    0x0028
-#define XTPG_HLS_FG_CROSS_HAIR_SHIFT           0x1
+#define XTPG_HLS_FG_PATTERN_CROSS_HAIR         (1 << 1)
 #define XTPG_HLS_MASK_ID                       0x0030
 #define XTPG_HLS_MOTION_SPEED                  0x0038
 #define XTPG_HLS_COLOR_FORMAT                  0x0040
+#define XTPG_HLS_COLOR_FORMAT_RGB              0
+#define XTPG_HLS_COLOR_FORMAT_YUV_444          1
+#define XTPG_HLS_COLOR_FORMAT_YUV_422          2
+#define XTPG_HLS_COLOR_FORMAT_YUV_420          3
 #define XTPG_HLS_CROSS_HAIR_HOR                        0x0048
 #define XTPG_HLS_CROSS_HAIR_VER                        0x0050
 #define XTPG_HLS_ZPLATE_HOR_CNTL_START         0x0058
@@ -82,6 +86,7 @@
 #define XTPG_HLS_BOX_COLOR_GREEN_CR            0x0088
 #define XTPG_HLS_BOX_COLOR_BLUE_Y              0x0090
 #define XTPG_HLS_ENABLE_INPUT                  0x0098
+#define XTPG_HLS_USE_INPUT_VID_STREAM          (1 << 0)
 #define XTPG_HLS_PASS_THRU_START_X             0x00a0
 #define XTPG_HLS_PASS_THRU_START_Y             0x00a8
 #define XTPG_HLS_PASS_THRU_END_X               0x00b0
@@ -96,16 +101,6 @@
 #define XTPG_MIN_VBLANK                        3
 #define XTPG_MAX_VBLANK                        (XVTC_MAX_VSIZE - XVIP_MIN_HEIGHT)
 
-/* TPG v7 supported color formats */
-typedef enum {
-       XVIDC_CSF_RGB = 0,
-       XVIDC_CSF_YCRCB_444,
-       XVIDC_CSF_YCRCB_422,
-       XVIDC_CSF_YCRCB_420 = 4,
-       XVIDC_CSF_NUM_SUPPORTED,
-       XVIDC_CSF_UNKNOWN
-} xtpg_hls_color_format;
-
 /**
  * struct xtpg_device - Xilinx Test Pattern Generator device structure
  * @xvip: Xilinx Video IP device
@@ -121,6 +116,7 @@ typedef enum {
  * @vblank: vertical blanking control
  * @pattern: test pattern control
  * @streaming: is the video stream active
+ * @is_hls: whether the IP core is HLS based
  * @vtc: video timing controller
  * @vtmux_gpio: video timing mux GPIO
  */
@@ -237,8 +233,8 @@ static int xtpg_s_stream(struct v4l2_subdev *subdev, int enable)
        unsigned int width = xtpg->formats[0].width;
        unsigned int height = xtpg->formats[0].height;
        bool passthrough;
-       u32 bayer_phase, xtpg_pattern_offset;
-       xtpg_hls_color_format fmt;
+       u32 bayer_phase;
+       u32 xtpg_pattern_offset;
 
        if (!enable) {
                if (xtpg->is_hls)
@@ -256,22 +252,21 @@ static int xtpg_s_stream(struct v4l2_subdev *subdev, int enable)
        }
 
        if (xtpg->is_hls) {
+               u32 fmt;
+
                switch (xtpg->vip_format->fourcc) {
                case V4L2_PIX_FMT_YUYV:
-                       fmt = XVIDC_CSF_YCRCB_422;
+                       fmt = XTPG_HLS_COLOR_FORMAT_YUV_422;
                        break;
                case V4L2_PIX_FMT_YUV444:
-                       fmt = XVIDC_CSF_YCRCB_444;
+                       fmt = XTPG_HLS_COLOR_FORMAT_YUV_444;
                        break;
                case V4L2_PIX_FMT_RGB24:
-                       fmt = XVIDC_CSF_RGB;
+                       fmt = XTPG_HLS_COLOR_FORMAT_RGB;
                        break;
                }
-               /* Set video color format */
                xvip_write(&xtpg->xvip, XTPG_HLS_COLOR_FORMAT, fmt);
-               /* Set number of active pixels per scanline */
                xvip_write(&xtpg->xvip, XHLS_REG_COLS, width);
-               /* Set number of active lines per frame */
                xvip_write(&xtpg->xvip, XHLS_REG_ROWS, height);
                xtpg_pattern_offset = XTPG_HLS_BG_PATTERN;
        } else {
@@ -307,9 +302,8 @@ static int xtpg_s_stream(struct v4l2_subdev *subdev, int enable)
                gpiod_set_value_cansleep(xtpg->vtmux_gpio, !passthrough);
 
        if (xtpg->is_hls) {
-               /* Use video stream entering slave AXI4Stream video interface */
-               xvip_set(&xtpg->xvip, XTPG_HLS_ENABLE_INPUT, 0x1);
-               /* Start the TPG in auto-restart mode */
+               xvip_set(&xtpg->xvip, XTPG_HLS_ENABLE_INPUT,
+                        XTPG_HLS_USE_INPUT_VID_STREAM);
                xvip_set(&xtpg->xvip, XVIP_CTRL_CONTROL,
                         XHLS_REG_CTRL_AUTO_RESTART |
                         XVIP_CTRL_CONTROL_SW_ENABLE);
@@ -320,7 +314,7 @@ static int xtpg_s_stream(struct v4l2_subdev *subdev, int enable)
                 * be subsampled.
                 */
                bayer_phase = passthrough ? XTPG_BAYER_PHASE_OFF
-                       : xtpg_get_bayer_phase(xtpg->formats[0].code);
+                           : xtpg_get_bayer_phase(xtpg->formats[0].code);
                xvip_write(&xtpg->xvip, XTPG_BAYER_PHASE, bayer_phase);
                xvip_start(&xtpg->xvip);
        }
@@ -546,7 +540,7 @@ static int xtpg_hls_s_ctrl(struct v4l2_ctrl *ctrl)
                if (ctrl->val)
                        __v4l2_ctrl_s_ctrl(xtpg->moving_box, 0x0);
                xvip_write(&xtpg->xvip, XTPG_HLS_FG_PATTERN,
-                          ctrl->val << XTPG_HLS_FG_CROSS_HAIR_SHIFT);
+                          ctrl->val ? XTPG_HLS_FG_PATTERN_CROSS_HAIR : 0);
                return 0;
        case V4L2_CID_XILINX_TPG_MOVING_BOX:
                if (ctrl->val)
@@ -957,7 +951,6 @@ static struct v4l2_ctrl_config xtpg_hls_ctrls[] = {
        }
 };
 
-
 /* -----------------------------------------------------------------------------
  * Media Operations
  */
@@ -1059,8 +1052,8 @@ static int xtpg_probe(struct platform_device *pdev)
        const struct v4l2_ctrl_config *ctrl_config;
        const struct v4l2_ctrl_ops *ctrl_ops;
        u32 i, bayer_phase;
-       u32 ctrl_cnt;
-       u32 qmenu_cnt;
+       u32 nctrls;
+       u32 npatterns;
        int ret;
 
        xtpg = devm_kzalloc(&pdev->dev, sizeof(*xtpg), GFP_KERNEL);
@@ -1112,8 +1105,8 @@ static int xtpg_probe(struct platform_device *pdev)
        if (xtpg->is_hls) {
                ctrl_config = xtpg_hls_ctrls;
                ctrl_ops = &xtpg_hls_ctrl_ops;
-               ctrl_cnt = ARRAY_SIZE(xtpg_hls_ctrls);
-               qmenu_cnt = ARRAY_SIZE(xtpg_hls_pattern_strings);
+               nctrls = ARRAY_SIZE(xtpg_hls_ctrls);
+               npatterns = ARRAY_SIZE(xtpg_hls_pattern_strings);
                xtpg->default_format.width = xvip_read(&xtpg->xvip,
                                                       XHLS_REG_COLS);
                xtpg->default_format.height = xvip_read(&xtpg->xvip,
@@ -1121,8 +1114,8 @@ static int xtpg_probe(struct platform_device *pdev)
        } else {
                ctrl_config = xtpg_ctrls;
                ctrl_ops = &xtpg_ctrl_ops;
-               ctrl_cnt = ARRAY_SIZE(xtpg_ctrls);
-               qmenu_cnt = ARRAY_SIZE(xtpg_pattern_strings);
+               nctrls = ARRAY_SIZE(xtpg_ctrls);
+               npatterns = ARRAY_SIZE(xtpg_pattern_strings);
                xvip_get_frame_size(&xtpg->xvip, &xtpg->default_format);
        }
 
@@ -1148,7 +1141,7 @@ static int xtpg_probe(struct platform_device *pdev)
        if (ret < 0)
                goto error;
 
-       v4l2_ctrl_handler_init(&xtpg->ctrl_handler, 3 + ctrl_cnt);
+       v4l2_ctrl_handler_init(&xtpg->ctrl_handler, 3 + nctrls);
 
        xtpg->vblank = v4l2_ctrl_new_std(&xtpg->ctrl_handler, ctrl_ops,
                                         V4L2_CID_VBLANK, XTPG_MIN_VBLANK,
@@ -1162,7 +1155,7 @@ static int xtpg_probe(struct platform_device *pdev)
                        v4l2_ctrl_new_std_menu_items(&xtpg->ctrl_handler,
                                                     ctrl_ops,
                                                     V4L2_CID_TEST_PATTERN,
-                                                    qmenu_cnt - 1,
+                                                    npatterns - 1,
                                                     1, 9,
                                                     xtpg_hls_pattern_strings);
        else
@@ -1170,10 +1163,11 @@ static int xtpg_probe(struct platform_device *pdev)
                        v4l2_ctrl_new_std_menu_items(&xtpg->ctrl_handler,
                                                     ctrl_ops,
                                                     V4L2_CID_TEST_PATTERN,
-                                                    qmenu_cnt - 1,
+                                                    npatterns - 1,
                                                     1, 9,
                                                     xtpg_pattern_strings);
-       for (i = 0; i < ctrl_cnt; i++)
+
+       for (i = 0; i < nctrls; i++)
                v4l2_ctrl_new_custom(&xtpg->ctrl_handler,
                                     &ctrl_config[i], NULL);