media: atomisp: make atomisp_css_continuous_set_num_raw_frames() void

The return value of atomisp_css_continuous_set_num_raw_frames() function
is always 0, so there's no reason for a return value. In addition, the
__enable_continuous_mode() checked the return value for possible error
which is unnecessary. Convert atomisp_css_continuous_set_num_raw_frames()
to a void function.

Link: https://lore.kernel.org/linux-media/1605362150-11401-1-git-send-email-kaixuxia@tencent.com
Reported-by: Tosk Robot <tencent_os_robot@tencent.com>
Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 92ddce409d0479b895308b530ec310164adee0be..6faac81283fe1c0580ae2d9735b89d30efde47a7 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -5083,11 +5083,8 @@ static int __enable_continuous_mode(struct atomisp_sub_device *asd,
        atomisp_css_enable_continuous(asd, enable);
        atomisp_css_enable_cvf(asd, asd->continuous_viewfinder->val);
 
-       if (atomisp_css_continuous_set_num_raw_frames(asd,
-               asd->continuous_raw_buffer_size->val)) {
-               dev_err(isp->dev, "css_continuous_set_num_raw_frames failed\n");
-               return -EINVAL;
-       }
+       atomisp_css_continuous_set_num_raw_frames(asd,
+               asd->continuous_raw_buffer_size->val);
 
        if (!enable) {
                atomisp_css_enable_raw_binning(asd, false);

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index 4aea6702467eadccc7653875b96507743a611ec6..a60551450c452ba1016bab5f6c19e3cd623f38dd 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -250,9 +250,9 @@ void atomisp_destroy_pipes_stream_force(struct atomisp_sub_device *asd);
 void atomisp_css_stop(struct atomisp_sub_device *asd,
                      enum ia_css_pipe_id pipe_id, bool in_reset);
 
-int atomisp_css_continuous_set_num_raw_frames(
-    struct atomisp_sub_device *asd,
-    int num_frames);
+void atomisp_css_continuous_set_num_raw_frames(
+     struct atomisp_sub_device *asd,
+     int num_frames);
 
 int atomisp_css_copy_configure_output(struct atomisp_sub_device *asd,
                                      unsigned int stream_index,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 9bf3f5fa4b0d639a6b65cac326861ed93ba2db85..485eb349e35476bdaa7983a1c3e0f4a86252ff60 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -2190,9 +2190,9 @@ void atomisp_css_stop(struct atomisp_sub_device *asd,
        memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));
 }
 
-int atomisp_css_continuous_set_num_raw_frames(
-    struct atomisp_sub_device *asd,
-    int num_frames)
+void atomisp_css_continuous_set_num_raw_frames(
+     struct atomisp_sub_device *asd,
+     int num_frames)
 {
        if (asd->enable_raw_buffer_lock->val) {
                asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL]
@@ -2216,7 +2216,6 @@ int atomisp_css_continuous_set_num_raw_frames(
 
        asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL]
        .stream_config.target_num_cont_raw_buf = num_frames;
-       return 0;
 }
 
 static enum ia_css_pipe_mode __pipe_id_to_pipe_mode(