From 6a2782c0b2a0a2ed1d877d3a708308b36496950c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 23 Apr 2020 09:29:45 +0200 Subject: [PATCH] media: atomisp: remove ISP version macros from sh_css_legacy.h This header is really version-independent. So, just get rid of the macros from it. Signed-off-by: Mauro Carvalho Chehab --- .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h index 110b2912042c..99ac690ba7aa 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h @@ -31,18 +31,10 @@ enum ia_css_pipe_id { IA_CSS_PIPE_ID_VIDEO, IA_CSS_PIPE_ID_CAPTURE, IA_CSS_PIPE_ID_YUVPP, -#ifndef ISP2401 IA_CSS_PIPE_ID_ACC, IA_CSS_PIPE_ID_NUM -#else - IA_CSS_PIPE_ID_ACC -#endif }; -#ifdef ISP2401 -#define IA_CSS_PIPE_ID_NUM (IA_CSS_PIPE_ID_ACC + 1) -#endif - struct ia_css_pipe_extra_config { bool enable_raw_binning; bool enable_yuv_ds; @@ -71,9 +63,8 @@ enum ia_css_err sh_css_set_black_frame(struct ia_css_stream *stream, const struct ia_css_frame *raw_black_frame); -#ifndef ISP2401 +/* ISP2400 */ void sh_css_enable_cont_capt(bool enable, bool stop_copy_preview); -#endif #endif /* _SH_CSS_LEGACY_H_ */ -- 2.17.1