aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/ioremap.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-09-05 09:08:44 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-05 09:11:24 -0400
commit09d9bae064724635df3920bcca47e077cfb23e76 (patch)
treea42fa183dbdbd69854866c0b1f0169f0286b45d4 /arch/arm/mm/ioremap.c
parent22acc4e65043d436bc286e6059960fa533e37356 (diff)
[ARM] sparse: fix several warnings
arch/arm/kernel/process.c:270:6: warning: symbol 'show_fpregs' was not declared. Should it be static? This function isn't used, so can be removed. arch/arm/kernel/setup.c:532:9: warning: symbol 'len' shadows an earlier one arch/arm/kernel/setup.c:524:6: originally declared here A function containing two 'len's. arch/arm/mm/fault-armv.c:188:13: warning: symbol 'check_writebuffer_bugs' was not declared. Should it be static? arch/arm/mm/mmap.c:122:5: warning: symbol 'valid_phys_addr_range' was not declared. Should it be static? arch/arm/mm/mmap.c:137:5: warning: symbol 'valid_mmap_phys_addr_range' was not declared. Should it be static? Missing includes. arch/arm/kernel/traps.c:71:77: warning: Using plain integer as NULL pointer arch/arm/mm/ioremap.c:355:46: error: incompatible types in comparison expression (different address spaces) Sillies. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/ioremap.c')
-rw-r--r--arch/arm/mm/ioremap.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 20e4454e452e..52e5a4d28eb7 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -333,15 +333,14 @@ __arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
333} 333}
334EXPORT_SYMBOL(__arm_ioremap); 334EXPORT_SYMBOL(__arm_ioremap);
335 335
336void __iounmap(volatile void __iomem *addr) 336void __iounmap(volatile void __iomem *io_addr)
337{ 337{
338 void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
338#ifndef CONFIG_SMP 339#ifndef CONFIG_SMP
339 struct vm_struct **p, *tmp; 340 struct vm_struct **p, *tmp;
340#endif 341#endif
341 unsigned int section_mapping = 0; 342 unsigned int section_mapping = 0;
342 343
343 addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long)addr);
344
345#ifndef CONFIG_SMP 344#ifndef CONFIG_SMP
346 /* 345 /*
347 * If this is a section based mapping we need to handle it 346 * If this is a section based mapping we need to handle it
@@ -352,7 +351,7 @@ void __iounmap(volatile void __iomem *addr)
352 */ 351 */
353 write_lock(&vmlist_lock); 352 write_lock(&vmlist_lock);
354 for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) { 353 for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
355 if((tmp->flags & VM_IOREMAP) && (tmp->addr == addr)) { 354 if ((tmp->flags & VM_IOREMAP) && (tmp->addr == addr)) {
356 if (tmp->flags & VM_ARM_SECTION_MAPPING) { 355 if (tmp->flags & VM_ARM_SECTION_MAPPING) {
357 *p = tmp->next; 356 *p = tmp->next;
358 unmap_area_sections((unsigned long)tmp->addr, 357 unmap_area_sections((unsigned long)tmp->addr,
@@ -367,6 +366,6 @@ void __iounmap(volatile void __iomem *addr)
367#endif 366#endif
368 367
369 if (!section_mapping) 368 if (!section_mapping)
370 vunmap((void __force *)addr); 369 vunmap(addr);
371} 370}
372EXPORT_SYMBOL(__iounmap); 371EXPORT_SYMBOL(__iounmap);