projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
io.h
diff --git
a/arch/powerpc/include/asm/io.h
b/arch/powerpc/include/asm/io.h
index 6b52a94ffbdbd060fff7e247e9b14f4d79d7fcea..1f12c29ba8351584974052d97d292de57c786cd4 100644
(file)
--- a/
arch/powerpc/include/asm/io.h
+++ b/
arch/powerpc/include/asm/io.h
@@
-127,7
+127,6
@@
static inline void isync(void)
/*
* Non ordered and non-swapping "raw" accessors
*/
/*
* Non ordered and non-swapping "raw" accessors
*/
-#define __iomem
#define PCI_FIX_ADDR(addr) (addr)
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
#define PCI_FIX_ADDR(addr) (addr)
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
@@
-162,9
+161,9
@@
static inline void __raw_writel(unsigned int v, volatile void __iomem *addr)
* is actually performed (i.e. the data has come back) before we start
* executing any following instructions.
*/
* is actually performed (i.e. the data has come back) before we start
* executing any following instructions.
*/
-extern inline
int
in_8(const volatile unsigned char __iomem *addr)
+extern inline
u8
in_8(const volatile unsigned char __iomem *addr)
{
{
-
int
ret;
+
u8
ret;
__asm__ __volatile__(
"sync; lbz%U1%X1 %0,%1;\n"
__asm__ __volatile__(
"sync; lbz%U1%X1 %0,%1;\n"
@@
-173,7
+172,7
@@
extern inline int in_8(const volatile unsigned char __iomem *addr)
return ret;
}
return ret;
}
-extern inline void out_8(volatile unsigned char __iomem *addr,
int
val)
+extern inline void out_8(volatile unsigned char __iomem *addr,
u8
val)
{
__asm__ __volatile__("sync;\n"
"stb%U0%X0 %1,%0;\n"
{
__asm__ __volatile__("sync;\n"
"stb%U0%X0 %1,%0;\n"
@@
-181,9
+180,9
@@
extern inline void out_8(volatile unsigned char __iomem *addr, int val)
: "r" (val));
}
: "r" (val));
}
-extern inline
int
in_le16(const volatile unsigned short __iomem *addr)
+extern inline
u16
in_le16(const volatile unsigned short __iomem *addr)
{
{
-
int
ret;
+
u16
ret;
__asm__ __volatile__("sync; lhbrx %0,0,%1;\n"
"twi 0,%0,0;\n"
__asm__ __volatile__("sync; lhbrx %0,0,%1;\n"
"twi 0,%0,0;\n"
@@
-192,9
+191,9
@@
extern inline int in_le16(const volatile unsigned short __iomem *addr)
return ret;
}
return ret;
}
-extern inline
int
in_be16(const volatile unsigned short __iomem *addr)
+extern inline
u16
in_be16(const volatile unsigned short __iomem *addr)
{
{
-
int
ret;
+
u16
ret;
__asm__ __volatile__("sync; lhz%U1%X1 %0,%1;\n"
"twi 0,%0,0;\n"
__asm__ __volatile__("sync; lhz%U1%X1 %0,%1;\n"
"twi 0,%0,0;\n"
@@
-202,20
+201,20
@@
extern inline int in_be16(const volatile unsigned short __iomem *addr)
return ret;
}
return ret;
}
-extern inline void out_le16(volatile unsigned short __iomem *addr,
int
val)
+extern inline void out_le16(volatile unsigned short __iomem *addr,
u16
val)
{
__asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
{
__asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
-extern inline void out_be16(volatile unsigned short __iomem *addr,
int
val)
+extern inline void out_be16(volatile unsigned short __iomem *addr,
u16
val)
{
__asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}
{
__asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}
-extern inline u
nsigned
in_le32(const volatile unsigned __iomem *addr)
+extern inline u
32
in_le32(const volatile unsigned __iomem *addr)
{
{
- u
nsigned
ret;
+ u
32
ret;
__asm__ __volatile__("sync; lwbrx %0,0,%1;\n"
"twi 0,%0,0;\n"
__asm__ __volatile__("sync; lwbrx %0,0,%1;\n"
"twi 0,%0,0;\n"
@@
-224,9
+223,9
@@
extern inline unsigned in_le32(const volatile unsigned __iomem *addr)
return ret;
}
return ret;
}
-extern inline u
nsigned
in_be32(const volatile unsigned __iomem *addr)
+extern inline u
32
in_be32(const volatile unsigned __iomem *addr)
{
{
- u
nsigned
ret;
+ u
32
ret;
__asm__ __volatile__("sync; lwz%U1%X1 %0,%1;\n"
"twi 0,%0,0;\n"
__asm__ __volatile__("sync; lwz%U1%X1 %0,%1;\n"
"twi 0,%0,0;\n"
@@
-234,13
+233,13
@@
extern inline unsigned in_be32(const volatile unsigned __iomem *addr)
return ret;
}
return ret;
}
-extern inline void out_le32(volatile unsigned __iomem *addr,
int
val)
+extern inline void out_le32(volatile unsigned __iomem *addr,
u32
val)
{
__asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
{
__asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
-extern inline void out_be32(volatile unsigned __iomem *addr,
int
val)
+extern inline void out_be32(volatile unsigned __iomem *addr,
u32
val)
{
__asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}
{
__asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}