patch-1.3.38 linux/include/asm-alpha/lca.h

Next file: linux/include/asm-alpha/page.h
Previous file: linux/include/asm-alpha/jensen.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.37/linux/include/asm-alpha/lca.h linux/include/asm-alpha/lca.h
@@ -287,38 +287,15 @@
  * Most of the above have so much overhead that it probably doesn't
  * make sense to have them inlined (better icache behavior).
  */
-extern unsigned int inb(unsigned long addr);
-extern unsigned int inw(unsigned long addr);
-extern unsigned int inl(unsigned long addr);
-
-extern void outb(unsigned char b, unsigned long addr);
-extern void outw(unsigned short b, unsigned long addr);
-extern void outl(unsigned int b, unsigned long addr);
-
-extern unsigned long readb(unsigned long addr);
-extern unsigned long readw(unsigned long addr);
-
-extern void writeb(unsigned char b, unsigned long addr);
-extern void writew(unsigned short b, unsigned long addr);
 
 #define inb(port) \
-(__builtin_constant_p((port))?__inb(port):(inb)(port))
+(__builtin_constant_p((port))?__inb(port):_inb(port))
 
 #define outb(x, port) \
-(__builtin_constant_p((port))?__outb((x),(port)):(outb)((x),(port)))
-
-#define inb_p inb
-#define outb_p outb
-
-extern inline unsigned long readl(unsigned long addr)
-{
-	return __readl(addr);
-}
+(__builtin_constant_p((port))?__outb((x),(port)):_outb((x),(port)))
 
-extern inline void writel(unsigned int b, unsigned long addr)
-{
-	__writel(b, addr);
-}
+#define readl(a)	__readl((unsigned long)(a))
+#define writel(v,a)	__writel((v),(unsigned long)(a))
 
 #undef vuip
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this