linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / arcnet / arc-rimi.c

diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index 77ff7df..38c3f03 100644 (file)
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -230,8 +230,8 @@ 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;
+       struct arcnet_local *lp = dev->priv;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", dev->name, ASTATUS());
 
@@ -251,24 +251,24 @@ 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;
+       struct arcnet_local *lp = dev->priv;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        AINTMASK(mask);
 }
 
 static int arcrimi_status(struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
-       void *ioaddr = lp->mem_start + 0x800;
+       struct arcnet_local *lp = dev->priv;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        return ASTATUS();
 }
 
 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;
+       struct arcnet_local *lp = dev->priv;
+       void __iomem *ioaddr = lp->mem_start + 0x800;
 
        ACOMMAND(cmd);
 }
@@ -276,8 +276,8 @@ static void arcrimi_command(struct net_device *dev, int cmd)
 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;
+       struct arcnet_local *lp = dev->priv;
+       void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
        TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
 }
 
@@ -285,8 +285,8 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset,
 static void arcrimi_copy_from_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;
+       struct arcnet_local *lp = dev->priv;
+       void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
        TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
 }
 
@@ -331,7 +331,7 @@ static int __init arc_rimi_init(void)
 static void __exit arc_rimi_exit(void)
 {
        struct net_device *dev = my_dev;
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
 
        unregister_netdev(dev);
        iounmap(lp->mem_start);