[PATCH] arcnet iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index 77ff7df322361b9619118e507c401f6300880b51..edcc38761999f52c1e50824705a6560e2e408947 100644 (file)
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -231,7 +231,7 @@ err_free_irq:
 static int arcrimi_reset(struct net_device *dev, int really_reset)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *ioaddr = lp->mem_start + 0x800;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", dev->name, ASTATUS());
 
@@ -252,7 +252,7 @@ static int arcrimi_reset(struct net_device *dev, int really_reset)
 static void arcrimi_setmask(struct net_device *dev, int mask)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *ioaddr = lp->mem_start + 0x800;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        AINTMASK(mask);
 }
@@ -260,7 +260,7 @@ static void arcrimi_setmask(struct net_device *dev, int mask)
 static int arcrimi_status(struct net_device *dev)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *ioaddr = lp->mem_start + 0x800;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        return ASTATUS();
 }
@@ -268,7 +268,7 @@ static int arcrimi_status(struct net_device *dev)
 static void arcrimi_command(struct net_device *dev, int cmd)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *ioaddr = lp->mem_start + 0x800;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        ACOMMAND(cmd);
 }
@@ -277,7 +277,7 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset,
                                 void *buf, int count)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
+       void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
        TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
 }
 
@@ -286,7 +286,7 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse
                                   void *buf, int count)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
+       void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
        TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
 }
 

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 05a832a2fb4184b7edb273cff8a7efd8ca5675b8..ba0f8a2eba60b50f2958076bf807873c1663c27d 100644 (file)
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -566,7 +566,7 @@ static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset,
                                 void *buf, int count)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *memaddr = lp->mem_start + bufnum * 512 + offset;
+       void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset;
        TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
 }
 
@@ -575,7 +575,7 @@ static void com90xx_copy_from_card(struct net_device *dev, int bufnum, int offse
                                   void *buf, int count)
 {
        struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *memaddr = lp->mem_start + bufnum * 512 + offset;
+       void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset;
        TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
 }
 

diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index 3a3759fcebdb435572cd15f5edb07a93e0b0d3ce..9d2429f07a64160a75da33cb9a8364b749060405 100644 (file)
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -305,7 +305,7 @@ struct arcnet_local {
                                        void *buf, int count);
        } hw;
 
-       void *mem_start;        /* pointer to ioremap'ed MMIO */
+       void __iomem *mem_start;        /* pointer to ioremap'ed MMIO */
 };