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: Paul Mundt <lethal@linux-sh.org>

4 files changed, 4 insertions, 5 deletions

diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c
index 59816355d199..2d09d4d34f87 100644
--- a/arch/sh/boards/mach-landisk/setup.c
+++ b/arch/sh/boards/mach-landisk/setup.c
@@ -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;
diff --git a/arch/sh/boards/mach-lboxre2/setup.c b/arch/sh/boards/mach-lboxre2/setup.c
index 408dd5df7d45..79b4e0d77b71 100644
--- a/arch/sh/boards/mach-lboxre2/setup.c
+++ b/arch/sh/boards/mach-lboxre2/setup.c
@@ -56,8 +56,8 @@ static int __init lboxre2_devices_setup(void)
         /* open I/O area window */
         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);
+        prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);
+        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;
diff --git a/arch/sh/boards/mach-sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c
index f14ba0fa950b..af4a0c012a96 100644
--- a/arch/sh/boards/mach-sh03/setup.c
+++ b/arch/sh/boards/mach-sh03/setup.c
@@ -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;
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 70269813cef1..c32a55601d01 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -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) \