lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

io-mapping: Fix the address space annotations

Browse Source 
Fixes a bunch of sparse warnings in io-mapping.h because of the
inconsistent __iomem usage.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
LKML-Reference: <1283633804-11749-2-git-send-email-currojerez@riseup.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Francisco Jerez
2010-09-04 22:56:44 +02:00
committed by Ingo Molnar
parent cc1a8e5233
commit 29bc17ecb8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/linux/io-mapping.h
View File

@@ -79,7 +79,7 @@ io_mapping_free(struct io_mapping *mapping)
} }
/* Atomic map/unmap */ /* Atomic map/unmap */
static inline void * static inline void __iomem *
io_mapping_map_atomic_wc(struct io_mapping *mapping, io_mapping_map_atomic_wc(struct io_mapping *mapping,
unsigned long offset, unsigned long offset,
int slot) int slot)
@@ -94,12 +94,12 @@ io_mapping_map_atomic_wc(struct io_mapping *mapping,
} }
static inline void static inline void
io_mapping_unmap_atomic(void *vaddr, int slot) io_mapping_unmap_atomic(void __iomem *vaddr, int slot)
{ {
iounmap_atomic(vaddr, slot); iounmap_atomic(vaddr, slot);
} }
static inline void * static inline void __iomem *
io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset) io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
{ {
resource_size_t phys_addr; resource_size_t phys_addr;
@@ -111,7 +111,7 @@ io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
} }
static inline void static inline void
io_mapping_unmap(void *vaddr) io_mapping_unmap(void __iomem *vaddr)
{ {
iounmap(vaddr); iounmap(vaddr);
} }
@@ -125,38 +125,38 @@ struct io_mapping;
static inline struct io_mapping * static inline struct io_mapping *
io_mapping_create_wc(resource_size_t base, unsigned long size) io_mapping_create_wc(resource_size_t base, unsigned long size)
{ {
return (struct io_mapping *) ioremap_wc(base, size); return (struct io_mapping __force *) ioremap_wc(base, size);
} }
static inline void static inline void
io_mapping_free(struct io_mapping *mapping) io_mapping_free(struct io_mapping *mapping)
{ {
iounmap(mapping); iounmap((void __force __iomem *) mapping);
} }
/* Atomic map/unmap */ /* Atomic map/unmap */
static inline void * static inline void __iomem *
io_mapping_map_atomic_wc(struct io_mapping *mapping, io_mapping_map_atomic_wc(struct io_mapping *mapping,
unsigned long offset, unsigned long offset,
int slot) int slot)
{ {
return ((char *) mapping) + offset; return ((char __force __iomem *) mapping) + offset;
} }
static inline void static inline void
io_mapping_unmap_atomic(void *vaddr, int slot) io_mapping_unmap_atomic(void __iomem *vaddr, int slot)
{ {
} }
/* Non-atomic map/unmap */ /* Non-atomic map/unmap */
static inline void * static inline void __iomem *
io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset) io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
{ {
return ((char *) mapping) + offset; return ((char __force __iomem *) mapping) + offset;
} }
static inline void static inline void
io_mapping_unmap(void *vaddr) io_mapping_unmap(void __iomem *vaddr)
{ {
} }