diff options
author | Matthew Wilcox <matthew@wil.cx> | 2006-11-05 17:24:48 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:34:34 -0500 |
commit | e51ec241784f516ad3a916a24ac936364cd10d63 (patch) | |
tree | 0eec46bdea7f7f642e995cd26c3625fdb0305d56 /arch/parisc/mm/ioremap.c | |
parent | c2c4798e04ef836b12f5df04e7d1a1710cb39301 (diff) |
[PARISC] more sparse fixes
0/NULL changes, __user annotations, __iomem annotations
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/mm/ioremap.c')
-rw-r--r-- | arch/parisc/mm/ioremap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 47a1d2ac9419..6c6102307c06 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c | |||
@@ -128,7 +128,7 @@ remap_area_pages(unsigned long address, unsigned long phys_addr, | |||
128 | */ | 128 | */ |
129 | void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) | 129 | void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) |
130 | { | 130 | { |
131 | void *addr; | 131 | void __iomem *addr; |
132 | struct vm_struct *area; | 132 | struct vm_struct *area; |
133 | unsigned long offset, last_addr; | 133 | unsigned long offset, last_addr; |
134 | 134 | ||
@@ -178,13 +178,13 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l | |||
178 | if (!area) | 178 | if (!area) |
179 | return NULL; | 179 | return NULL; |
180 | 180 | ||
181 | addr = area->addr; | 181 | addr = (void __iomem *) area->addr; |
182 | if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) { | 182 | if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) { |
183 | vfree(addr); | 183 | vfree(addr); |
184 | return NULL; | 184 | return NULL; |
185 | } | 185 | } |
186 | 186 | ||
187 | return (void __iomem *) (offset + (char *)addr); | 187 | return (void __iomem *) (offset + (char __iomem *)addr); |
188 | } | 188 | } |
189 | EXPORT_SYMBOL(__ioremap); | 189 | EXPORT_SYMBOL(__ioremap); |
190 | 190 | ||