From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 23 Jan 2013 09:07:59 +0000 (+0100)
Subject: Revert "microblaze: Fix in/out_be8/16/32 functions"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25d9da945ad59d06e52e915833af1a6eb5f9fb01;p=thirdparty%2Fu-boot.git

Revert "microblaze: Fix in/out_be8/16/32 functions"

This reverts commit dcefe33658dfb8628cdba7a3c45df5016f3b0be3.

Just too keep this in sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index add666e950f..584cbce358c 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -46,35 +46,14 @@
 #define outl(x, addr)	((void) writel (x, addr))
 
 /* Some #definitions to keep strange Xilinx code happy */
-extern inline int in_8(volatile unsigned char *addr)
-{
-	return readb(addr);
-}
-
-extern inline int in_be16(volatile unsigned short *addr)
-{
-	return readw(addr);
-}
+#define in_8(addr)	readb (addr)
+#define in_be16(addr)	readw (addr)
+#define in_be32(addr)	readl (addr)
 
-extern inline int in_be32(volatile unsigned int *addr)
-{
-	return readl(addr);
-}
+#define out_8(addr,x )	outb (x,addr)
+#define out_be16(addr,x )	outw (x,addr)
+#define out_be32(addr,x )	outl (x,addr)
 
-extern inline void out_8(volatile unsigned char *addr, char val)
-{
-	outb(val, addr);
-}
-
-extern inline void out_be16(volatile unsigned short *addr, short val)
-{
-	outw(val, addr);
-}
-
-extern inline void out_be32(volatile unsigned int *addr, int val)
-{
-	outl(val, addr);
-}
 
 #define inb_p(port)		inb((port))
 #define outb_p(val, port)	outb((val), (port))