m68k/nommu: stop using GENERIC_IOMAP

There is no need to go through the GENERIC_IOMAP wrapper for PIO on
nommu platforms, since these always come from PCI I/O space that is
itself memory mapped.

Instead, the generic ioport_map() can just return the MMIO location
of the ports directly by applying the PCI_IO_PA offset, while
ioread32/iowrite32 trivially turn into readl/writel as they do
on most other architectures.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index b2ed0308c0eac207ff079e2a53ac637417f2ff5f..b50c275fa94d009e98fae4c20f21e0ed26cb863d 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -18,7 +18,7 @@ config M68K
        select DMA_DIRECT_REMAP if M68K_NONCOHERENT_DMA && !COLDFIRE
        select GENERIC_ATOMIC64
        select GENERIC_CPU_DEVICES
-       select GENERIC_IOMAP if HAS_IOPORT
+       select GENERIC_IOMAP if HAS_IOPORT && MMU
        select GENERIC_IRQ_SHOW
        select GENERIC_LIB_ASHLDI3
        select GENERIC_LIB_ASHRDI3

diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h
index 2c96e8480173b1d15b16425bcf590150dd3e6134..516371d5587aa30e26b172f74a727ebae88c200e 100644 (file)
--- a/arch/m68k/include/asm/io_no.h
+++ b/arch/m68k/include/asm/io_no.h
@@ -123,10 +123,6 @@ static inline void writel(u32 value, volatile void __iomem *addr)
 #define PCI_IO_SIZE    0x00010000              /* 64k */
 #define PCI_IO_MASK    (PCI_IO_SIZE - 1)
 
-#define HAVE_ARCH_PIO_SIZE
-#define PIO_OFFSET     0
-#define PIO_MASK       0xffff
-#define PIO_RESERVED   0x10000
 #define PCI_IOBASE     ((void __iomem *) PCI_IO_PA)
 #define PCI_SPACE_LIMIT        PCI_IO_MASK
 #endif /* CONFIG_PCI */