Commit e037cda559547e6353c5a792802963572d0b750e
Committed by
Tony Luck
Tony Luck
1 parent
4f2ef124b2
Exists in
master
and in
7 other branches
[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>
Showing 6 changed files with 13 additions and 13 deletions Side-by-side Diff
arch/ia64/kernel/efi.c
| ... | ... | @@ -632,7 +632,7 @@ |
| 632 | 632 | if (phys_addr - md->start < (md->num_pages << EFI_PAGE_SHIFT)) |
| 633 | 633 | return md; |
| 634 | 634 | } |
| 635 | - return 0; | |
| 635 | + return NULL; | |
| 636 | 636 | } |
| 637 | 637 | |
| 638 | 638 | static efi_memory_desc_t * |
| ... | ... | @@ -652,7 +652,7 @@ |
| 652 | 652 | if (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT)) |
| 653 | 653 | return md; |
| 654 | 654 | } |
| 655 | - return 0; | |
| 655 | + return NULL; | |
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | u32 |
| ... | ... | @@ -923,7 +923,7 @@ |
| 923 | 923 | void |
| 924 | 924 | efi_memmap_init(unsigned long *s, unsigned long *e) |
| 925 | 925 | { |
| 926 | - struct kern_memdesc *k, *prev = 0; | |
| 926 | + struct kern_memdesc *k, *prev = NULL; | |
| 927 | 927 | u64 contig_low=0, contig_high=0; |
| 928 | 928 | u64 as, ae, lim; |
| 929 | 929 | void *efi_map_start, *efi_map_end, *p, *q; |
arch/ia64/mm/ioremap.c
| ... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 | */ |
| 33 | 33 | attr = kern_mem_attribute(offset, size); |
| 34 | 34 | if (attr & EFI_MEMORY_WB) |
| 35 | - return phys_to_virt(offset); | |
| 35 | + return (void __iomem *) phys_to_virt(offset); | |
| 36 | 36 | else if (attr & EFI_MEMORY_UC) |
| 37 | 37 | return __ioremap(offset, size); |
| 38 | 38 | |
| ... | ... | @@ -43,7 +43,7 @@ |
| 43 | 43 | gran_base = GRANULEROUNDDOWN(offset); |
| 44 | 44 | gran_size = GRANULEROUNDUP(offset + size) - gran_base; |
| 45 | 45 | if (efi_mem_attribute(gran_base, gran_size) & EFI_MEMORY_WB) |
| 46 | - return phys_to_virt(offset); | |
| 46 | + return (void __iomem *) phys_to_virt(offset); | |
| 47 | 47 | |
| 48 | 48 | return __ioremap(offset, size); |
| 49 | 49 | } |
| ... | ... | @@ -53,7 +53,7 @@ |
| 53 | 53 | ioremap_nocache (unsigned long offset, unsigned long size) |
| 54 | 54 | { |
| 55 | 55 | if (kern_mem_attribute(offset, size) & EFI_MEMORY_WB) |
| 56 | - return 0; | |
| 56 | + return NULL; | |
| 57 | 57 | |
| 58 | 58 | return __ioremap(offset, size); |
| 59 | 59 | } |
arch/ia64/sn/kernel/xpc_main.c
| ... | ... | @@ -480,7 +480,7 @@ |
| 480 | 480 | partid_t partid = (u64) __partid; |
| 481 | 481 | struct xpc_partition *part = &xpc_partitions[partid]; |
| 482 | 482 | unsigned long irq_flags; |
| 483 | - struct sched_param param = { sched_priority: MAX_RT_PRIO - 1 }; | |
| 483 | + struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 }; | |
| 484 | 484 | int ret; |
| 485 | 485 | |
| 486 | 486 |
arch/ia64/sn/pci/tioce_provider.c
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | else |
| 75 | 75 | mmr_war_offset = 0x158; |
| 76 | 76 | |
| 77 | - readq_relaxed((void *)(mmr_base + mmr_war_offset)); | |
| 77 | + readq_relaxed((void __iomem *)(mmr_base + mmr_war_offset)); | |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| ... | ... | @@ -92,8 +92,8 @@ |
| 92 | 92 | |
| 93 | 93 | if (mmr_offset < 0x45000) { |
| 94 | 94 | if (mmr_offset == 0x100) |
| 95 | - readq_relaxed((void *)(mmr_base + 0x38)); | |
| 96 | - readq_relaxed((void *)(mmr_base + 0xb050)); | |
| 95 | + readq_relaxed((void __iomem *)(mmr_base + 0x38)); | |
| 96 | + readq_relaxed((void __iomem *)(mmr_base + 0xb050)); | |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 |
include/asm-ia64/sn/xpc.h
| ... | ... | @@ -1124,8 +1124,8 @@ |
| 1124 | 1124 | #define XPC_GET_IPI_FLAGS(_amo, _c) ((u8) (((_amo) >> ((_c) * 8)) & 0xff)) |
| 1125 | 1125 | #define XPC_SET_IPI_FLAGS(_amo, _c, _f) (_amo) |= ((u64) (_f) << ((_c) * 8)) |
| 1126 | 1126 | |
| 1127 | -#define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & 0x0f0f0f0f0f0f0f0f) | |
| 1128 | -#define XPC_ANY_MSG_IPI_FLAGS_SET(_amo) ((_amo) & 0x1010101010101010) | |
| 1127 | +#define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x0f0f0f0f0f0f0f0f)) | |
| 1128 | +#define XPC_ANY_MSG_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x1010101010101010)) | |
| 1129 | 1129 | |
| 1130 | 1130 | |
| 1131 | 1131 | static inline void |
include/asm-ia64/system.h
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | * 0xa000000000000000+2*PERCPU_PAGE_SIZE |
| 25 | 25 | * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page) |
| 26 | 26 | */ |
| 27 | -#define KERNEL_START (GATE_ADDR+0x100000000) | |
| 27 | +#define KERNEL_START (GATE_ADDR+__IA64_UL_CONST(0x100000000)) | |
| 28 | 28 | #define PERCPU_ADDR (-PERCPU_PAGE_SIZE) |
| 29 | 29 | |
| 30 | 30 | #ifndef __ASSEMBLY__ |