[PATCH 0/3] powerpc: whitespace cleanup, grammar corrections

[PATCH 0/3] powerpc: whitespace cleanup, grammar corrections

[Linas Vepstas]

These popped out at me while I was reading code.
Its all janitorial.

--linas

[PATCH 1/3] powerpc: prom_init whitespace cleanup, typo fix.

[Linas Vepstas]

Whitespace cleanup: badly indented lines.
Typo in comment.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>

----

 arch/powerpc/kernel/prom_init.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6.22-git2/arch/powerpc/kernel/prom_init.c
===================================================================
--- linux-2.6.22-git2.orig/arch/powerpc/kernel/prom_init.c	2007-07-08 18:32:17.000000000 -0500
+++ linux-2.6.22-git2/arch/powerpc/kernel/prom_init.c	2007-08-28 16:40:26.000000000 -0500
@@ -1197,7 +1197,7 @@ static void __init prom_initialize_tce_t
 		if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL))
 			continue;
 
-		/* Keep the old logic in tack to avoid regression. */
+		/* Keep the old logic intact to avoid regression. */
 		if (compatible[0] != 0) {
 			if ((strstr(compatible, RELOC("python")) == NULL) &&
 			    (strstr(compatible, RELOC("Speedwagon")) == NULL) &&
@@ -2224,7 +2224,7 @@ static void __init fixup_device_tree(voi
 
 static void __init prom_find_boot_cpu(void)
 {
-       	struct prom_t *_prom = &RELOC(prom);
+	struct prom_t *_prom = &RELOC(prom);
 	u32 getprop_rval;
 	ihandle prom_cpu;
 	phandle cpu_pkg;
@@ -2244,7 +2244,7 @@ static void __init prom_find_boot_cpu(vo
 static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
-       	struct prom_t *_prom = &RELOC(prom);
+	struct prom_t *_prom = &RELOC(prom);
 
 	if (r3 && r4 && r4 != 0xdeadbeef) {
 		unsigned long val;
@@ -2277,7 +2277,7 @@ unsigned long __init prom_init(unsigned 
 			       unsigned long pp,
 			       unsigned long r6, unsigned long r7)
 {	
-       	struct prom_t *_prom;
+	struct prom_t *_prom;
 	unsigned long hdr;
 	unsigned long offset = reloc_offset();
 
@@ -2336,8 +2336,8 @@ unsigned long __init prom_init(unsigned 
 	/*
 	 * Copy the CPU hold code
 	 */
-       	if (RELOC(of_platform) != PLATFORM_POWERMAC)
-       		copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
+	if (RELOC(of_platform) != PLATFORM_POWERMAC)
+		copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
 
 	/*
 	 * Do early parsing of command line

[PATCH 2/3] powerpc: prom whitespace cleanup

[Linas Vepstas]

Whitespace cleanup: badly indented lines.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>

----

 arch/powerpc/kernel/prom.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: linux-2.6.22-git2/arch/powerpc/kernel/prom.c
===================================================================
--- linux-2.6.22-git2.orig/arch/powerpc/kernel/prom.c	2007-08-29 14:14:12.000000000 -0500
+++ linux-2.6.22-git2/arch/powerpc/kernel/prom.c	2007-08-29 14:15:10.000000000 -0500
@@ -782,13 +782,13 @@ static int __init early_init_dt_scan_cho
 #endif
 
 #ifdef CONFIG_KEXEC
-       lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);
-       if (lprop)
-               crashk_res.start = *lprop;
-
-       lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-size", NULL);
-       if (lprop)
-               crashk_res.end = crashk_res.start + *lprop - 1;
+	lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);
+	if (lprop)
+		crashk_res.start = *lprop;
+
+	lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-size", NULL);
+	if (lprop)
+		crashk_res.end = crashk_res.start + *lprop - 1;
 #endif
 
 	early_init_dt_check_for_initrd(node);

[PATCH 3/3] powerpc: setup_64 comment cleanup.

[Linas Vepstas]

Gramatical corrections to comments.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>

----

 arch/powerpc/kernel/prom.c     |    8 +++++---
 arch/powerpc/kernel/setup_64.c |    6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

Index: linux-2.6.22-git2/arch/powerpc/kernel/setup_64.c
===================================================================
--- linux-2.6.22-git2.orig/arch/powerpc/kernel/setup_64.c	2007-09-04 17:29:36.000000000 -0500
+++ linux-2.6.22-git2/arch/powerpc/kernel/setup_64.c	2007-09-05 14:12:23.000000000 -0500
@@ -181,9 +181,9 @@ void __init early_setup(unsigned long dt
  	DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
 
 	/*
-	 * Do early initializations using the flattened device
-	 * tree, like retreiving the physical memory map or
-	 * calculating/retreiving the hash table size
+	 * Do early initialization using the flattened device
+	 * tree, such as retrieving the physical memory map or
+	 * calculating/retrieving the hash table size.
 	 */
 	early_init_devtree(__va(dt_ptr));
 
Index: linux-2.6.22-git2/arch/powerpc/kernel/prom.c
===================================================================
--- linux-2.6.22-git2.orig/arch/powerpc/kernel/prom.c	2007-09-05 14:23:06.000000000 -0500
+++ linux-2.6.22-git2/arch/powerpc/kernel/prom.c	2007-09-05 14:24:49.000000000 -0500
@@ -433,9 +433,11 @@ static int __init early_parse_mem(char *
 }
 early_param("mem", early_parse_mem);
 
-/*
- * The device tree may be allocated below our memory limit, or inside the
- * crash kernel region for kdump. If so, move it out now.
+/**
+ * move_device_tree - move tree to an unused area, if needed.
+ *
+ * The device tree may be allocated beyond our memory limit, or inside the
+ * crash kernel region for kdump. If so, move it out of the way.
  */
 static void move_device_tree(void)
 {

Re: [PATCH 3/3] powerpc: setup_64 comment cleanup.

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 2415 bytes --]

On Thu, 2007-09-06 at 12:47 -0500, Linas Vepstas wrote:
> Gramatical corrections to comments.
> 
> Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
> 
> ----
> 
>  arch/powerpc/kernel/prom.c     |    8 +++++---
>  arch/powerpc/kernel/setup_64.c |    6 +++---
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> Index: linux-2.6.22-git2/arch/powerpc/kernel/setup_64.c
> ===================================================================
> --- linux-2.6.22-git2.orig/arch/powerpc/kernel/setup_64.c	2007-09-04 17:29:36.000000000 -0500
> +++ linux-2.6.22-git2/arch/powerpc/kernel/setup_64.c	2007-09-05 14:12:23.000000000 -0500
> @@ -181,9 +181,9 @@ void __init early_setup(unsigned long dt
>   	DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
>  
>  	/*
> -	 * Do early initializations using the flattened device
> -	 * tree, like retreiving the physical memory map or
> -	 * calculating/retreiving the hash table size
> +	 * Do early initialization using the flattened device
> +	 * tree, such as retrieving the physical memory map or
> +	 * calculating/retrieving the hash table size.
>  	 */
>  	early_init_devtree(__va(dt_ptr));

That's a little pedantic ..

> Index: linux-2.6.22-git2/arch/powerpc/kernel/prom.c
> ===================================================================
> --- linux-2.6.22-git2.orig/arch/powerpc/kernel/prom.c	2007-09-05 14:23:06.000000000 -0500
> +++ linux-2.6.22-git2/arch/powerpc/kernel/prom.c	2007-09-05 14:24:49.000000000 -0500
> @@ -433,9 +433,11 @@ static int __init early_parse_mem(char *
>  }
>  early_param("mem", early_parse_mem);
>  
> -/*
> - * The device tree may be allocated below our memory limit, or inside the
> - * crash kernel region for kdump. If so, move it out now.
> +/**
> + * move_device_tree - move tree to an unused area, if needed.
> + *
> + * The device tree may be allocated beyond our memory limit, or inside the
> + * crash kernel region for kdump. If so, move it out of the way.
>   */
>  static void move_device_tree(void)

.. but that looks good. Although it's a semantic change, not just
grammatical as your changelog says.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]