[3/5] staging: media: atomisp: sh_css_sp: Remove #ifdef ISP2401
Commit Message
The actions of ISP2401 and 2400 will be determined at the runtime.
Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
drivers/staging/media/atomisp/pci/sh_css_sp.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
Comments
Hi,
On 4/25/23 09:48, Kate Hsuan wrote:
> The actions of ISP2401 and 2400 will be determined at the runtime.
>
> Signed-off-by: Kate Hsuan <hpa@redhat.com>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/staging/media/atomisp/pci/sh_css_sp.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/sh_css_sp.c b/drivers/staging/media/atomisp/pci/sh_css_sp.c
> index 0dd58a7fe2cc..297e1b981720 100644
> --- a/drivers/staging/media/atomisp/pci/sh_css_sp.c
> +++ b/drivers/staging/media/atomisp/pci/sh_css_sp.c
> @@ -952,12 +952,10 @@ sh_css_sp_init_stage(struct ia_css_binary *binary,
> return 0;
> }
>
> -#if defined(ISP2401)
> - (void)continuous;
> - sh_css_sp_stage.deinterleaved = 0;
> -#else
> - sh_css_sp_stage.deinterleaved = ((stage == 0) && continuous);
> -#endif
> + if (IS_ISP2401)
> + sh_css_sp_stage.deinterleaved = 0;
> + else
> + sh_css_sp_stage.deinterleaved = ((stage == 0) && continuous);
>
> initialize_stage_frames(&sh_css_sp_stage.frames);
> /*
@@ -952,12 +952,10 @@ sh_css_sp_init_stage(struct ia_css_binary *binary,
return 0;
}
-#if defined(ISP2401)
- (void)continuous;
- sh_css_sp_stage.deinterleaved = 0;
-#else
- sh_css_sp_stage.deinterleaved = ((stage == 0) && continuous);
-#endif
+ if (IS_ISP2401)
+ sh_css_sp_stage.deinterleaved = 0;
+ else
+ sh_css_sp_stage.deinterleaved = ((stage == 0) && continuous);
initialize_stage_frames(&sh_css_sp_stage.frames);
/*