x86/mm: Clean up types in xlate_dev_mem_ptr() some more

So Linus noticed that in:

  94d4b4765b7d ("x86/mm: Clean up types in xlate_dev_mem_ptr()")

... I added two nonsensical casts, due to the poor type choice
for 'vaddr'.

Change it to 'void *' and take advantage of void * arithmetics.

This removes the casts.

( Also remove a nonsensical return line from unxlate_dev_mem_ptr()
  while at it. )

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 70e7444..27ff212 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -353,18 +353,18 @@ void *xlate_dev_mem_ptr(phys_addr_t phys)
 {
        unsigned long start  = phys &  PAGE_MASK;
        unsigned long offset = phys & ~PAGE_MASK;
-       unsigned long vaddr;
+       void *vaddr;
 
        /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
        if (page_is_ram(start >> PAGE_SHIFT))
                return __va(phys);
 
-       vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);
+       vaddr = ioremap_cache(start, PAGE_SIZE);
        /* Only add the offset on success and return NULL if the ioremap() failed: */
        if (vaddr)
                vaddr += offset;
 
-       return (void *)vaddr;
+       return vaddr;
 }
 
 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
@@ -373,7 +373,6 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
                return;
 
        iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
-       return;
 }
 
 static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;