15 files changed, 27 insertions, 27 deletions

diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 79a00bb9c64c..d09d1c615150 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -359,7 +359,7 @@ static void parse_system_parameter_string(struct seq_file *m)
 
         unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
         if (!local_buffer) {
-                printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
+                printk(KERN_ERR "%s %s kmalloc failure at line %d\n",
                        __FILE__, __func__, __LINE__);
                 return;
         }
@@ -383,13 +383,13 @@ static void parse_system_parameter_string(struct seq_file *m)
                 int idx, w_idx;
                 char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
                 if (!workbuffer) {
-                        printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
+                        printk(KERN_ERR "%s %s kmalloc failure at line %d\n",
                                __FILE__, __func__, __LINE__);
                         kfree(local_buffer);
                         return;
                 }
 #ifdef LPARCFG_DEBUG
-                printk(KERN_INFO "success calling get-system-parameter \n");
+                printk(KERN_INFO "success calling get-system-parameter\n");
 #endif
                 splpar_strlen = local_buffer[0] * 256 + local_buffer[1];
                 local_buffer += 2;      /* step over strlen value */
@@ -440,7 +440,7 @@ static int lparcfg_count_active_processors(void)
 
         while ((cpus_dn = of_find_node_by_type(cpus_dn, "cpu"))) {
 #ifdef LPARCFG_DEBUG
-                printk(KERN_ERR "cpus_dn %p \n", cpus_dn);
+                printk(KERN_ERR "cpus_dn %p\n", cpus_dn);
 #endif
                 count++;
         }
@@ -725,7 +725,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
         const unsigned int *lp_index_ptr;
         unsigned int lp_index = 0;
 
-        seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);
+        seq_printf(m, "%s %s\n", MODULE_NAME, MODULE_VERS);
 
         rootdn = of_find_node_by_path("/");
         if (rootdn) {
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 4aa17401657b..cd11d5ca80df 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -304,7 +304,7 @@ static void __devinit __of_scan_bus(struct device_node *node,
         int reglen, devfn;
         struct pci_dev *dev;
 
-        pr_debug("of_scan_bus(%s) bus no %d... \n",
+        pr_debug("of_scan_bus(%s) bus no %d...\n",
                  node->full_name, bus->number);
 
         /* Scan direct children */
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index f559918f3c6f..bc33d1859ae7 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -134,7 +134,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
         pvid = mfspr(SPRN_PVR);
         svid = mfspr(SPRN_SVR);
 
-        seq_printf(m, "Vendor\t\t: RPC Electronics STx \n");
+        seq_printf(m, "Vendor\t\t: RPC Electronics STx\n");
         seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index 91f4c6cd4b99..06763682db47 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -85,7 +85,7 @@ static int proc_titantod_show(struct seq_file *m, void *v)
 
                 seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);
                 seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);
-                seq_printf(m, "  titan jiffies = %lu.%04lu \n", titan_jiffies,
+                seq_printf(m, "  titan jiffies = %lu.%04lu\n", titan_jiffies,
                            titan_jiff_rem_usec);
                 seq_printf(m, "  tb jiffies    = %lu.%04lu\n", tb_jiffies,
                            tb_jiff_rem_usec);
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index a6cd3394feaa..b0863410517f 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -256,7 +256,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
                 mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array,
                                 max_entries);
 
-        printk("Mainstore_VPD: numMemoryBlocks = %ld \n", mem_blocks);
+        printk("Mainstore_VPD: numMemoryBlocks = %ld\n", mem_blocks);
         for (i = 0; i < mem_blocks; ++i) {
                 printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n"
                        "                             abs chunks %016lx - %016lx\n",
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index 9dd789a7370d..84d7fd9bcc69 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -539,7 +539,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
                 if (model
                     && (strcmp(model, "iMac,1") == 0
                         || strcmp(model, "PowerMac1,1") == 0)) {
-                        bootx_printf("iMac,1 detected, shutting down USB \n");
+                        bootx_printf("iMac,1 detected, shutting down USB\n");
                         out_le32((unsigned __iomem *)0x80880008, 1);    /* XXX */
                 }
         }
@@ -554,7 +554,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
         } else
                 space = bi->totalParamsSize;
 
-        bootx_printf("Total space used by parameters & ramdisk: 0x%x \n", space);
+        bootx_printf("Total space used by parameters & ramdisk: 0x%x\n", space);
 
         /* New BootX will have flushed all TLBs and enters kernel with
          * MMU switched OFF, so this should not be useful anymore.
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index ef8e45448480..0c252c3a5f9f 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -478,9 +478,9 @@ excess_failures:
          * due to actual, failed cards.
          */
         printk(KERN_ERR
-           "EEH: PCI device at location=%s driver=%s pci addr=%s \n"
+           "EEH: PCI device at location=%s driver=%s pci addr=%s\n"
                 "has failed %d times in the last hour "
-                "and has been permanently disabled. \n"
+                "and has been permanently disabled.\n"
                 "Please try reseating this device or replacing it.\n",
                 location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
         goto perm_error;
@@ -488,7 +488,7 @@ excess_failures:
 hard_fail:
         printk(KERN_ERR
            "EEH: Unable to recover from failure of PCI device "
-           "at location=%s driver=%s pci addr=%s \n"
+           "at location=%s driver=%s pci addr=%s\n"
            "Please try reseating this device or replacing it.\n",
                 location, drv_str, pci_str);