[PATCH] ppc64: Remove redundant use of pointers in lmb code

The lmb code is all written to use a pointer to an lmb struct. But it's always the same lmb struct, called "lmb". So we take the address of lmb, call it _lmb and then start using _lmb->foo everywhere, which is silly. This patch removes the _lmb pointers and replaces them with direct references to the one "lmb" struct. We do the same for some _mem and _rsv pointers which point to lmb.memory and lmb.reserved respectively. This patch looks quite busy, but it's basically just: s/_lmb->/lmb./g s/_mem->/lmb.memory./g s/_rsv->/lmb.reserved./g s/_rsv/&lmb.reserved/g s/mem->/lmb.memory./g Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] ppc64: Remove redundant use of pointers in lmb code
The lmb code is all written to use a pointer to an lmb struct. But it's always the same lmb struct, called "lmb". So we take the address of lmb, call it _lmb and then start using _lmb->foo everywhere, which is silly. This patch removes the _lmb pointers and replaces them with direct references to the one "lmb" struct. We do the same for some _mem and _rsv pointers which point to lmb.memory and lmb.reserved respectively. This patch looks quite busy, but it's basically just: s/_lmb->/lmb./g s/_mem->/lmb.memory./g s/_rsv->/lmb.reserved./g s/_rsv/&lmb.reserved/g s/mem->/lmb.memory./g Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Michael Ellerman · Paul Mackerras
1 parent aefd16b0c5
Showing 1 changed file with 43 additions and 57 deletions Side-by-side Diff
arch/ppc64/kernel/lmb.c
@@ -28,33 +28,32 @@
 {
 #ifdef DEBUG
 	unsigned long i;
-	struct lmb *_lmb  = &lmb;
  
 	udbg_printf("lmb_dump_all:\n");
 	udbg_printf("    memory.cnt		  = 0x%lx\n",
-		    _lmb->memory.cnt);
+		    lmb.memory.cnt);
 	udbg_printf("    memory.size		  = 0x%lx\n",
-		    _lmb->memory.size);
-	for (i=0; i < _lmb->memory.cnt ;i++) {
+		    lmb.memory.size);
+	for (i=0; i < lmb.memory.cnt ;i++) {
 		udbg_printf("    memory.region[0x%x].base       = 0x%lx\n",
-			    i, _lmb->memory.region[i].base);
+			    i, lmb.memory.region[i].base);
 		udbg_printf("		      .physbase = 0x%lx\n",
-			    _lmb->memory.region[i].physbase);
+			    lmb.memory.region[i].physbase);
 		udbg_printf("		      .size     = 0x%lx\n",
-			    _lmb->memory.region[i].size);
+			    lmb.memory.region[i].size);
 	}
  
 	udbg_printf("\n    reserved.cnt	  = 0x%lx\n",
-		    _lmb->reserved.cnt);
+		    lmb.reserved.cnt);
 	udbg_printf("    reserved.size	  = 0x%lx\n",
-		    _lmb->reserved.size);
-	for (i=0; i < _lmb->reserved.cnt ;i++) {
+		    lmb.reserved.size);
+	for (i=0; i < lmb.reserved.cnt ;i++) {
 		udbg_printf("    reserved.region[0x%x].base       = 0x%lx\n",
-			    i, _lmb->reserved.region[i].base);
+			    i, lmb.reserved.region[i].base);
 		udbg_printf("		      .physbase = 0x%lx\n",
-			    _lmb->reserved.region[i].physbase);
+			    lmb.reserved.region[i].physbase);
 		udbg_printf("		      .size     = 0x%lx\n",
-			    _lmb->reserved.region[i].size);
+			    lmb.reserved.region[i].size);
 	}
 #endif /* DEBUG */
 }
  
  
@@ -108,19 +107,17 @@
 void __init
 lmb_init(void)
 {
-	struct lmb *_lmb = &lmb;
-
 	/* Create a dummy zero size LMB which will get coalesced away later.
 	 * This simplifies the lmb_add() code below...
 	 */
-	_lmb->memory.region[0].base = 0;
-	_lmb->memory.region[0].size = 0;
-	_lmb->memory.cnt = 1;
+	lmb.memory.region[0].base = 0;
+	lmb.memory.region[0].size = 0;
+	lmb.memory.cnt = 1;
  
 	/* Ditto. */
-	_lmb->reserved.region[0].base = 0;
-	_lmb->reserved.region[0].size = 0;
-	_lmb->reserved.cnt = 1;
+	lmb.reserved.region[0].base = 0;
+	lmb.reserved.region[0].size = 0;
+	lmb.reserved.cnt = 1;
 }
  
 /* This routine called with relocation disabled. */
  
  
  
  
  
