projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-ixp4xx
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-ixp4xx/include/mach/io.h
b/arch/arm/mach-ixp4xx/include/mach/io.h
index b024390199639ca31201730ccdbcfceae577be2b..7a0c13bf42694b724e0fcb35439070eefde0a646 100644
(file)
--- a/
arch/arm/mach-ixp4xx/include/mach/io.h
+++ b/
arch/arm/mach-ixp4xx/include/mach/io.h
@@
-143,7
+143,7
@@
static inline void __indirect_writesl(volatile void __iomem *bus_addr,
writel(*vaddr++, bus_addr);
}
writel(*vaddr++, bus_addr);
}
-static inline u
nsigned char
__indirect_readb(const volatile void __iomem *p)
+static inline u
8
__indirect_readb(const volatile void __iomem *p)
{
u32 addr = (u32)p;
u32 n, byte_enables, data;
{
u32 addr = (u32)p;
u32 n, byte_enables, data;
@@
-166,7
+166,7
@@
static inline void __indirect_readsb(const volatile void __iomem *bus_addr,
*vaddr++ = readb(bus_addr);
}
*vaddr++ = readb(bus_addr);
}
-static inline u
nsigned short
__indirect_readw(const volatile void __iomem *p)
+static inline u
16
__indirect_readw(const volatile void __iomem *p)
{
u32 addr = (u32)p;
u32 n, byte_enables, data;
{
u32 addr = (u32)p;
u32 n, byte_enables, data;
@@
-189,7
+189,7
@@
static inline void __indirect_readsw(const volatile void __iomem *bus_addr,
*vaddr++ = readw(bus_addr);
}
*vaddr++ = readw(bus_addr);
}
-static inline u
nsigned long
__indirect_readl(const volatile void __iomem *p)
+static inline u
32
__indirect_readl(const volatile void __iomem *p)
{
u32 addr = (__force u32)p;
u32 data;
{
u32 addr = (__force u32)p;
u32 data;
@@
-350,7
+350,7
@@
static inline void insl(u32 io_addr, void *p, u32 count)
((unsigned long)p <= (PIO_MASK + PIO_OFFSET)))
#define ioread8(p) ioread8(p)
((unsigned long)p <= (PIO_MASK + PIO_OFFSET)))
#define ioread8(p) ioread8(p)
-static inline u
nsigned int
ioread8(const void __iomem *addr)
+static inline u
8
ioread8(const void __iomem *addr)
{
unsigned long port = (unsigned long __force)addr;
if (__is_io_address(port))
{
unsigned long port = (unsigned long __force)addr;
if (__is_io_address(port))
@@
-378,7
+378,7
@@
static inline void ioread8_rep(const void __iomem *addr, void *vaddr, u32 count)
}
#define ioread16(p) ioread16(p)
}
#define ioread16(p) ioread16(p)
-static inline u
nsigned int
ioread16(const void __iomem *addr)
+static inline u
16
ioread16(const void __iomem *addr)
{
unsigned long port = (unsigned long __force)addr;
if (__is_io_address(port))
{
unsigned long port = (unsigned long __force)addr;
if (__is_io_address(port))
@@
-407,7
+407,7
@@
static inline void ioread16_rep(const void __iomem *addr, void *vaddr,
}
#define ioread32(p) ioread32(p)
}
#define ioread32(p) ioread32(p)
-static inline u
nsigned int
ioread32(const void __iomem *addr)
+static inline u
32
ioread32(const void __iomem *addr)
{
unsigned long port = (unsigned long __force)addr;
if (__is_io_address(port))
{
unsigned long port = (unsigned long __force)addr;
if (__is_io_address(port))