Commit 1341bc9e authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab

media: atomisp: use atomisp_destroy_pipes_stream_force() in more places

Use atomisp_destroy_pipes_stream_force() in 4 more places,
instead of open coding it.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-39-hdegoede@redhat.comReviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 318e125a
...@@ -810,14 +810,7 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd) ...@@ -810,14 +810,7 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd)
int atomisp_css_update_stream(struct atomisp_sub_device *asd) int atomisp_css_update_stream(struct atomisp_sub_device *asd)
{ {
struct atomisp_device *isp = asd->isp; atomisp_destroy_pipes_stream_force(asd);
if (__destroy_streams(asd, true))
dev_warn(isp->dev, "destroy stream failed.\n");
if (__destroy_pipes(asd, true))
dev_warn(isp->dev, "destroy pipe failed.\n");
return atomisp_create_pipes_stream(asd); return atomisp_create_pipes_stream(asd);
} }
...@@ -1166,8 +1159,7 @@ int atomisp_css_start(struct atomisp_sub_device *asd, ...@@ -1166,8 +1159,7 @@ int atomisp_css_start(struct atomisp_sub_device *asd,
return 0; return 0;
start_err: start_err:
__destroy_streams(asd, true); atomisp_destroy_pipes_stream_force(asd);
__destroy_pipes(asd, true);
/* css 2.0 API limitation: ia_css_stop_sp() could be only called after /* css 2.0 API limitation: ia_css_stop_sp() could be only called after
* destroy all pipes * destroy all pipes
...@@ -2072,13 +2064,8 @@ void atomisp_css_stop(struct atomisp_sub_device *asd, ...@@ -2072,13 +2064,8 @@ void atomisp_css_stop(struct atomisp_sub_device *asd,
unsigned long irqflags; unsigned long irqflags;
unsigned int i; unsigned int i;
/* if is called in atomisp_reset(), force destroy stream */ /* if is called in atomisp_reset(), force destroy streams and pipes */
if (__destroy_streams(asd, true)) atomisp_destroy_pipes_stream_force(asd);
dev_err(isp->dev, "destroy stream failed.\n");
/* if is called in atomisp_reset(), force destroy all pipes */
if (__destroy_pipes(asd, true))
dev_err(isp->dev, "destroy pipes failed.\n");
atomisp_init_raw_buffer_bitmap(asd); atomisp_init_raw_buffer_bitmap(asd);
...@@ -2658,8 +2645,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd, ...@@ -2658,8 +2645,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd,
return 0; return 0;
get_info_err: get_info_err:
__destroy_streams(asd, true); atomisp_destroy_pipes_stream_force(asd);
__destroy_pipes(asd, true);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment