[PATCH] arm: remove references on undefined CPU_S3C2413

From: Valentin Rothberg
Date: Wed Apr 29 2015 - 09:54:15 EST


CPU_S3C2413 is not defined in Kconfig, so that all references on it turn
out to be 0. Since CPU_S3C2412 supports both, S3C2412 and S3C2413 SoCs
from the S3C24XX line, we can safely remove all dead references on
CPU_S3C2413.

Signed-off-by: Valentin Rothberg <valentinrothberg@xxxxxxxxx>
---
I detected this issue with scripts/checkkconfigsymbols.py

A very similar patch has already been proposed by Paul Bolle [1], but
has been left unanswered.

[1] https://lkml.org/lkml/2014/5/16/191
---
arch/arm/mach-s3c24xx/common.c | 2 +-
arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 4 ++--
arch/arm/plat-samsung/include/plat/map-s3c.h | 2 +-
sound/soc/samsung/s3c-i2s-v2.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index bf50328107bd..d6f4c260176d 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -172,7 +172,7 @@ static unsigned long s3c24xx_read_idcode_v5(void)
return gs;
#endif

-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
return __raw_readl(S3C2412_GSTATUS1);
#else
return 1UL; /* don't look like an 2400 */
diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
index 3db6c10de023..ae4a3e0f3ba2 100644
--- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
+++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
@@ -77,7 +77,7 @@

#endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */

-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)

#define S3C2412_OSCSET S3C2410_CLKREG(0x18)
#define S3C2412_CLKSRC S3C2410_CLKREG(0x1C)
@@ -141,7 +141,7 @@
#define S3C2412_CLKSRC_UREFCLK_EXTCLK (1<<12)
#define S3C2412_CLKSRC_EREFCLK_EXTCLK (1<<14)

-#endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */
+#endif /* CONFIG_CPU_S3C2412 */

#define S3C2416_CLKDIV2 S3C2410_CLKREG(0x28)

diff --git a/arch/arm/plat-samsung/include/plat/map-s3c.h b/arch/arm/plat-samsung/include/plat/map-s3c.h
index c0c70a895ca8..612c2a71fffd 100644
--- a/arch/arm/plat-samsung/include/plat/map-s3c.h
+++ b/arch/arm/plat-samsung/include/plat/map-s3c.h
@@ -65,7 +65,7 @@

/* deal with the registers that move under the 2412/2413 */

-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
#ifndef __ASSEMBLY__
extern void __iomem *s3c24xx_va_gpio2;
#endif
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index df65c5b494b1..c94f3ce9ed9f 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -28,8 +28,8 @@

#undef S3C_IIS_V2_SUPPORTED

-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
- || defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_CPU_S5PV210)
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_ARCH_S3C64XX) \
+ defined(CONFIG_CPU_S5PV210)
#define S3C_IIS_V2_SUPPORTED
#endif

--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/