@@ -130,27 +127,26 @@
 	unsigned long i;
 	unsigned long mem_size = 0;
 	unsigned long size_mask = 0;
-	struct lmb *_lmb = &lmb;
 #ifdef CONFIG_MSCHUNKS
 	unsigned long physbase = 0;
 #endif
  
-	for (i=0; i < _lmb->memory.cnt; i++) {
+	for (i=0; i < lmb.memory.cnt; i++) {
 		unsigned long lmb_size;
  
-		lmb_size = _lmb->memory.region[i].size;
+		lmb_size = lmb.memory.region[i].size;
  
 #ifdef CONFIG_MSCHUNKS
-		_lmb->memory.region[i].physbase = physbase;
+		lmb.memory.region[i].physbase = physbase;
 		physbase += lmb_size;
 #else
-		_lmb->memory.region[i].physbase = _lmb->memory.region[i].base;
+		lmb.memory.region[i].physbase = lmb.memory.region[i].base;
 #endif
 		mem_size += lmb_size;
 		size_mask |= lmb_size;
 	}
  
-	_lmb->memory.size = mem_size;
+	lmb.memory.size = mem_size;
 }
  
 /* This routine called with relocation disabled. */
  
@@ -213,12 +209,11 @@
 long __init
 lmb_add(unsigned long base, unsigned long size)
 {
-	struct lmb *_lmb = &lmb;
-	struct lmb_region *_rgn = &(_lmb->memory);
+	struct lmb_region *_rgn = &(lmb.memory);
  
 	/* On pSeries LPAR systems, the first LMB is our RMO region. */
 	if ( base == 0 )
-		_lmb->rmo_size = size;
+		lmb.rmo_size = size;
  
 	return lmb_add_region(_rgn, base, size);
  
@@ -227,8 +222,7 @@
 long __init
 lmb_reserve(unsigned long base, unsigned long size)
 {
-	struct lmb *_lmb = &lmb;
-	struct lmb_region *_rgn = &(_lmb->reserved);
+	struct lmb_region *_rgn = &(lmb.reserved);
  
 	return lmb_add_region(_rgn, base, size);
 }
  
@@ -260,13 +254,10 @@
 {
 	long i, j;
 	unsigned long base = 0;
-	struct lmb *_lmb = &lmb;
-	struct lmb_region *_mem = &(_lmb->memory);
-	struct lmb_region *_rsv = &(_lmb->reserved);
  
-	for (i=_mem->cnt-1; i >= 0; i--) {
-		unsigned long lmbbase = _mem->region[i].base;
-		unsigned long lmbsize = _mem->region[i].size;
+	for (i=lmb.memory.cnt-1; i >= 0; i--) {
+		unsigned long lmbbase = lmb.memory.region[i].base;
+		unsigned long lmbsize = lmb.memory.region[i].size;
  
 		if ( max_addr == LMB_ALLOC_ANYWHERE )
 			base = _ALIGN_DOWN(lmbbase+lmbsize-size, align);
@@ -276,8 +267,8 @@
 			continue;
  
 		while ( (lmbbase <= base) &&
-			((j = lmb_overlaps_region(_rsv,base,size)) >= 0) ) {
-			base = _ALIGN_DOWN(_rsv->region[j].base-size, align);
+			((j = lmb_overlaps_region(&lmb.reserved,base,size)) >= 0) ) {
+			base = _ALIGN_DOWN(lmb.reserved.region[j].base-size, align);
 		}
  
 		if ( (base != 0) && (lmbbase <= base) )
@@ -287,7 +278,7 @@
 	if ( i < 0 )
 		return 0;
  
-	lmb_add_region(_rsv, base, size);
+	lmb_add_region(&lmb.reserved, base, size);
  
 	return base;
 }
  
  
  
@@ -295,17 +286,15 @@
 unsigned long __init
 lmb_phys_mem_size(void)
 {
-	struct lmb *_lmb = &lmb;
 #ifdef CONFIG_MSCHUNKS
-	return _lmb->memory.size;
+	return lmb.memory.size;
 #else
-	struct lmb_region *_mem = &(_lmb->memory);
 	unsigned long total = 0;
 	int i;
  
 	/* add all physical memory to the bootmem map */
-	for (i=0; i < _mem->cnt; i++)
-		total += _mem->region[i].size;
+	for (i=0; i < lmb.memory.cnt; i++)
+		total += lmb.memory.region[i].size;
 	return total;
 #endif /* CONFIG_MSCHUNKS */
 }
  
  
@@ -313,14 +302,12 @@
 unsigned long __init
 lmb_end_of_DRAM(void)
 {
-	struct lmb *_lmb = &lmb;
-	struct lmb_region *_mem = &(_lmb->memory);
-	int idx = _mem->cnt - 1;
+	int idx = lmb.memory.cnt - 1;
  
 #ifdef CONFIG_MSCHUNKS
-	return (_mem->region[idx].physbase + _mem->region[idx].size);
+	return (lmb.memory.region[idx].physbase + lmb.memory.region[idx].size);
 #else
-	return (_mem->region[idx].base + _mem->region[idx].size);
+	return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
 #endif /* CONFIG_MSCHUNKS */
  
 	return 0;
  
  
@@ -353,20 +340,19 @@
 {
 	extern unsigned long memory_limit;
 	unsigned long i, limit;
-	struct lmb_region *mem = &(lmb.memory);
  
 	if (! memory_limit)
 		return;
  
 	limit = memory_limit;
-	for (i = 0; i < mem->cnt; i++) {
-		if (limit > mem->region[i].size) {
-			limit -= mem->region[i].size;
+	for (i = 0; i < lmb.memory.cnt; i++) {
+		if (limit > lmb.memory.region[i].size) {
+			limit -= lmb.memory.region[i].size;
 			continue;
 		}
  
-		mem->region[i].size = limit;
-		mem->cnt = i + 1;
+		lmb.memory.region[i].size = limit;
+		lmb.memory.cnt = i + 1;
 		break;
 	}
 }
...	...	@@ -28,33 +28,32 @@
28	28	{
29	29	#ifdef DEBUG
30	30	unsigned long i;
31		- struct lmb *_lmb = &lmb;
32	31
33	32	udbg_printf("lmb_dump_all:\n");
34	33	udbg_printf(" memory.cnt = 0x%lx\n",
35		- _lmb->memory.cnt);
	34	+ lmb.memory.cnt);
36	35	udbg_printf(" memory.size = 0x%lx\n",
37		- _lmb->memory.size);
38		- for (i=0; i < _lmb->memory.cnt ;i++) {
	36	+ lmb.memory.size);
	37	+ for (i=0; i < lmb.memory.cnt ;i++) {
39	38	udbg_printf(" memory.region[0x%x].base = 0x%lx\n",
40		- i, _lmb->memory.region[i].base);
	39	+ i, lmb.memory.region[i].base);
41	40	udbg_printf(" .physbase = 0x%lx\n",
42		- _lmb->memory.region[i].physbase);
	41	+ lmb.memory.region[i].physbase);
43	42	udbg_printf(" .size = 0x%lx\n",
44		- _lmb->memory.region[i].size);
	43	+ lmb.memory.region[i].size);
45	44	}
46	45
47	46	udbg_printf("\n reserved.cnt = 0x%lx\n",
48		- _lmb->reserved.cnt);
	47	+ lmb.reserved.cnt);
49	48	udbg_printf(" reserved.size = 0x%lx\n",
50		- _lmb->reserved.size);
51		- for (i=0; i < _lmb->reserved.cnt ;i++) {
	49	+ lmb.reserved.size);
	50	+ for (i=0; i < lmb.reserved.cnt ;i++) {
52	51	udbg_printf(" reserved.region[0x%x].base = 0x%lx\n",
53		- i, _lmb->reserved.region[i].base);
	52	+ i, lmb.reserved.region[i].base);
54	53	udbg_printf(" .physbase = 0x%lx\n",
55		- _lmb->reserved.region[i].physbase);
	54	+ lmb.reserved.region[i].physbase);
56	55	udbg_printf(" .size = 0x%lx\n",
57		- _lmb->reserved.region[i].size);
	56	+ lmb.reserved.region[i].size);
