[PATCH] sun3 __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
1e5c374d38
commit
437111ca38
@ -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)
|
unsigned long type)
|
||||||
{
|
{
|
||||||
struct vm_struct *area;
|
struct vm_struct *area;
|
||||||
@ -101,19 +101,19 @@ void *sun3_ioremap(unsigned long phys, unsigned long size,
|
|||||||
virt += seg_pages * PAGE_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);
|
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));
|
vfree((void *)(PAGE_MASK & (unsigned long)addr));
|
||||||
}
|
}
|
||||||
|
@ -330,7 +330,7 @@ struct net_device * __init sun3_82586_probe(int unit)
|
|||||||
out1:
|
out1:
|
||||||
free_netdev(dev);
|
free_netdev(dev);
|
||||||
out:
|
out:
|
||||||
iounmap((void *)ioaddr);
|
iounmap((void __iomem *)ioaddr);
|
||||||
return ERR_PTR(err);
|
return ERR_PTR(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,7 +286,7 @@ struct net_device * __init sun3lance_probe(int unit)
|
|||||||
|
|
||||||
out1:
|
out1:
|
||||||
#ifdef CONFIG_SUN3
|
#ifdef CONFIG_SUN3
|
||||||
iounmap((void *)dev->base_addr);
|
iounmap((void __iomem *)dev->base_addr);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
free_netdev(dev);
|
free_netdev(dev);
|
||||||
@ -326,7 +326,7 @@ static int __init lance_probe( struct net_device *dev)
|
|||||||
ioaddr_probe[1] = tmp2;
|
ioaddr_probe[1] = tmp2;
|
||||||
|
|
||||||
#ifdef CONFIG_SUN3
|
#ifdef CONFIG_SUN3
|
||||||
iounmap((void *)ioaddr);
|
iounmap((void __iomem *)ioaddr);
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -956,7 +956,7 @@ void cleanup_module(void)
|
|||||||
{
|
{
|
||||||
unregister_netdev(sun3lance_dev);
|
unregister_netdev(sun3lance_dev);
|
||||||
#ifdef CONFIG_SUN3
|
#ifdef CONFIG_SUN3
|
||||||
iounmap((void *)sun3lance_dev->base_addr);
|
iounmap((void __iomem *)sun3lance_dev->base_addr);
|
||||||
#endif
|
#endif
|
||||||
free_netdev(sun3lance_dev);
|
free_netdev(sun3lance_dev);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user