media: atomisp: Rename atomisp_destroy_pipes_stream_force() to atomisp_destroy_pipes_...

There now no longer is a non force version of
atomisp_destroy_pipes_stream_force() so having the _force postfix
no longer makes sense rename it to atomisp_destroy_pipes_stream().

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/pci/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index 850b354..89ed1f7 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -215,7 +215,7 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd,
                                     unsigned int metadata_height);
 
 int atomisp_create_pipes_stream(struct atomisp_sub_device *asd);
-void atomisp_destroy_pipes_stream_force(struct atomisp_sub_device *asd);
+void atomisp_destroy_pipes_stream(struct atomisp_sub_device *asd);
 
 void atomisp_css_stop(struct atomisp_sub_device *asd,
                      enum ia_css_pipe_id pipe_id, bool in_reset);

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index cecdf11..a04c165 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -548,7 +548,7 @@ static int __destroy_pipes(struct atomisp_sub_device *asd)
        return 0;
 }
 
-void atomisp_destroy_pipes_stream_force(struct atomisp_sub_device *asd)
+void atomisp_destroy_pipes_stream(struct atomisp_sub_device *asd)
 {
        if (__destroy_streams(asd))
                dev_warn(asd->isp->dev, "destroy stream failed.\n");
@@ -746,7 +746,7 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd)
 
 int atomisp_css_update_stream(struct atomisp_sub_device *asd)
 {
-       atomisp_destroy_pipes_stream_force(asd);
+       atomisp_destroy_pipes_stream(asd);
        return atomisp_create_pipes_stream(asd);
 }
 
@@ -1034,7 +1034,7 @@ start_err:
         * destroying all pipes.
         */
        if (sp_is_started) {
-               atomisp_destroy_pipes_stream_force(asd);
+               atomisp_destroy_pipes_stream(asd);
                ia_css_stop_sp();
                atomisp_create_pipes_stream(asd);
        }
@@ -1824,7 +1824,7 @@ void atomisp_css_stop(struct atomisp_sub_device *asd,
         * CSS 2.0 API limitation: ia_css_stop_sp() can only be called after
         * destroying all pipes.
         */
-       atomisp_destroy_pipes_stream_force(asd);
+       atomisp_destroy_pipes_stream(asd);
 
        atomisp_init_raw_buffer_bitmap(asd);
 
@@ -2314,7 +2314,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd,
        return 0;
 
 get_info_err:
-       atomisp_destroy_pipes_stream_force(asd);
+       atomisp_destroy_pipes_stream(asd);
        return -EINVAL;
 }
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
index c7da5bf..223c5be 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
@@ -614,7 +614,7 @@ static int atomisp_release(struct file *file)
                isp->inputs[asd->input_curr].asd = NULL;
        }
 
-       atomisp_destroy_pipes_stream_force(asd);
+       atomisp_destroy_pipes_stream(asd);
 
        ret = v4l2_subdev_call(isp->flash, core, s_power, 0);
        if (ret < 0 && ret != -ENODEV && ret != -ENOIOCTLCMD)