redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Paul Mundt 2010-01-19 13:55:41 +09:00
parent acf2c9685f
commit f33609344a
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sh/boards/mach-landisk/setup.c
View file

@ -63,7 +63,7 @@ static int __init landisk_devices_setup(void)
/* open I/O area window */ /* open I/O area window */
paddrbase = virt_to_phys((void *)PA_AREA5_IO); paddrbase = virt_to_phys((void *)PA_AREA5_IO);
prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16); 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) { if (!cf_ide_base) {
printk("allocate_cf_area : can't open CF I/O window!\n"); printk("allocate_cf_area : can't open CF I/O window!\n");
return -ENOMEM; return -ENOMEM;

4
arch/sh/boards/mach-lboxre2/setup.c
View file

@ -56,8 +56,8 @@ static int __init lboxre2_devices_setup(void)
/* open I/O area window */ /* open I/O area window */
paddrbase = virt_to_phys((void*)PA_AREA5_IO); paddrbase = virt_to_phys((void*)PA_AREA5_IO);
psize = PAGE_SIZE; psize = PAGE_SIZE;
prot = PAGE_KERNEL_PCC( 1 , _PAGE_PCC_IO16); 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) { if (!cf0_io_base) {
printk(KERN_ERR "%s : can't open CF I/O window!\n" , __func__ ); printk(KERN_ERR "%s : can't open CF I/O window!\n" , __func__ );
return -ENOMEM; return -ENOMEM;

2
arch/sh/boards/mach-sh03/setup.c
View file

@ -82,7 +82,7 @@ static int __init sh03_devices_setup(void)
/* open I/O area window */ /* open I/O area window */
paddrbase = virt_to_phys((void *)PA_AREA5_IO); paddrbase = virt_to_phys((void *)PA_AREA5_IO);
prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16); 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) { if (!cf_ide_base) {
printk("allocate_cf_area : can't open CF I/O window!\n"); printk("allocate_cf_area : can't open CF I/O window!\n");
return -ENOMEM; return -ENOMEM;

1
arch/sh/include/asm/io.h
View file

@ -328,7 +328,6 @@ ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags)
} }
#define ioremap_nocache ioremap #define ioremap_nocache ioremap
#define p3_ioremap __ioremap
#define iounmap __iounmap #define iounmap __iounmap
#define maybebadio(port) \ #define maybebadio(port) \