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

Commit 492643e8 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: drop function __ioremap() 



__ioremap() is not used anymore, drop it.

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/ccc439f481a0884e00a6be1bab44bab2a4477fea.1566309262.git.christophe.leroy@c-s.fr
parent 8aee0772

arch/powerpc/include/asm/io.h

+0 −6
Original line number Diff line number Diff line
@@ -705,10 +705,6 @@ static inline void iosync(void) 
 *   create hand-made mappings for use only by the PCI code and cannot

 *   currently be hooked. Must be page aligned.

 *

 * * __ioremap is the low level implementation used by ioremap and

 *   ioremap_prot and cannot be hooked (but can be used by a hook on one

 *   of the previous ones)

 *

 * * __ioremap_caller is the same as above but takes an explicit caller

 *   reference rather than using __builtin_return_address(0)

 *
@@ -726,8 +722,6 @@ void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size); 


extern void iounmap(volatile void __iomem *addr);



extern void __iomem *__ioremap(phys_addr_t, unsigned long size,

			       unsigned long flags);

extern void __iomem *__ioremap_caller(phys_addr_t, unsigned long size,

				      pgprot_t prot, void *caller);

arch/powerpc/mm/pgtable_32.c

+2 −9
Original line number Diff line number Diff line
@@ -91,12 +91,6 @@ ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) 
}

EXPORT_SYMBOL(ioremap_prot);



void __iomem *

__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)

{

	return __ioremap_caller(addr, size, __pgprot(flags), __builtin_return_address(0));

}



void __iomem *

__ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *caller)

{
@@ -127,7 +121,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call 
	 */

	if (slab_is_available() && p <= virt_to_phys(high_memory - 1) &&

	    page_is_ram(__phys_to_pfn(p))) {

		printk("__ioremap(): phys addr 0x%llx is RAM lr %ps\n",

		pr_warn("%s(): phys addr 0x%llx is RAM lr %ps\n", __func__,

			(unsigned long long)p, __builtin_return_address(0));

		return NULL;

	}
@@ -171,7 +165,6 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call 
out:

	return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK));

}

EXPORT_SYMBOL(__ioremap);



void iounmap(volatile void __iomem *addr)

{

arch/powerpc/mm/pgtable_64.c

+0 −7
Original line number Diff line number Diff line
@@ -203,12 +203,6 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, 
	return ret;

}



void __iomem * __ioremap(phys_addr_t addr, unsigned long size,

			 unsigned long flags)

{

	return __ioremap_caller(addr, size, __pgprot(flags), __builtin_return_address(0));

}



void __iomem * ioremap(phys_addr_t addr, unsigned long size)

{

	pgprot_t prot = pgprot_noncached(PAGE_KERNEL);
@@ -286,7 +280,6 @@ void iounmap(volatile void __iomem *token) 
EXPORT_SYMBOL(ioremap);

EXPORT_SYMBOL(ioremap_wc);

EXPORT_SYMBOL(ioremap_prot);

EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(__ioremap_at);

EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(__iounmap_at);