Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94d4b476 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/mm: Clean up types in xlate_dev_mem_ptr() 



Pavel Machek reported the following compiler warning on
x86/32 CONFIG_HIGHMEM64G=y builds:

  arch/x86/mm/ioremap.c:344:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Clean up the types in this function by using a single natural type for
internal calculations (unsigned long), to make it more apparent what's
happening, and also to remove fragile casts.

Reported-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: jgross@suse.com
Cc: roland@purestorage.com
Link: http://lkml.kernel.org/r/20150416080440.GA507@amd


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a6dfa128

arch/x86/mm/ioremap.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -332,18 +332,20 @@ EXPORT_SYMBOL(iounmap); 
 */

 */

void *xlate_dev_mem_ptr(phys_addr_t phys)

void *xlate_dev_mem_ptr(phys_addr_t phys)

{

{

	void *addr;

	unsigned long start  = phys &  PAGE_MASK;

	unsigned long start  = phys &  PAGE_MASK;

	unsigned long offset = phys & ~PAGE_MASK;

	unsigned long vaddr;





	/* If page is RAM, we can use __va. Otherwise ioremap and unmap. */

	/* If page is RAM, we can use __va. Otherwise ioremap and unmap. */

	if (page_is_ram(start >> PAGE_SHIFT))

	if (page_is_ram(start >> PAGE_SHIFT))

		return __va(phys);

		return __va(phys);





	addr = (void __force *)ioremap_cache(start, PAGE_SIZE);

	vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);

	if (addr)

	/* Only add the offset on success and return NULL if the ioremap() failed: */

		addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));

	if (vaddr)

		vaddr += offset;





	return addr;

	return (void *)vaddr;

}

}





void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)

void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)