Skip to content

Commit f95a387

Browse files
arndbGreg Ungerer
authored andcommitted
m68k: coldfire: drop ISA_DMA_API support
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. Link: https://lore.kernel.org/lkml/9e5ee1c3-ca80-f343-a1f5-66f3dd1c0727@linux-m68k.org/ Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC Acked-by: Greg Ungerer <gerg@linux-m68k.org> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
1 parent dc068f4 commit f95a387

8 files changed

Lines changed: 3 additions & 542 deletions

File tree

arch/m68k/Kconfig.bus

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,6 @@ config ATARI_ROM_ISA
5656
The only driver currently using this adapter is the EtherNEC
5757
driver for RTL8019AS based NE2000 compatible network cards.
5858

59-
config GENERIC_ISA_DMA
60-
def_bool ISA
61-
6259
source "drivers/zorro/Kconfig"
6360

6461
endif
65-
66-
if COLDFIRE
67-
68-
config ISA_DMA_API
69-
def_bool !M5272
70-
71-
endif

arch/m68k/coldfire/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
1717

18-
obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.o
18+
obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o entry.o vectors.o
1919
obj-$(CONFIG_M5206) += m5206.o intc.o reset.o
2020
obj-$(CONFIG_M5206e) += m5206.o intc.o reset.o
2121
obj-$(CONFIG_M520x) += m520x.o intc-simr.o reset.o

arch/m68k/coldfire/dma.c

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)