Skip to contentSkip to conversation

sh: dma: Remove checks for nonexistent CONFIG_CPU_SUBTYPE_SH7730

PATCH In review Ethan Nelson-Moore 2 participants 2 messages Jun 13 – Jun 15 SuperH

lore
Share & tools
lore

Ethan Nelson-Moore

author
#0 lore raw

PATCH 1/1 sh: dma: Remove checks for nonexistent CONFIG_CPU_SUBTYPE_SH7730

Two headers in arch/sh/include contain references to CONFIG_CPU_SUBTYPE_SH7730, which has never existed in the kernel. Remove these references.

Discovered while searching for CONFIG_* symbols referenced in code but not defined in any Kconfig file.

Signed-off-by Ethan Nelson-Moore <[email protected]>
---
 arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 -
 arch/sh/include/cpu-sh4a/cpu/dma.h         | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
arch/sh/include/cpu-sh4/cpu/dma-register.h +0 -1
index 53f7ab990d88..af973c0f4f9d 100644
@@ -21,7 +21,6 @@
 #elif defined(CONFIG_CPU_SUBTYPE_SH7722) || \
 	defined(CONFIG_CPU_SUBTYPE_SH7723) || \
 	defined(CONFIG_CPU_SUBTYPE_SH7724) || \
-	defined(CONFIG_CPU_SUBTYPE_SH7730) || \
 	defined(CONFIG_CPU_SUBTYPE_SH7786)
 #define CHCR_TS_LOW_MASK	0x00000018
 #define CHCR_TS_LOW_SHIFT	3
arch/sh/include/cpu-sh4a/cpu/dma.h +1 -2
index bdbbba8a784a..04992db01280 100644
@@ -4,8 +4,7 @@
 
 #include <linux/sh_intc.h>
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7343) || \
-	defined(CONFIG_CPU_SUBTYPE_SH7730)
+#ifdef CONFIG_CPU_SUBTYPE_SH7343
 #define DMTE0_IRQ	evt2irq(0x800)
 #define DMTE4_IRQ	evt2irq(0xb80)
 #define DMAE0_IRQ	evt2irq(0xbc0)	/* DMA Error IRQ*/
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Ethan,

Quoted 8 lines · Ethan Nelson-Moore

Two headers in arch/sh/include contain references to CONFIG_CPU_SUBTYPE_SH7730, which has never existed in the kernel. Remove these references.

Discovered while searching for CONFIG_* symbols referenced in code but not defined in any Kconfig file.

Signed-off-by Ethan Nelson-Moore <[email protected]>

Thanks for your patch!

I did some diving into git history, and none of these seem to be a typo a different symbol.

Reviewed-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds