media: atomisp: remove ISP version macros from sh_css_legacy.h
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 23 Apr 2020 07:29:45 +0000 (09:29 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 20 May 2020 10:32:16 +0000 (12:32 +0200)
This header is really version-independent. So, just get rid
of the macros from it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h

index 110b2912042c51bb9e74b97a6add0aa5758573f9..99ac690ba7aa03f5e2601b31bfb3414fd185f7cd 100644 (file)
@@ -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_ */