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

Commit 7fc35150 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

hexagon: clean up ioremap 



commit ac32292c8552f7e8517be184e65dd09786e991f9 upstream.

Use ioremap as the main implemented function, and defined
ioremap_nocache to it as a deprecated alias.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e06a8998

arch/hexagon/include/asm/io.h

+2 −9
Original line number Diff line number Diff line
@@ -186,16 +186,9 @@ static inline void writel(u32 data, volatile void __iomem *addr) 


#define mmiowb()



/*

 * Need an mtype somewhere in here, for cache type deals?

 * This is probably too long for an inline.

 */

void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size);

void __iomem *ioremap(unsigned long phys_addr, unsigned long size);

#define ioremap_nocache ioremap



static inline void __iomem *ioremap(unsigned long phys_addr, unsigned long size)

{

	return ioremap_nocache(phys_addr, size);

}



static inline void iounmap(volatile void __iomem *addr)

{

arch/hexagon/kernel/hexagon_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ EXPORT_SYMBOL(__vmgetie); 
EXPORT_SYMBOL(__vmsetie);

EXPORT_SYMBOL(__vmyield);

EXPORT_SYMBOL(empty_zero_page);

EXPORT_SYMBOL(ioremap_nocache);

EXPORT_SYMBOL(ioremap);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memset);

arch/hexagon/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/vmalloc.h>

#include <linux/mm.h>



void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size)

void __iomem *ioremap(unsigned long phys_addr, unsigned long size)

{

	unsigned long last_addr, addr;

	unsigned long offset = phys_addr & ~PAGE_MASK;