diff options
author | Keith Owens <kaos@sgi.com> | 2006-07-17 15:41:59 +1000 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-08-02 16:03:44 -0700 |
commit | e037cda559547e6353c5a792802963572d0b750e (patch) | |
tree | 5e76f7706d30d725f4bc80dd9b460f8a5c2da005 /arch/ia64/mm | |
parent | 4f2ef124b274baac80f64e290aa44e87a7753933 (diff) | |
download | linux-e037cda559547e6353c5a792802963572d0b750e.tar.gz linux-e037cda559547e6353c5a792802963572d0b750e.tar.bz2 linux-e037cda559547e6353c5a792802963572d0b750e.zip |
[IA64] sparse cleanups
Fix some sparse warnings on ia64. Large constants that should be long
instead of int. Use NULL instead of 0. Add some missing __iomem
casts. Replace a non-C99 structure assignment.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r-- | arch/ia64/mm/ioremap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c index 07bd02b6c372..4280c074d64e 100644 --- a/arch/ia64/mm/ioremap.c +++ b/arch/ia64/mm/ioremap.c @@ -32,7 +32,7 @@ ioremap (unsigned long offset, unsigned long size) */ attr = kern_mem_attribute(offset, size); if (attr & EFI_MEMORY_WB) - return phys_to_virt(offset); + return (void __iomem *) phys_to_virt(offset); else if (attr & EFI_MEMORY_UC) return __ioremap(offset, size); @@ -43,7 +43,7 @@ ioremap (unsigned long offset, unsigned long size) gran_base = GRANULEROUNDDOWN(offset); gran_size = GRANULEROUNDUP(offset + size) - gran_base; if (efi_mem_attribute(gran_base, gran_size) & EFI_MEMORY_WB) - return phys_to_virt(offset); + return (void __iomem *) phys_to_virt(offset); return __ioremap(offset, size); } @@ -53,7 +53,7 @@ void __iomem * ioremap_nocache (unsigned long offset, unsigned long size) { if (kern_mem_attribute(offset, size) & EFI_MEMORY_WB) - return 0; + return NULL; return __ioremap(offset, size); } |