diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 03:54:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:48 -0400 |
commit | 24cb233520f01971d6d873cb52c64bbbb0665ac0 (patch) | |
tree | 08ee88564a13e1a07132a59e6119b5affbd13cad /drivers/char/synclinkmp.c | |
parent | a6fc819ebe2d70c92e43e14adbb93a5bd8ea5aa3 (diff) |
char serial: switch drivers to ioremap_nocache
Simple search/replace except for synclink.c where I noticed a real bug and
fixed it too. It was doing NULL + offset, then checking for NULL if the remap
failed.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/synclinkmp.c')
-rw-r--r-- | drivers/char/synclinkmp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index a624ffd7baaa..bec54866e0bb 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -3643,7 +3643,8 @@ static int claim_resources(SLMP_INFO *info) | |||
3643 | else | 3643 | else |
3644 | info->sca_statctrl_requested = true; | 3644 | info->sca_statctrl_requested = true; |
3645 | 3645 | ||
3646 | info->memory_base = ioremap(info->phys_memory_base,SCA_MEM_SIZE); | 3646 | info->memory_base = ioremap_nocache(info->phys_memory_base, |
3647 | SCA_MEM_SIZE); | ||
3647 | if (!info->memory_base) { | 3648 | if (!info->memory_base) { |
3648 | printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", | 3649 | printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", |
3649 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); | 3650 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); |
@@ -3651,7 +3652,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3651 | goto errout; | 3652 | goto errout; |
3652 | } | 3653 | } |
3653 | 3654 | ||
3654 | info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE); | 3655 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); |
3655 | if (!info->lcr_base) { | 3656 | if (!info->lcr_base) { |
3656 | printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", | 3657 | printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", |
3657 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); | 3658 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); |
@@ -3660,7 +3661,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3660 | } | 3661 | } |
3661 | info->lcr_base += info->lcr_offset; | 3662 | info->lcr_base += info->lcr_offset; |
3662 | 3663 | ||
3663 | info->sca_base = ioremap(info->phys_sca_base,PAGE_SIZE); | 3664 | info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); |
3664 | if (!info->sca_base) { | 3665 | if (!info->sca_base) { |
3665 | printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", | 3666 | printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", |
3666 | __FILE__,__LINE__,info->device_name, info->phys_sca_base ); | 3667 | __FILE__,__LINE__,info->device_name, info->phys_sca_base ); |
@@ -3669,7 +3670,8 @@ static int claim_resources(SLMP_INFO *info) | |||
3669 | } | 3670 | } |
3670 | info->sca_base += info->sca_offset; | 3671 | info->sca_base += info->sca_offset; |
3671 | 3672 | ||
3672 | info->statctrl_base = ioremap(info->phys_statctrl_base,PAGE_SIZE); | 3673 | info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, |
3674 | PAGE_SIZE); | ||
3673 | if (!info->statctrl_base) { | 3675 | if (!info->statctrl_base) { |
3674 | printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", | 3676 | printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", |
3675 | __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); | 3677 | __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); |