diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-05-04 00:38:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:33:13 -0400 |
commit | 3c51f196b658fa1920c84b0752a55ed251d22d52 (patch) | |
tree | ee6aa61895bb185b20e7b7e6f106c1e0c8d8b979 /arch/sparc/prom/memory.c | |
parent | e6600d800fead3e895f16bf9b426578a6301af44 (diff) |
[PATCH] sparc NULL noise removal
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sparc/prom/memory.c')
-rw-r--r-- | arch/sparc/prom/memory.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c index 46aa51afec14..c20e5309f8aa 100644 --- a/arch/sparc/prom/memory.c +++ b/arch/sparc/prom/memory.c | |||
@@ -47,9 +47,9 @@ prom_sortmemlist(struct linux_mlist_v0 *thislist) | |||
47 | char *tmpaddr; | 47 | char *tmpaddr; |
48 | char *lowest; | 48 | char *lowest; |
49 | 49 | ||
50 | for(i=0; thislist[i].theres_more != 0; i++) { | 50 | for(i=0; thislist[i].theres_more; i++) { |
51 | lowest = thislist[i].start_adr; | 51 | lowest = thislist[i].start_adr; |
52 | for(mitr = i+1; thislist[mitr-1].theres_more != 0; mitr++) | 52 | for(mitr = i+1; thislist[mitr-1].theres_more; mitr++) |
53 | if(thislist[mitr].start_adr < lowest) { | 53 | if(thislist[mitr].start_adr < lowest) { |
54 | lowest = thislist[mitr].start_adr; | 54 | lowest = thislist[mitr].start_adr; |
55 | swapi = mitr; | 55 | swapi = mitr; |
@@ -85,7 +85,7 @@ void __init prom_meminit(void) | |||
85 | prom_phys_total[iter].num_bytes = mptr->num_bytes; | 85 | prom_phys_total[iter].num_bytes = mptr->num_bytes; |
86 | prom_phys_total[iter].theres_more = &prom_phys_total[iter+1]; | 86 | prom_phys_total[iter].theres_more = &prom_phys_total[iter+1]; |
87 | } | 87 | } |
88 | prom_phys_total[iter-1].theres_more = 0x0; | 88 | prom_phys_total[iter-1].theres_more = NULL; |
89 | /* Second, the total prom taken descriptors. */ | 89 | /* Second, the total prom taken descriptors. */ |
90 | for(mptr = (*(romvec->pv_v0mem.v0_prommap)), iter=0; | 90 | for(mptr = (*(romvec->pv_v0mem.v0_prommap)), iter=0; |
91 | mptr; mptr=mptr->theres_more, iter++) { | 91 | mptr; mptr=mptr->theres_more, iter++) { |
@@ -93,7 +93,7 @@ void __init prom_meminit(void) | |||
93 | prom_prom_taken[iter].num_bytes = mptr->num_bytes; | 93 | prom_prom_taken[iter].num_bytes = mptr->num_bytes; |
94 | prom_prom_taken[iter].theres_more = &prom_prom_taken[iter+1]; | 94 | prom_prom_taken[iter].theres_more = &prom_prom_taken[iter+1]; |
95 | } | 95 | } |
96 | prom_prom_taken[iter-1].theres_more = 0x0; | 96 | prom_prom_taken[iter-1].theres_more = NULL; |
97 | /* Last, the available physical descriptors. */ | 97 | /* Last, the available physical descriptors. */ |
98 | for(mptr = (*(romvec->pv_v0mem.v0_available)), iter=0; | 98 | for(mptr = (*(romvec->pv_v0mem.v0_available)), iter=0; |
99 | mptr; mptr=mptr->theres_more, iter++) { | 99 | mptr; mptr=mptr->theres_more, iter++) { |
@@ -101,7 +101,7 @@ void __init prom_meminit(void) | |||
101 | prom_phys_avail[iter].num_bytes = mptr->num_bytes; | 101 | prom_phys_avail[iter].num_bytes = mptr->num_bytes; |
102 | prom_phys_avail[iter].theres_more = &prom_phys_avail[iter+1]; | 102 | prom_phys_avail[iter].theres_more = &prom_phys_avail[iter+1]; |
103 | } | 103 | } |
104 | prom_phys_avail[iter-1].theres_more = 0x0; | 104 | prom_phys_avail[iter-1].theres_more = NULL; |
105 | /* Sort all the lists. */ | 105 | /* Sort all the lists. */ |
106 | prom_sortmemlist(prom_phys_total); | 106 | prom_sortmemlist(prom_phys_total); |
107 | prom_sortmemlist(prom_prom_taken); | 107 | prom_sortmemlist(prom_prom_taken); |
@@ -124,7 +124,7 @@ void __init prom_meminit(void) | |||
124 | prom_phys_avail[iter].theres_more = | 124 | prom_phys_avail[iter].theres_more = |
125 | &prom_phys_avail[iter+1]; | 125 | &prom_phys_avail[iter+1]; |
126 | } | 126 | } |
127 | prom_phys_avail[iter-1].theres_more = 0x0; | 127 | prom_phys_avail[iter-1].theres_more = NULL; |
128 | 128 | ||
129 | num_regs = prom_getproperty(node, "reg", | 129 | num_regs = prom_getproperty(node, "reg", |
130 | (char *) prom_reg_memlist, | 130 | (char *) prom_reg_memlist, |
@@ -138,7 +138,7 @@ void __init prom_meminit(void) | |||
138 | prom_phys_total[iter].theres_more = | 138 | prom_phys_total[iter].theres_more = |
139 | &prom_phys_total[iter+1]; | 139 | &prom_phys_total[iter+1]; |
140 | } | 140 | } |
141 | prom_phys_total[iter-1].theres_more = 0x0; | 141 | prom_phys_total[iter-1].theres_more = NULL; |
142 | 142 | ||
143 | node = prom_getchild(prom_root_node); | 143 | node = prom_getchild(prom_root_node); |
144 | node = prom_searchsiblings(node, "virtual-memory"); | 144 | node = prom_searchsiblings(node, "virtual-memory"); |
@@ -158,7 +158,7 @@ void __init prom_meminit(void) | |||
158 | prom_prom_taken[iter].theres_more = | 158 | prom_prom_taken[iter].theres_more = |
159 | &prom_prom_taken[iter+1]; | 159 | &prom_prom_taken[iter+1]; |
160 | } | 160 | } |
161 | prom_prom_taken[iter-1].theres_more = 0x0; | 161 | prom_prom_taken[iter-1].theres_more = NULL; |
162 | 162 | ||
163 | prom_sortmemlist(prom_prom_taken); | 163 | prom_sortmemlist(prom_prom_taken); |
164 | 164 | ||
@@ -182,15 +182,15 @@ void __init prom_meminit(void) | |||
182 | case PROM_SUN4: | 182 | case PROM_SUN4: |
183 | #ifdef CONFIG_SUN4 | 183 | #ifdef CONFIG_SUN4 |
184 | /* how simple :) */ | 184 | /* how simple :) */ |
185 | prom_phys_total[0].start_adr = 0x0; | 185 | prom_phys_total[0].start_adr = NULL; |
186 | prom_phys_total[0].num_bytes = *(sun4_romvec->memorysize); | 186 | prom_phys_total[0].num_bytes = *(sun4_romvec->memorysize); |
187 | prom_phys_total[0].theres_more = 0x0; | 187 | prom_phys_total[0].theres_more = NULL; |
188 | prom_prom_taken[0].start_adr = 0x0; | 188 | prom_prom_taken[0].start_adr = NULL; |
189 | prom_prom_taken[0].num_bytes = 0x0; | 189 | prom_prom_taken[0].num_bytes = 0x0; |
190 | prom_prom_taken[0].theres_more = 0x0; | 190 | prom_prom_taken[0].theres_more = NULL; |
191 | prom_phys_avail[0].start_adr = 0x0; | 191 | prom_phys_avail[0].start_adr = NULL; |
192 | prom_phys_avail[0].num_bytes = *(sun4_romvec->memoryavail); | 192 | prom_phys_avail[0].num_bytes = *(sun4_romvec->memoryavail); |
193 | prom_phys_avail[0].theres_more = 0x0; | 193 | prom_phys_avail[0].theres_more = NULL; |
194 | #endif | 194 | #endif |
195 | break; | 195 | break; |
196 | 196 | ||