redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] sun3 __iomem annotations

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-10-11 17:28:17 +01:00 committed by Linus Torvalds
parent 1e5c374d38
commit 437111ca38
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/m68k/mm/sun3kmap.c
View file

@ -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));
}

2
drivers/net/sun3_82586.c
View file

@ -330,7 +330,7 @@ out2:
out1:
free_netdev(dev);
out:
iounmap((void *)ioaddr);
iounmap((void __iomem *)ioaddr);
return ERR_PTR(err);
}

6
drivers/net/sun3lance.c
View file

@ -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);
}