media: atomisp: pci/atomisp2/*.h remove #ifdef ISP2401

Those ifs can easily be removed without breaking the code.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h
index 5d102a4f8affce25cba08d73c870e8ff6b7f4291..cc489a331a7c53b03c0618e54ee64fc52ed198f1 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h
@@ -153,12 +153,6 @@
 #define CCK_FUSE_REG_0                 0x08
 #define CCK_FUSE_HPLL_FREQ_MASK                0x03
 
-#if defined(ISP2401)
-#define ISP_FREQ_MAX   ISP_FREQ_320MHZ
-#else
-#define ISP_FREQ_MAX   ISP_FREQ_400MHZ
-#endif
-
 /* ISP2401 CSI2+ receiver delay settings */
 #define CSI2_PORT_A_BASE                                       0xC0000
 #define CSI2_PORT_B_BASE                                       0xC2000

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h
index 2558193045a69377a1370a2f80b115cd797a915b..65c9caf72b7bb3f3108df3aae087aac994c08a53 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h
@@ -39,10 +39,9 @@ extern int pad_h;
 #define CSS_DTRACE_VERBOSITY_LEVEL     5       /* Controls trace verbosity */
 #define CSS_DTRACE_VERBOSITY_TIMEOUT   9       /* Verbosity on ISP timeout */
 #define MRFLD_MAX_ZOOM_FACTOR  1024
-#ifdef ISP2401
-#define ATOMISP_CSS_ISP_PIPE_VERSION_2_2    0
+
+/* ISP2401 */
 #define ATOMISP_CSS_ISP_PIPE_VERSION_2_7    1
-#endif
 
 #define IS_ISP2401(isp)                                                        \
        (((isp)->media_dev.hw_revision & ATOMISP_HW_REVISION_MASK)      \