On Mon, May 15, 2023 at 11:14 AM Baoquan He <bhe@xxxxxxxxxx> wrote:
> Let's use '#define ioremap_xx' and "#ifdef ioremap_xx" instead.
>
> For each architecture to remove defined ARCH_HAS_IOREMAP_xx macros in
> To remove defined ARCH_HAS_IOREMAP_xx macros in <asm/io.h> of each ARCH,
> the ARCH's own ioremap_wc|wt|np definition need be above
> "#include <asm-generic/iomap.h>. Otherwise the redefinition error would
> be seen during compiling. So the relevant adjustments are made to avoid
> compiling error:
>
> loongarch:
> - doesn't include <asm-generic/iomap.h>, defining ARCH_HAS_IOREMAP_WC
> is redundant, so simply remove it.
>
> m68k:
> - selected GENERIC_IOMAP, <asm-generic/iomap.h> has been added in
> <asm-generic/io.h>, and <asm/kmap.h> is included above
> <asm-generic/iomap.h>, so simply remove ARCH_HAS_IOREMAP_WT defining.
>
> mips:
> - move "#include <asm-generic/iomap.h>" below ioremap_wc definition
> in <asm/io.h>
>
> powerpc:
> - remove "#include <asm-generic/iomap.h>" in <asm/io.h> because it's
> duplicated with the one in <asm-generic/io.h>, let's rely on the
> latter.
>
> x86:
> - selected GENERIC_IOMAP, remove #include <asm-generic/iomap.h> in
> the middle of <asm/io.h>. Let's rely on <asm-generic/io.h>.
>
> Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
> arch/m68k/include/asm/io_mm.h | 2 --
> arch/m68k/include/asm/kmap.h | 2 --
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
