media: atomisp: make atomisp_css_stop() void

The return value of atomisp_css_stop() function is always 0 and there
are no callers check the return value, so there's no reason for a return
value. Convert atomisp_css_stop() to a void function.

Link: https://lore.kernel.org/linux-media/1605359976-11254-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_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index 6a2a81a3eb2337b45c197c2247a076ee0c8b3eb1..4aea6702467eadccc7653875b96507743a611ec6 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -247,8 +247,8 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd,
 void atomisp_create_pipes_stream(struct atomisp_sub_device *asd);
 void atomisp_destroy_pipes_stream_force(struct atomisp_sub_device *asd);
 
-int atomisp_css_stop(struct atomisp_sub_device *asd,
-                    enum ia_css_pipe_id pipe_id, bool in_reset);
+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,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index faa0935e536a5764d4eb1d1acb48ff1f7bd929de..9bf3f5fa4b0d639a6b65cac326861ed93ba2db85 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -2098,8 +2098,8 @@ int atomisp_css_input_configure_port(
        return 0;
 }
 
-int atomisp_css_stop(struct atomisp_sub_device *asd,
-                    enum ia_css_pipe_id pipe_id, bool in_reset)
+void atomisp_css_stop(struct atomisp_sub_device *asd,
+                     enum ia_css_pipe_id pipe_id, bool in_reset)
 {
        struct atomisp_device *isp = asd->isp;
        struct atomisp_s3a_buf *s3a_buf;
@@ -2188,7 +2188,6 @@ int atomisp_css_stop(struct atomisp_sub_device *asd,
        atomisp_flush_params_queue(&asd->video_out_video_capture);
        atomisp_free_css_parameters(&asd->params.css_param);
        memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));
-       return 0;
 }
 
 int atomisp_css_continuous_set_num_raw_frames(

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index 2ae50decfc8bdb7b5b155e118addf47d5a9932ae..de398c791f28dc56f557df46f89f0f2c8538fc44 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -2013,7 +2013,7 @@ int __atomisp_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
        }
        if (first_streamoff) {
                css_pipe_id = atomisp_get_css_pipe_id(asd);
-               ret = atomisp_css_stop(asd, css_pipe_id, false);
+               atomisp_css_stop(asd, css_pipe_id, false);
        }
        /* cancel work queue*/
        if (asd->video_out_capture.users) {