summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/io_mm.h
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2019-08-02 10:10:25 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2019-08-19 13:24:10 +0200
commit94c04390225bcd8283103fd0c04be20cc30cc979 (patch)
tree047c9ed4026963c5c59962eace4e77bbeb363f87 /arch/m68k/include/asm/io_mm.h
parentaee6bff1c325d7a8b317a0e6d3441799ff8ac8ce (diff)
downloadlinux-94c04390225bcd8283103fd0c04be20cc30cc979.tar.gz
linux-94c04390225bcd8283103fd0c04be20cc30cc979.tar.bz2
linux-94c04390225bcd8283103fd0c04be20cc30cc979.zip
m68k: Prevent some compiler warnings in Coldfire builds
Since commit d3b41b6bb49e ("m68k: Dispatch nvram_ops calls to Atari or Mac functions"), Coldfire builds generate compiler warnings due to the unconditional inclusion of asm/atarihw.h and asm/macintosh.h. The inclusion of asm/atarihw.h causes warnings like this: In file included from ./arch/m68k/include/asm/atarihw.h:25:0, from arch/m68k/kernel/setup_mm.c:41, from arch/m68k/kernel/setup.c:3: ./arch/m68k/include/asm/raw_io.h:39:0: warning: "__raw_readb" redefined #define __raw_readb in_8 In file included from ./arch/m68k/include/asm/io.h:6:0, from arch/m68k/kernel/setup_mm.c:36, from arch/m68k/kernel/setup.c:3: ./arch/m68k/include/asm/io_no.h:16:0: note: this is the location of the previous definition #define __raw_readb(addr) \ ... This issue is resolved by dropping the asm/raw_io.h include. It turns out that asm/io_mm.h already includes that header file. Moving the relevant macro definitions helps to clarify this dependency and make it safe to include asm/atarihw.h. The other warnings look like this: In file included from arch/m68k/kernel/setup_mm.c:48:0, from arch/m68k/kernel/setup.c:3: ./arch/m68k/include/asm/macintosh.h:19:35: warning: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration extern void mac_irq_enable(struct irq_data *data); ^~~~~~~~ ... This issue is resolved by adding the missing linux/irq.h include. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Acked-by: Greg Ungerer <gerg@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/io_mm.h')
-rw-r--r--arch/m68k/include/asm/io_mm.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index 6c03ca5bc436..819f611dccf2 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -29,7 +29,11 @@
#include <asm-generic/iomap.h>
#ifdef CONFIG_ATARI
-#include <asm/atarihw.h>
+#define atari_readb raw_inb
+#define atari_writeb raw_outb
+
+#define atari_inb_p raw_inb
+#define atari_outb_p raw_outb
#endif