tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[ARM] ebsa110: fix warnings generated by asm/arch/io.h
Remove two warnings:
drivers/serial/8250_early.c:136: warning: unused variable 'mapsize'
include/linux/io.h:47: warning: passing argument 1 of '__readb' discards qualifiers from pointer target type
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by
Russell King
and committed by
Russell King
8de35efb
eb370f0b
+15
-9
+4
-4
arch/arm/mach-ebsa110/io.c
+4
-4
arch/arm/mach-ebsa110/io.c
···
28
28
#include <asm/io.h>
29
29
#include <asm/page.h>
30
30
31
-
static void __iomem *__isamem_convert_addr(void __iomem *addr)
31
+
static void __iomem *__isamem_convert_addr(const volatile void __iomem *addr)
32
32
{
33
33
u32 ret, a = (u32 __force) addr;
34
34
···
63
63
/*
64
64
* read[bwl] and write[bwl]
65
65
*/
66
-
u8 __readb(void __iomem *addr)
66
+
u8 __readb(const volatile void __iomem *addr)
67
67
{
68
68
void __iomem *a = __isamem_convert_addr(addr);
69
69
u32 ret;
···
75
75
return ret;
76
76
}
77
77
78
-
u16 __readw(void __iomem *addr)
78
+
u16 __readw(const volatile void __iomem *addr)
79
79
{
80
80
void __iomem *a = __isamem_convert_addr(addr);
81
81
···
85
85
return __raw_readw(a);
86
86
}
87
87
88
-
u32 __readl(void __iomem *addr)
88
+
u32 __readl(const volatile void __iomem *addr)
89
89
{
90
90
void __iomem *a = __isamem_convert_addr(addr);
91
91
u32 ret;
+11
-5
include/asm-arm/arch-ebsa110/io.h
+11
-5
include/asm-arm/arch-ebsa110/io.h
···
27
27
u32 __inl(unsigned int port);
28
28
void __outl(u32 val, unsigned int port);
29
29
30
-
u8 __readb(void __iomem *addr);
31
-
u16 __readw(void __iomem *addr);
32
-
u32 __readl(void __iomem *addr);
30
+
u8 __readb(const volatile void __iomem *addr);
31
+
u16 __readw(const volatile void __iomem *addr);
32
+
u32 __readl(const volatile void __iomem *addr);
33
33
34
34
void __writeb(u8 val, void __iomem *addr);
35
35
void __writew(u16 val, void __iomem *addr);
···
64
64
#define writew(v,b) __writew(v,b)
65
65
#define writel(v,b) __writel(v,b)
66
66
67
-
#define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie))
68
-
#define __arch_iounmap(cookie) do { } while (0)
67
+
static inline void __iomem *__arch_ioremap(unsigned long cookie, size_t size,
68
+
unsigned int flags)
69
+
{
70
+
return (void __iomem *)cookie;
71
+
}
72
+
73
+
#define __arch_ioremap __arch_ioremap
74
+
#define __arch_iounmap(cookie) do { } while (0)
69
75
70
76
extern void insb(unsigned int port, void *buf, int sz);
71
77
extern void insw(unsigned int port, void *buf, int sz);