Commit 437111ca authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] sun3 __iomem annotations


Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1e5c374d
......@@ -59,7 +59,7 @@ static inline void do_pmeg_mapin(unsigned long phys, unsigned long virt,
}
}
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 @@ void *sun3_ioremap(unsigned long phys, unsigned long size,
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));
}
......
......@@ -330,7 +330,7 @@ out2:
out1:
free_netdev(dev);
out:
iounmap((void *)ioaddr);
iounmap((void __iomem *)ioaddr);
return ERR_PTR(err);
}
......
......@@ -286,7 +286,7 @@ struct net_device * __init sun3lance_probe(int unit)
out1:
#ifdef CONFIG_SUN3
iounmap((void *)dev->base_addr);
iounmap((void __iomem *)dev->base_addr);
#endif
out:
free_netdev(dev);
......@@ -326,7 +326,7 @@ static int __init lance_probe( struct net_device *dev)
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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment