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/synclink.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/synclink.c')
-rw-r--r-- | drivers/char/synclink.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index 4fbfff7a442e..513b7c2f3e26 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -4150,7 +4150,8 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4150 | } | 4150 | } |
4151 | info->lcr_mem_requested = true; | 4151 | info->lcr_mem_requested = true; |
4152 | 4152 | ||
4153 | info->memory_base = ioremap(info->phys_memory_base,0x40000); | 4153 | info->memory_base = ioremap_nocache(info->phys_memory_base, |
4154 | 0x40000); | ||
4154 | if (!info->memory_base) { | 4155 | if (!info->memory_base) { |
4155 | printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n", | 4156 | printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n", |
4156 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); | 4157 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); |
@@ -4163,12 +4164,14 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4163 | goto errout; | 4164 | goto errout; |
4164 | } | 4165 | } |
4165 | 4166 | ||
4166 | info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE) + info->lcr_offset; | 4167 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, |
4168 | PAGE_SIZE); | ||
4167 | if (!info->lcr_base) { | 4169 | if (!info->lcr_base) { |
4168 | printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n", | 4170 | printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n", |
4169 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); | 4171 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); |
4170 | goto errout; | 4172 | goto errout; |
4171 | } | 4173 | } |
4174 | info->lcr_base += info->lcr_offset; | ||
4172 | 4175 | ||
4173 | } else { | 4176 | } else { |
4174 | /* claim DMA channel */ | 4177 | /* claim DMA channel */ |