From: Arnd Bergmann <a...@arndb.de> 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.hender...@linaro.org> Cc: Matt Turner <matts...@gmail.com> Cc: Geert Uytterhoeven <ge...@linux-m68k.org> Cc: Greg Ungerer <g...@linux-m68k.org> Cc: Thomas Bogendoerfer <tsbog...@alpha.franken.de> Cc: "James E.J. Bottomley" <james.bottom...@hansenpartnership.com> Cc: Helge Deller <del...@gmx.de> Cc: Madhavan Srinivasan <ma...@linux.ibm.com> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Nicholas Piggin <npig...@gmail.com> Cc: Christophe Leroy <christophe.le...@csgroup.eu> Cc: Naveen N Rao <nav...@kernel.org> Cc: Yoshinori Sato <ys...@users.sourceforge.jp> Cc: Rich Felker <dal...@libc.org> Cc: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> Cc: Arnd Bergmann <a...@arndb.de> Cc: Julian Vetter <jul...@outer-limits.org> Cc: Bjorn Helgaas <bhelg...@google.com> Cc: linux-al...@vger.kernel.org Cc: linux-ker...@vger.kernel.org Cc: linux-m...@lists.linux-m68k.org Cc: linux-m...@vger.kernel.org Cc: linux-par...@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux...@vger.kernel.org