From 2cb61011bfed4344185fcfe64adf2c9f2353eaa3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 12 May 2023 16:17:54 +0100 Subject: media: atomisp: Rename atomisp_destroy_pipes_stream_force() to atomisp_destroy_pipes_stream() 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 Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/staging/media/atomisp/pci/atomisp_compat_css20.c') diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c index cecdf111e14f..a04c16502cac 100644 --- 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; } -- cgit v1.2.3