Skip to contentSkip to conversation

m68k: coldfire: drop ISA_DMA_API support

PATCH Superseded Arnd Bergmann 2 participants 2 messages Apr 20, 2022

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 m68k: coldfire: drop ISA_DMA_API support

From: Arnd Bergmann <[email protected]>

After a build regression report, I took a look at possible users of CONFIG_ISA_DMA_API on m68k and found none, which Greg confirmed. The CONFIG_GENERIC_ISA_DMA option in turn is only needed to implement ISA_DMA_API, and is clearly not used on the platforms with ISA support.

The CONFIG_ISA support for AMIGA_PCMCIA is probably also unneeded, but this is less clear. Unlike other PCMCIA implementations, this one does not use the drivers/pcmcia subsystem at all and just supports the "apne" network driver. When it was first added, one could use ISA drivers on it as well, but this probably broke at some point.

With no reason to keep this, let's just drop the corresponding files and prevent the remaining ISA drivers that use this from getting built.

The remaining definitions in asm/dma.h are used for PCI support.

---
v3: fix build regression
v2: drop GENERIC_ISA_DMA as well, add some background on CONFIG_ISA.

---
 arch/m68k/Kconfig.bus       |  10 -
 arch/m68k/coldfire/dma.c    |  43 ----
 arch/m68k/include/asm/dma.h | 483 ------------------------------------
 arch/m68k/mm/motorola.c     |   1 -
 drivers/mmc/host/Kconfig    |   2 +-
 sound/core/Makefile         |   2 -
 sound/isa/Kconfig           |   2 +-
 7 files changed, 2 insertions(+), 541 deletions(-)
 delete mode 100644 arch/m68k/coldfire/dma.c
arch/m68k/Kconfig.bus +0 -10
index d1e93a39cd3b..d5c0b2990ee1 100644
@@ -56,16 +56,6 @@ config ATARI_ROM_ISA
 	  The only driver currently using this adapter is the EtherNEC
 	  driver for RTL8019AS based NE2000 compatible network cards.
 
-config GENERIC_ISA_DMA
-	def_bool ISA
-
 source "drivers/zorro/Kconfig"
 
 endif
-
-if COLDFIRE
-
-config ISA_DMA_API
-	def_bool !M5272
-
-endif
arch/m68k/coldfire/dma.c deleted +0 -43

43 lines not on this page · raw message

arch/m68k/include/asm/dma.h +0 -483

493 lines not on this page · raw message

arch/m68k/mm/motorola.c +0 -1
index ecbe948f4c1a..df7f797c908a 100644
@@ -27,7 +27,6 @@
 #include <asm/pgalloc.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
-#include <asm/dma.h>
 #ifdef CONFIG_ATARI
 #include <asm/atari_stram.h>
 #endif
drivers/mmc/host/Kconfig +1 -1
index af6c3c329076..d6144978e32d 100644
@@ -508,7 +508,7 @@ config MMC_OMAP_HS
 
 config MMC_WBSD
 	tristate "Winbond W83L51xD SD/MMC Card Interface support"
-	depends on ISA_DMA_API && !M68K
+	depends on ISA_DMA_API
 	help
 	  This selects the Winbond(R) W83L51xD Secure digital and
 	  Multimedia card Interface.
sound/core/Makefile +0 -2
index 350d704ced98..2762f03d9b7b 100644
@@ -9,9 +9,7 @@ ifneq ($(CONFIG_SND_PROC_FS),)
 snd-y += info.o
 snd-$(CONFIG_SND_OSSEMUL) += info_oss.o
 endif
-ifneq ($(CONFIG_M68K),y)
 snd-$(CONFIG_ISA_DMA_API) += isadma.o
-endif
 snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o
 snd-$(CONFIG_SND_VMASTER) += vmaster.o
 snd-$(CONFIG_SND_JACK)	  += ctljack.o jack.o
sound/isa/Kconfig +1 -1
index 570b88e0b201..6ffa48dd5983 100644
@@ -22,7 +22,7 @@ config SND_SB16_DSP
 menuconfig SND_ISA
 	bool "ISA sound devices"
 	depends on ISA || COMPILE_TEST
-	depends on ISA_DMA_API && !M68K
+	depends on ISA_DMA_API
 	default y
 	help
 	  Support for sound devices connected via the ISA bus.
Signature · 1 line
2.29.2
#1 lore raw
Quoted 17 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

After a build regression report, I took a look at possible users of CONFIG_ISA_DMA_API on m68k and found none, which Greg confirmed. The CONFIG_GENERIC_ISA_DMA option in turn is only needed to implement ISA_DMA_API, and is clearly not used on the platforms with ISA support.

The CONFIG_ISA support for AMIGA_PCMCIA is probably also unneeded, but this is less clear. Unlike other PCMCIA implementations, this one does not use the drivers/pcmcia subsystem at all and just supports the "apne" network driver. When it was first added, one could use ISA drivers on it as well, but this probably broke at some point.

With no reason to keep this, let's just drop the corresponding files and prevent the remaining ISA drivers that use this from getting built.

Quoted 7 lines

The remaining definitions in asm/dma.h are used for PCI support.

Nevermind, this is the same as before, I forgot the 'git add' for the trivial Makefile change.

Arnd