Skip to contentSkip to conversation

sun3 __iomem annotations

PATCH New Al Viro 1 participant 1 message Oct 11, 2006

Subsystems (2)
lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 sun3 __iomem annotations

---
 arch/m68k/mm/sun3kmap.c  |    8 ++++----
 drivers/net/sun3_82586.c |    2 +-
 drivers/net/sun3lance.c  |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
arch/m68k/mm/sun3kmap.c +4 -4
index 7f0d86f..8caa459 100644
@@ -59,7 +59,7 @@ static inline void do_pmeg_mapin(unsigne
 	}
 }
 
-void *sun3_ioremap(unsigned long phys, unsigned long size,
+void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
 		   unsigned long type)
 {
 	struct vm_struct *area;
@@ -101,19 +101,19 @@ #endif
 		virt += seg_pages * PAGE_SIZE;
 	}
 
-	return (void *)ret;
+	return (void __iomem *)ret;
 
 }
 
 
-void *__ioremap(unsigned long phys, unsigned long size, int cache)
+void __iomem *__ioremap(unsigned long phys, unsigned long size, int cache)
 {
 
 	return sun3_ioremap(phys, size, SUN3_PAGE_TYPE_IO);
 
 }
 
-void iounmap(void *addr)
+void iounmap(void __iomem *addr)
 {
 	vfree((void *)(PAGE_MASK & (unsigned long)addr));
 }
drivers/net/sun3_82586.c +1 -1
index d1d1885..a3220a9 100644
@@ -330,7 +330,7 @@ out2:
 out1:
 	free_netdev(dev);
 out:
-	iounmap((void *)ioaddr);
+	iounmap((void __iomem *)ioaddr);
 	return ERR_PTR(err);
 }
 
drivers/net/sun3lance.c +3 -3
index 91c7654..b865db3 100644
@@ -286,7 +286,7 @@ struct net_device * __init sun3lance_pro
 
 out1:
 #ifdef CONFIG_SUN3
-	iounmap((void *)dev->base_addr);
+	iounmap((void __iomem *)dev->base_addr);
 #endif
 out:
 	free_netdev(dev);
@@ -326,7 +326,7 @@ #endif
 		ioaddr_probe[1] = tmp2;
 
 #ifdef CONFIG_SUN3
-		iounmap((void *)ioaddr);
+		iounmap((void __iomem *)ioaddr);
 #endif
 		return 0;
 	}
@@ -956,7 +956,7 @@ void cleanup_module(void)
 {
 	unregister_netdev(sun3lance_dev);
 #ifdef CONFIG_SUN3
-	iounmap((void *)sun3lance_dev->base_addr);
+	iounmap((void __iomem *)sun3lance_dev->base_addr);
 #endif
 	free_netdev(sun3lance_dev);
 }
Signature · 1 line
1.4.2.GIT