From: Arnd Bergmann <arnd@xxxxxxxx> After the previous round of cleanups for asm-generic/io,h on the ioread64 helpers, I had another look at the architecture specific versions, especially those that caused build failures in the past. These are some simplifications that I would like to merge at the same time, please have a look. Hopefully these are all uncontroversial. I have a few more patches for m68k that need a more thorough review and testing, will post them after the merge window. Arnd Bergmann (6): alpha: stop using asm-generic/iomap.h sh: remove duplicate ioread/iowrite helpers parisc: stop using asm-generic/iomap.h powerpc: asm/io.h: remove split ioread64/iowrite64 helpers mips: drop GENERIC_IOMAP wrapper m68k/nommu: stop using GENERIC_IOMAP arch/alpha/include/asm/io.h | 31 ++++--- arch/m68k/Kconfig | 2 +- arch/m68k/include/asm/io_no.h | 4 - arch/mips/Kconfig | 2 +- arch/mips/include/asm/io.h | 21 ++--- arch/mips/lib/iomap-pci.c | 9 ++ arch/parisc/include/asm/io.h | 36 ++++++-- arch/powerpc/include/asm/io.h | 48 ---------- arch/sh/include/asm/io.h | 30 ++----- arch/sh/kernel/Makefile | 3 - arch/sh/kernel/iomap.c | 162 ---------------------------------- arch/sh/kernel/ioport.c | 5 -- arch/sh/lib/io.c | 4 +- drivers/sh/clk/cpg.c | 25 +++--- 14 files changed, 84 insertions(+), 298 deletions(-) delete mode 100644 arch/sh/kernel/iomap.c -- 2.39.5 Cc: Richard Henderson <richard.henderson@xxxxxxxxxx> Cc: Matt Turner <mattst88@xxxxxxxxx> Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Greg Ungerer <gerg@xxxxxxxxxxxxxx> Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx> Cc: "James E.J. Bottomley" <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Cc: Helge Deller <deller@xxxxxx> Cc: Madhavan Srinivasan <maddy@xxxxxxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Nicholas Piggin <npiggin@xxxxxxxxx> Cc: Christophe Leroy <christophe.leroy@xxxxxxxxxx> Cc: Naveen N Rao <naveen@xxxxxxxxxx> Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx> Cc: Rich Felker <dalias@xxxxxxxx> Cc: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Julian Vetter <julian@xxxxxxxxxxxxxxxx> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Cc: linux-alpha@xxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Cc: linux-m68k@xxxxxxxxxxxxxxxxxxxx Cc: linux-mips@xxxxxxxxxxxxxxx Cc: linux-parisc@xxxxxxxxxxxxxxx Cc: linuxppc-dev@xxxxxxxxxxxxxxxx Cc: linux-sh@xxxxxxxxxxxxxxx
