From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Mon, 20 Apr 2020 10:33:51 +0000 (+0200)
Subject: media: atomisp: pci/atomisp2/*.h remove #ifdef ISP2401
X-Git-Tag: v5.10.7~2096^2~239
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=643405b0fff41787834c122660d77d9ebdb5c3a4;p=platform%2Fkernel%2Flinux-rpi.git

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 5d102a4f8aff..cc489a331a7c 100644
--- 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 2558193045a6..65c9caf72b7b 100644
--- 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)	\