media: atomisp: Remove Continuous capture and SDV run-modes

Since we no longer support Continuous mode, setting the run_mode to
ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE no longer make sense, so remove
this.

While at it, also remove ATOMISP_RUN_MODE_SDV, which was never exposed
to userspace in the first place.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/include/linux/atomisp.h b/drivers/staging/media/atomisp/include/linux/atomisp.h
index c7ec56a1c06404a0981c9f56f0cede08c7797fea..bada4c9911fdcd9c98f870793d7198a43661dca6 100644 (file)
--- a/drivers/staging/media/atomisp/include/linux/atomisp.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp.h
@@ -38,7 +38,6 @@
 #define CI_MODE_PREVIEW                0x8000
 #define CI_MODE_VIDEO          0x4000
 #define CI_MODE_STILL_CAPTURE  0x2000
-#define CI_MODE_CONTINUOUS     0x1000
 #define CI_MODE_NONE           0x0000
 
 #define OUTPUT_MODE_FILE 0x0100
@@ -1059,9 +1058,9 @@ struct atomisp_sensor_ae_bracketing_lut {
 #define V4L2_CID_RUN_MODE                      (V4L2_CID_CAMERA_LASTP1 + 20)
 #define ATOMISP_RUN_MODE_VIDEO                 1
 #define ATOMISP_RUN_MODE_STILL_CAPTURE         2
-#define ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE    3
-#define ATOMISP_RUN_MODE_PREVIEW               4
-#define ATOMISP_RUN_MODE_SDV                   5
+#define ATOMISP_RUN_MODE_PREVIEW               3
+#define ATOMISP_RUN_MODE_MIN                   1
+#define ATOMISP_RUN_MODE_MAX                   3
 
 #define V4L2_CID_ENABLE_VFPP                   (V4L2_CID_CAMERA_LASTP1 + 21)
 #define V4L2_CID_ATOMISP_CONTINUOUS_MODE       (V4L2_CID_CAMERA_LASTP1 + 22)

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 1dae2a7cfdd9b419365caf47862dba5ccebe7337..e8c26e66ae7e32cd76262da139f8e9579845d47c 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -649,23 +649,11 @@ static bool is_pipe_valid_to_current_run_mode(struct atomisp_sub_device *asd,
                if (pipe_id == IA_CSS_PIPE_ID_PREVIEW)
                        return true;
 
-               return false;
-       case ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE:
-               if (pipe_id == IA_CSS_PIPE_ID_CAPTURE ||
-                   pipe_id == IA_CSS_PIPE_ID_PREVIEW)
-                       return true;
-
                return false;
        case ATOMISP_RUN_MODE_VIDEO:
                if (pipe_id == IA_CSS_PIPE_ID_VIDEO || pipe_id == IA_CSS_PIPE_ID_YUVPP)
                        return true;
 
-               return false;
-       case ATOMISP_RUN_MODE_SDV:
-               if (pipe_id == IA_CSS_PIPE_ID_CAPTURE ||
-                   pipe_id == IA_CSS_PIPE_ID_VIDEO)
-                       return true;
-
                return false;
        }
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index 4d927799f53b86a8e017b9bac9961782fafb6eec..7f031db284761a62781e2d570a6466a549463df9 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -1902,9 +1902,6 @@ static int atomisp_s_parm(struct file *file, void *fh,
        case CI_MODE_STILL_CAPTURE:
                mode = ATOMISP_RUN_MODE_STILL_CAPTURE;
                break;
-       case CI_MODE_CONTINUOUS:
-               mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE;
-               break;
        case CI_MODE_PREVIEW:
                mode = ATOMISP_RUN_MODE_PREVIEW;
                break;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
index a0acfdb87177665c18b88941f8b6646a2e72920f..42f8accf57fc7d3b7b1f99d253191c35ef7f0ad4 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
@@ -755,11 +755,9 @@ static const struct v4l2_ctrl_ops ctrl_ops = {
 };
 
 static const char *const ctrl_run_mode_menu[] = {
-       NULL,
-       "Video",
-       "Still capture",
-       "Continuous capture",
-       "Preview",
+       [ATOMISP_RUN_MODE_VIDEO]                = "Video",
+       [ATOMISP_RUN_MODE_STILL_CAPTURE]        = "Still capture",
+       [ATOMISP_RUN_MODE_PREVIEW]              = "Preview",
 };
 
 static const struct v4l2_ctrl_config ctrl_run_mode = {
@@ -767,9 +765,9 @@ static const struct v4l2_ctrl_config ctrl_run_mode = {
        .id = V4L2_CID_RUN_MODE,
        .name = "Atomisp run mode",
        .type = V4L2_CTRL_TYPE_MENU,
-       .min = 1,
-       .def = 1,
-       .max = 4,
+       .min = ATOMISP_RUN_MODE_MIN,
+       .def = ATOMISP_RUN_MODE_PREVIEW,
+       .max = ATOMISP_RUN_MODE_MAX,
        .qmenu = ctrl_run_mode_menu,
 };
 
@@ -971,7 +969,7 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd)
                return ret;
 
        ret = atomisp_video_init(&asd->video_out_vf, "VIEWFINDER",
-                                ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE);
+                                ATOMISP_RUN_MODE_STILL_CAPTURE);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 3f315dabbeeb4c9ad5ca105b3489a9c378e91fe7..4370d560308ee8fb2f6108345cdca9520ffef134 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -119,13 +119,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_merr[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_STILL_CAPTURE,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE,
-       },
        {
                .width = ISP_FREQ_RULE_ANY,
                .height = ISP_FREQ_RULE_ANY,
@@ -133,13 +126,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_merr[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_PREVIEW,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_457MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
 };
 
 /* Merrifield and Moorefield DFS rules */
@@ -166,13 +152,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_merr_1179[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_STILL_CAPTURE,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE,
-       },
        {
                .width = ISP_FREQ_RULE_ANY,
                .height = ISP_FREQ_RULE_ANY,
@@ -180,13 +159,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_merr_1179[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_PREVIEW,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
 };
 
 static const struct atomisp_dfs_config dfs_config_merr_1179 = {
@@ -247,13 +219,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_merr_117a[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_STILL_CAPTURE,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE,
-       },
        {
                .width = ISP_FREQ_RULE_ANY,
                .height = ISP_FREQ_RULE_ANY,
@@ -261,13 +226,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_merr_117a[] = {
                .isp_freq = ISP_FREQ_200MHZ,
                .run_mode = ATOMISP_RUN_MODE_PREVIEW,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
 };
 
 static struct atomisp_dfs_config dfs_config_merr_117a = {
@@ -293,13 +251,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_byt[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_STILL_CAPTURE,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE,
-       },
        {
                .width = ISP_FREQ_RULE_ANY,
                .height = ISP_FREQ_RULE_ANY,
@@ -307,13 +258,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_byt[] = {
                .isp_freq = ISP_FREQ_400MHZ,
                .run_mode = ATOMISP_RUN_MODE_PREVIEW,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_400MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
 };
 
 static const struct atomisp_dfs_config dfs_config_byt = {
@@ -339,13 +283,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_cht[] = {
                .isp_freq = ISP_FREQ_356MHZ,
                .run_mode = ATOMISP_RUN_MODE_STILL_CAPTURE,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_320MHZ,
-               .run_mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE,
-       },
        {
                .width = ISP_FREQ_RULE_ANY,
                .height = ISP_FREQ_RULE_ANY,
@@ -353,20 +290,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_cht[] = {
                .isp_freq = ISP_FREQ_320MHZ,
                .run_mode = ATOMISP_RUN_MODE_PREVIEW,
        },
-       {
-               .width = 1280,
-               .height = 720,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_320MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_356MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
 };
 
 static const struct atomisp_freq_scaling_rule dfs_rules_cht_soc[] = {
@@ -384,13 +307,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_cht_soc[] = {
                .isp_freq = ISP_FREQ_356MHZ,
                .run_mode = ATOMISP_RUN_MODE_STILL_CAPTURE,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_320MHZ,
-               .run_mode = ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE,
-       },
        {
                .width = ISP_FREQ_RULE_ANY,
                .height = ISP_FREQ_RULE_ANY,
@@ -398,13 +314,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_cht_soc[] = {
                .isp_freq = ISP_FREQ_320MHZ,
                .run_mode = ATOMISP_RUN_MODE_PREVIEW,
        },
-       {
-               .width = ISP_FREQ_RULE_ANY,
-               .height = ISP_FREQ_RULE_ANY,
-               .fps = ISP_FREQ_RULE_ANY,
-               .isp_freq = ISP_FREQ_356MHZ,
-               .run_mode = ATOMISP_RUN_MODE_SDV,
-       },
 };
 
 static const struct atomisp_dfs_config dfs_config_cht = {