Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: simplify __ioremap

Browse Source 
Remove tons of castings which make the code hard to read.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2008-02-04 16:48:05 +01:00 committed by Ingo Molnar
parent 63c1dcf4bc
commit e66aadbe6c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/mm/ioremap.c
View File

@ -114,9 +114,8 @@ static int ioremap_change_attr(unsigned long paddr, unsigned long size,
static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
enum ioremap_mode mode)
{
void __iomem *addr;
unsigned long pfn, offset, last_addr, vaddr;
struct vm_struct *area;
unsigned long pfn, offset, last_addr;
pgprot_t prot;
/* Don't allow wraparound or zero size */
@ -164,19 +163,18 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
if (!area)
return NULL;
area->phys_addr = phys_addr;
addr = (void __iomem *) area->addr;
if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
phys_addr, prot)) {
remove_vm_area((void *)(PAGE_MASK & (unsigned long) addr));
vaddr = (unsigned long) area->addr;
if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
remove_vm_area((void *)(vaddr & PAGE_MASK));
return NULL;
}
if (ioremap_change_attr(phys_addr, size, mode) < 0) {
vunmap(addr);
vunmap(area->addr);
return NULL;
}
return (void __iomem *) (offset + (char __iomem *)addr);
return (void __iomem *) (vaddr + offset);
}
/**