readq/writeq bust?

[Anton Blanchard]

Hi,

I had to back the fix out of the s2io driver so it wouldnt use our
readq/writeq macros. Are they bust?

Anton

diff -puN drivers/net/s2io.h~s2iofix1 drivers/net/s2io.h
--- gr_work/drivers/net/s2io.h~s2iofix1	2004-05-12 23:26:16.773818328 -0500
+++ gr_work-anton/drivers/net/s2io.h	2004-05-12 23:26:16.789815798 -0500
@@ -749,8 +749,9 @@ typedef struct s2io_nic {
 #define LARGE_RXD_CNT	100 * (MAX_RXDS_PER_BLOCK+1)

 /*  OS related system calls */
-#ifndef readq
-static inline u64 readq(void *addr)
+#define readq readq__
+#ifndef readq__
+static inline u64 readq__(void *addr)
 {
 	u64 ret = 0;
 	ret = readl(addr + 4);
@@ -761,8 +762,9 @@ static inline u64 readq(void *addr)
 }
 #endif

-#ifndef writeq
-static inline void writeq(u64 val, void *addr)
+#define writeq writeq__
+#ifndef writeq__
+static inline void writeq__(u64 val, void *addr)
 {
 	writel((u32) (val), addr);
 	writel((u32) (val >> 32), (addr + 4));

_

** Sent via the linuxppc64-dev mail list. See http://lists.linuxppc.org/