mtd/include/linux/mtd compatmac.h, 1.66, 1.67 doc2000.h, 1.22, 1.23 map.h, 1.43, 1.44 nand.h, 1.63, 1.64

[gleixner at infradead.org]

Update of /home/cvs/mtd/include/linux/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv7211

Modified Files:
	compatmac.h doc2000.h map.h nand.h 
Log Message:
Start the __iomem readb and friends overhaul

Index: compatmac.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/compatmac.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- compatmac.h	2 Sep 2004 01:45:46 -0000	1.66
+++ compatmac.h	16 Sep 2004 23:26:08 -0000	1.67
@@ -27,7 +27,6 @@
 #define recalc_sigpending() __recalc_sigpending ()
 
 #define set_user_nice(tsk, n) do { (tsk)->nice = n; } while(0)
-
 #endif
 
 
@@ -186,9 +185,9 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #define kvec iovec
 #define __user 
+#define __iomem
 #endif
 
-
 #ifndef list_for_each_entry_safe
 /**
  * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry

Index: doc2000.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/doc2000.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- doc2000.h	5 Nov 2003 10:51:36 -0000	1.22
+++ doc2000.h	16 Sep 2004 23:26:08 -0000	1.23
@@ -89,8 +89,8 @@
 #define WriteDOC_(d, adr, reg)  do{ *(volatile __u16 *)(((unsigned long)adr)+((reg)<<1)) = (__u16)d; wmb();} while(0)
 #define DOC_IOREMAP_LEN 0x4000
 #else
-#define ReadDOC_(adr, reg)      readb(((unsigned long)adr) + (reg))
-#define WriteDOC_(d, adr, reg)  writeb(d, ((unsigned long)adr) + (reg))
+#define ReadDOC_(adr, reg)      readb((void __iomem *)(((unsigned long)adr) + (reg)))
+#define WriteDOC_(d, adr, reg)  writeb(d, (void __iomem *)(((unsigned long)adr) + (reg)))
 #define DOC_IOREMAP_LEN 0x2000
 
 #endif
@@ -168,7 +168,7 @@
 
 struct DiskOnChip {
 	unsigned long physadr;
-	unsigned long virtadr;
+	void __iomem *virtadr;
 	unsigned long totlen;
 	unsigned char ChipID; /* Type of DiskOnChip */
 	int ioreg;

Index: map.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/map.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- map.h	14 Jul 2004 13:30:27 -0000	1.43
+++ map.h	16 Sep 2004 23:26:08 -0000	1.44
@@ -8,6 +8,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/list.h>
+#include <linux/mtd/compatmac.h>
 #include <asm/unaligned.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -179,7 +180,7 @@
 	unsigned long phys;
 #define NO_XIP (-1UL)
 
-	unsigned long virt;
+	void __iomem *virt;
 	void *cached;
 
 	int bankwidth; /* in octets. This isn't necessarily the width

Index: nand.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/nand.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- nand.h	7 Jul 2004 16:29:43 -0000	1.63
+++ nand.h	16 Sep 2004 23:26:08 -0000	1.64
@@ -269,8 +269,8 @@
  */
  
 struct nand_chip {
-	unsigned long 	IO_ADDR_R;
-	unsigned long 	IO_ADDR_W;
+	void  __iomem	*IO_ADDR_R;
+	void  __iomem 	*IO_ADDR_W;
 	
 	u_char		(*read_byte)(struct mtd_info *mtd);
 	void		(*write_byte)(struct mtd_info *mtd, u_char byte);