58	57	}
59	58	#endif /* DEBUG */
60	59	}
61	60
62	61
...	...	@@ -108,19 +107,17 @@
108	107	void __init
109	108	lmb_init(void)
110	109	{
111		- struct lmb *_lmb = &lmb;
112		-
113	110	/* Create a dummy zero size LMB which will get coalesced away later.
114	111	* This simplifies the lmb_add() code below...
115	112	*/
116		- _lmb->memory.region[0].base = 0;
117		- _lmb->memory.region[0].size = 0;
118		- _lmb->memory.cnt = 1;
	113	+ lmb.memory.region[0].base = 0;
	114	+ lmb.memory.region[0].size = 0;
	115	+ lmb.memory.cnt = 1;
119	116
120	117	/* Ditto. */
121		- _lmb->reserved.region[0].base = 0;
122		- _lmb->reserved.region[0].size = 0;
123		- _lmb->reserved.cnt = 1;
	118	+ lmb.reserved.region[0].base = 0;
	119	+ lmb.reserved.region[0].size = 0;
	120	+ lmb.reserved.cnt = 1;
124	121	}
125	122
126	123	/* This routine called with relocation disabled. */
127	124
128	125
129	126
130	127
131	128
...	...	@@ -130,27 +127,26 @@
130	127	unsigned long i;
131	128	unsigned long mem_size = 0;
132	129	unsigned long size_mask = 0;
133		- struct lmb *_lmb = &lmb;
134	130	#ifdef CONFIG_MSCHUNKS
135	131	unsigned long physbase = 0;
136	132	#endif
137	133
138		- for (i=0; i < _lmb->memory.cnt; i++) {
	134	+ for (i=0; i < lmb.memory.cnt; i++) {
139	135	unsigned long lmb_size;
140	136
141		- lmb_size = _lmb->memory.region[i].size;
	137	+ lmb_size = lmb.memory.region[i].size;
142	138
143	139	#ifdef CONFIG_MSCHUNKS
144		- _lmb->memory.region[i].physbase = physbase;
	140	+ lmb.memory.region[i].physbase = physbase;
145	141	physbase += lmb_size;
146	142	#else
147		- _lmb->memory.region[i].physbase = _lmb->memory.region[i].base;
	143	+ lmb.memory.region[i].physbase = lmb.memory.region[i].base;
148	144	#endif
149	145	mem_size += lmb_size;
150	146	size_mask \|= lmb_size;
151	147	}
152	148
153		- _lmb->memory.size = mem_size;
	149	+ lmb.memory.size = mem_size;
154	150	}
155	151
156	152	/* This routine called with relocation disabled. */
157	153
...	...	@@ -213,12 +209,11 @@
213	209	long __init
214	210	lmb_add(unsigned long base, unsigned long size)
215	211	{
216		- struct lmb *_lmb = &lmb;
217		- struct lmb_region *_rgn = &(_lmb->memory);
	212	+ struct lmb_region *_rgn = &(lmb.memory);
218	213
219	214	/* On pSeries LPAR systems, the first LMB is our RMO region. */
220	215	if ( base == 0 )
221		- _lmb->rmo_size = size;
	216	+ lmb.rmo_size = size;
222	217
223	218	return lmb_add_region(_rgn, base, size);
224	219
...	...	@@ -227,8 +222,7 @@
227	222	long __init
228	223	lmb_reserve(unsigned long base, unsigned long size)
229	224	{
230		- struct lmb *_lmb = &lmb;
231		- struct lmb_region *_rgn = &(_lmb->reserved);
	225	+ struct lmb_region *_rgn = &(lmb.reserved);
232	226
233	227	return lmb_add_region(_rgn, base, size);
234	228	}
235	229
...	...	@@ -260,13 +254,10 @@
260	254	{
261	255	long i, j;
262	256	unsigned long base = 0;
263		- struct lmb *_lmb = &lmb;
264		- struct lmb_region *_mem = &(_lmb->memory);
265		- struct lmb_region *_rsv = &(_lmb->reserved);
266	257
267		- for (i=_mem->cnt-1; i >= 0; i--) {
268		- unsigned long lmbbase = _mem->region[i].base;
269		- unsigned long lmbsize = _mem->region[i].size;
	258	+ for (i=lmb.memory.cnt-1; i >= 0; i--) {
	259	+ unsigned long lmbbase = lmb.memory.region[i].base;
	260	+ unsigned long lmbsize = lmb.memory.region[i].size;
270	261
271	262	if ( max_addr == LMB_ALLOC_ANYWHERE )
272	263	base = _ALIGN_DOWN(lmbbase+lmbsize-size, align);
...	...	@@ -276,8 +267,8 @@
276	267	continue;
277	268
278	269	while ( (lmbbase <= base) &&
279		- ((j = lmb_overlaps_region(_rsv,base,size)) >= 0) ) {
280		- base = _ALIGN_DOWN(_rsv->region[j].base-size, align);
	270	+ ((j = lmb_overlaps_region(&lmb.reserved,base,size)) >= 0) ) {
	271	+ base = _ALIGN_DOWN(lmb.reserved.region[j].base-size, align);
281	272	}
282	273
283	274	if ( (base != 0) && (lmbbase <= base) )
...	...	@@ -287,7 +278,7 @@
287	278	if ( i < 0 )
288	279	return 0;
289	280
290		- lmb_add_region(_rsv, base, size);
	281	+ lmb_add_region(&lmb.reserved, base, size);
291	282
292	283	return base;
293	284	}
294	285
295	286
296	287
...	...	@@ -295,17 +286,15 @@
295	286	unsigned long __init
296	287	lmb_phys_mem_size(void)
297	288	{
298		- struct lmb *_lmb = &lmb;
299	289	#ifdef CONFIG_MSCHUNKS
300		- return _lmb->memory.size;
	290	+ return lmb.memory.size;
301	291	#else
302		- struct lmb_region *_mem = &(_lmb->memory);
303	292	unsigned long total = 0;
304	293	int i;
305	294
306	295	/* add all physical memory to the bootmem map */
307		- for (i=0; i < _mem->cnt; i++)
308		- total += _mem->region[i].size;
	296	+ for (i=0; i < lmb.memory.cnt; i++)
	297	+ total += lmb.memory.region[i].size;
309	298	return total;
310	299	#endif /* CONFIG_MSCHUNKS */
311	300	}
312	301
313	302
...	...	@@ -313,14 +302,12 @@
313	302	unsigned long __init
314	303	lmb_end_of_DRAM(void)
315	304	{
316		- struct lmb *_lmb = &lmb;
317		- struct lmb_region *_mem = &(_lmb->memory);
318		- int idx = _mem->cnt - 1;
	305	+ int idx = lmb.memory.cnt - 1;
319	306
320	307	#ifdef CONFIG_MSCHUNKS
321		- return (_mem->region[idx].physbase + _mem->region[idx].size);
	308	+ return (lmb.memory.region[idx].physbase + lmb.memory.region[idx].size);
322	309	#else
323		- return (_mem->region[idx].base + _mem->region[idx].size);
	310	+ return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
324	311	#endif /* CONFIG_MSCHUNKS */
325	312
326	313	return 0;
327	314
328	315
...	...	@@ -353,20 +340,19 @@
353	340	{
354	341	extern unsigned long memory_limit;
355	342	unsigned long i, limit;
356		- struct lmb_region *mem = &(lmb.memory);
357	343
358	344	if (! memory_limit)
359	345	return;
360	346
361	347	limit = memory_limit;
362		- for (i = 0; i < mem->cnt; i++) {
363		- if (limit > mem->region[i].size) {
364		- limit -= mem->region[i].size;
	348	+ for (i = 0; i < lmb.memory.cnt; i++) {
	349	+ if (limit > lmb.memory.region[i].size) {
	350	+ limit -= lmb.memory.region[i].size;
365	351	continue;
366	352	}
367	353
368		- mem->region[i].size = limit;
369		- mem->cnt = i + 1;
	354	+ lmb.memory.region[i].size = limit;
	355	+ lmb.memory.cnt = i + 1;
370	356	break;
371	357	}
372	358	}