 @@ -697,27 +697,27 @@ xf86WriteMmio32BeNB(__volatile__ void *b
+}
 static __inline__ void
 xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
 		    const unsigned int val)
+{
 	unsigned long addr = ((unsigned long)base) + offset;
 	__asm__ __volatile__("sta %0, [%1] %2"
 			     : /* No outputs */
 			     : "r" (val), "r" (addr), "i" (ASI_PL));
+}
-#   elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+#   elif defined(__mips__) || ((defined(__arm32__) || defined(__arm__)) && !defined(__linux__))
 #    ifdef __arm32__
 #     define PORT_SIZE long
 #    else
 #     define PORT_SIZE short
 #    endif
 _X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)
+{
 	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+}
 @@ -736,81 +736,26 @@ outl(unsigned PORT_SIZE port, unsigned i
 static __inline__ unsigned int
 inb(unsigned PORT_SIZE port)
+{
 	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+}
 static __inline__ unsigned int
 inw(unsigned PORT_SIZE port)
+{
 	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+}
 #if 0
 static __inline__ void stw_u(unsigned long val, unsigned short *p)
 #    if defined(__GNUC__)
 	struct __una_u16 *ptr = (struct __una_u16 *) p;
 	ptr->x = val;
 #    else
 	unsigned short tmp = val;
 	memmove(p, &tmp, sizeof(*p));
 #    endif
 #    define mem_barrier()         /* XXX: nop for now */
 #    define write_mem_barrier()   /* XXX: nop for now */
 #   elif defined(__mips__) || ((defined(__arm32__) || defined(__arm__)) && !defined(__linux__))
 #    if defined(__arm32__) || defined(__arm__)
 #     define PORT_SIZE long
 #    else
 #     define PORT_SIZE short
 #    endif
 unsigned int IOPortBase;  /* Memory mapped I/O port area */
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)
 	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
 static __inline__ void
 outw(unsigned PORT_SIZE port, unsigned short val)
 	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
 static __inline__ void
 outl(unsigned PORT_SIZE port, unsigned int val)
 	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
 static __inline__ unsigned int
 inb(unsigned PORT_SIZE port)
 	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
 static __inline__ unsigned int
 inw(unsigned PORT_SIZE port)
 	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
 #endif
 static __inline__ unsigned int
 inl(unsigned PORT_SIZE port)
+{
 	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+}
 #    if defined(__mips__)
 #     ifdef linux	/* don't mess with other OSs */
 #       if X_BYTE_ORDER == X_BIG_ENDIAN
 static __inline__ unsigned int
 xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
+{
 @@ -827,39 +772,26 @@ static __inline__ void
 xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
 		  const unsigned int val)
+{
 	unsigned long addr = ((unsigned long)base) + offset;
 	__asm__ __volatile__("sw %0, 0(%1)"
 			     : /* No outputs */
 			     : "r" (val), "r" (addr));
+}
 #      endif
 #     endif /* !linux */
 #    endif /* __mips__ */
 #if 0
 #    if defined(__arm32__) || defined(__arm__)
 #     define ldq_u(p)	(*((unsigned long  *)(p)))
 #     define ldl_u(p)	(*((unsigned int   *)(p)))
 #     define ldw_u(p)	(*((unsigned short *)(p)))
 #     define stq_u(v,p)	(*(unsigned long  *)(p)) = (v)
 #     define stl_u(v,p)	(*(unsigned int   *)(p)) = (v)
 #     define stw_u(v,p)	(*(unsigned short *)(p)) = (v)
 #     define mem_barrier()	/* NOP */
 #     define write_mem_barrier()	/* NOP */
 #    endif /* __arm32__ || __arm__ */
 #endif
 #   elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
 #    ifndef MAP_FAILED
 #     define MAP_FAILED ((void *)-1)
 #    endif
 extern _X_EXPORT volatile unsigned char *ioBase;
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
+{
         register unsigned char val;
         __asm__ __volatile__(