mtd/include/linux/mtd doc2000.h,1.23,1.24

David Woodhouse dwmw2 at
Wed Jan 5 07:40:41 EST 2005

Update of /home/cvs/mtd/include/linux/mtd
In directory

Modified Files:
Log Message:
[PATCH] diskonchip missing iomem annotations
        some trivial iomem annotations were still missing; since 2.6.10
and mtd snapshot are identical in that area, same patch goes to Linus and
Signed-off-by: Al Viro <viro at>

Index: doc2000.h
RCS file: /home/cvs/mtd/include/linux/mtd/doc2000.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- doc2000.h	16 Sep 2004 23:26:08 -0000	1.23
+++ doc2000.h	5 Jan 2005 12:40:38 -0000	1.24
@@ -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
-#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 ReadDOC_(adr, reg)      readb((void __iomem *)(adr) + (reg))
+#define WriteDOC_(d, adr, reg)  writeb(d, (void __iomem *)(adr) + (reg))
 #define DOC_IOREMAP_LEN 0x2000

More information about the linux-mtd-cvs mailing list