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

Commit f3360934 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Convert p3_ioremap() users to ioremap_prot(). 



This kills off the ancient p3_ioremap(), converting over to the more
generic ioremap_prot() instead.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent acf2c968

arch/sh/boards/mach-landisk/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int __init landisk_devices_setup(void) 
	/* open I/O area window */

	paddrbase = virt_to_phys((void *)PA_AREA5_IO);

	prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);

	cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot);

	cf_ide_base = ioremap_prot(paddrbase, PAGE_SIZE, pgprot_val(prot));

	if (!cf_ide_base) {

		printk("allocate_cf_area : can't open CF I/O window!\n");

		return -ENOMEM;

arch/sh/boards/mach-lboxre2/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int __init lboxre2_devices_setup(void) 
	paddrbase = virt_to_phys((void*)PA_AREA5_IO);

	psize = PAGE_SIZE;

	prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);

	cf0_io_base = (u32)p3_ioremap(paddrbase, psize, prot);

	cf0_io_base = (u32)ioremap_prot(paddrbase, psize, pgprot_val(prot));

	if (!cf0_io_base) {

		printk(KERN_ERR "%s : can't open CF I/O window!\n" , __func__ );

		return -ENOMEM;

arch/sh/boards/mach-sh03/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int __init sh03_devices_setup(void) 
	/* open I/O area window */

	paddrbase = virt_to_phys((void *)PA_AREA5_IO);

	prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);

	cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot);

	cf_ide_base = ioremap_prot(paddrbase, PAGE_SIZE, pgprot_val(prot));

	if (!cf_ide_base) {

		printk("allocate_cf_area : can't open CF I/O window!\n");

		return -ENOMEM;

arch/sh/include/asm/io.h

+0 −1
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags) 
}



#define ioremap_nocache	ioremap

#define p3_ioremap	__ioremap

#define iounmap		__iounmap



#define maybebadio(port) \