diff options
author | Frans Pop <elendil@planet.nl> | 2010-02-06 02:47:20 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-08 21:56:23 -0500 |
commit | 8354be9c104db8e92bb079e29540fbafb7f09b5c (patch) | |
tree | 98853948a0d3f19c89c8b014430a04ae9791aea2 /arch/powerpc/platforms | |
parent | 0b9612c210f6bf6efb32ab84b8f34018eaacb08d (diff) |
powerpc: Remove trailing space in messages
Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: linuxppc-dev@ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/85xx/stx_gp3.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/proc.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/bootx_init.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/eeh_driver.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/pci_dlpar.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/phyp_dump.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 2 |
8 files changed, 13 insertions, 13 deletions
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) | |||
134 | pvid = mfspr(SPRN_PVR); | 134 | pvid = mfspr(SPRN_PVR); |
135 | svid = mfspr(SPRN_SVR); | 135 | svid = mfspr(SPRN_SVR); |
136 | 136 | ||
137 | seq_printf(m, "Vendor\t\t: RPC Electronics STx \n"); | 137 | seq_printf(m, "Vendor\t\t: RPC Electronics STx\n"); |
138 | seq_printf(m, "PVR\t\t: 0x%x\n", pvid); | 138 | seq_printf(m, "PVR\t\t: 0x%x\n", pvid); |
139 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); | 139 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); |
140 | 140 | ||
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) | |||
85 | 85 | ||
86 | seq_printf(m, " titan elapsed = %lu uSec\n", titan_usec); | 86 | seq_printf(m, " titan elapsed = %lu uSec\n", titan_usec); |
87 | seq_printf(m, " tb elapsed = %lu ticks\n", tb_ticks); | 87 | seq_printf(m, " tb elapsed = %lu ticks\n", tb_ticks); |
88 | seq_printf(m, " titan jiffies = %lu.%04lu \n", titan_jiffies, | 88 | seq_printf(m, " titan jiffies = %lu.%04lu\n", titan_jiffies, |
89 | titan_jiff_rem_usec); | 89 | titan_jiff_rem_usec); |
90 | seq_printf(m, " tb jiffies = %lu.%04lu\n", tb_jiffies, | 90 | seq_printf(m, " tb jiffies = %lu.%04lu\n", tb_jiffies, |
91 | tb_jiff_rem_usec); | 91 | 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, | |||
256 | mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array, | 256 | mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array, |
257 | max_entries); | 257 | max_entries); |
258 | 258 | ||
259 | printk("Mainstore_VPD: numMemoryBlocks = %ld \n", mem_blocks); | 259 | printk("Mainstore_VPD: numMemoryBlocks = %ld\n", mem_blocks); |
260 | for (i = 0; i < mem_blocks; ++i) { | 260 | for (i = 0; i < mem_blocks; ++i) { |
261 | printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n" | 261 | printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n" |
262 | " abs chunks %016lx - %016lx\n", | 262 | " 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) | |||
539 | if (model | 539 | if (model |
540 | && (strcmp(model, "iMac,1") == 0 | 540 | && (strcmp(model, "iMac,1") == 0 |
541 | || strcmp(model, "PowerMac1,1") == 0)) { | 541 | || strcmp(model, "PowerMac1,1") == 0)) { |
542 | bootx_printf("iMac,1 detected, shutting down USB \n"); | 542 | bootx_printf("iMac,1 detected, shutting down USB\n"); |
543 | out_le32((unsigned __iomem *)0x80880008, 1); /* XXX */ | 543 | out_le32((unsigned __iomem *)0x80880008, 1); /* XXX */ |
544 | } | 544 | } |
545 | } | 545 | } |
@@ -554,7 +554,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4) | |||
554 | } else | 554 | } else |
555 | space = bi->totalParamsSize; | 555 | space = bi->totalParamsSize; |
556 | 556 | ||
557 | bootx_printf("Total space used by parameters & ramdisk: 0x%x \n", space); | 557 | bootx_printf("Total space used by parameters & ramdisk: 0x%x\n", space); |
558 | 558 | ||
559 | /* New BootX will have flushed all TLBs and enters kernel with | 559 | /* New BootX will have flushed all TLBs and enters kernel with |
560 | * MMU switched OFF, so this should not be useful anymore. | 560 | * 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: | |||
478 | * due to actual, failed cards. | 478 | * due to actual, failed cards. |
479 | */ | 479 | */ |
480 | printk(KERN_ERR | 480 | printk(KERN_ERR |
481 | "EEH: PCI device at location=%s driver=%s pci addr=%s \n" | 481 | "EEH: PCI device at location=%s driver=%s pci addr=%s\n" |
482 | "has failed %d times in the last hour " | 482 | "has failed %d times in the last hour " |
483 | "and has been permanently disabled. \n" | 483 | "and has been permanently disabled.\n" |
484 | "Please try reseating this device or replacing it.\n", | 484 | "Please try reseating this device or replacing it.\n", |
485 | location, drv_str, pci_str, frozen_pdn->eeh_freeze_count); | 485 | location, drv_str, pci_str, frozen_pdn->eeh_freeze_count); |
486 | goto perm_error; | 486 | goto perm_error; |
@@ -488,7 +488,7 @@ excess_failures: | |||
488 | hard_fail: | 488 | hard_fail: |
489 | printk(KERN_ERR | 489 | printk(KERN_ERR |
490 | "EEH: Unable to recover from failure of PCI device " | 490 | "EEH: Unable to recover from failure of PCI device " |
491 | "at location=%s driver=%s pci addr=%s \n" | 491 | "at location=%s driver=%s pci addr=%s\n" |
492 | "Please try reseating this device or replacing it.\n", | 492 | "Please try reseating this device or replacing it.\n", |
493 | location, drv_str, pci_str); | 493 | location, drv_str, pci_str); |
494 | 494 | ||
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index b6fa3e4b51b5..4b7a062dee15 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c | |||
@@ -165,7 +165,7 @@ int remove_phb_dynamic(struct pci_controller *phb) | |||
165 | struct resource *res; | 165 | struct resource *res; |
166 | int rc, i; | 166 | int rc, i; |
167 | 167 | ||
168 | pr_debug("PCI: Removing PHB %04x:%02x... \n", | 168 | pr_debug("PCI: Removing PHB %04x:%02x...\n", |
169 | pci_domain_nr(b), b->number); | 169 | pci_domain_nr(b), b->number); |
170 | 170 | ||
171 | /* We cannot to remove a root bus that has children */ | 171 | /* We cannot to remove a root bus that has children */ |
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c index 15eb6107bcd2..225a50ab14be 100644 --- a/arch/powerpc/platforms/pseries/phyp_dump.c +++ b/arch/powerpc/platforms/pseries/phyp_dump.c | |||
@@ -150,7 +150,7 @@ static void print_dump_header(const struct phyp_dump_header *ph) | |||
150 | printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto); | 150 | printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto); |
151 | 151 | ||
152 | /*set cpu state and hpte states as well scratch pad area */ | 152 | /*set cpu state and hpte states as well scratch pad area */ |
153 | printk(KERN_INFO " CPU AREA \n"); | 153 | printk(KERN_INFO " CPU AREA\n"); |
154 | printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags); | 154 | printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags); |
155 | printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type); | 155 | printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type); |
156 | printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags); | 156 | printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags); |
@@ -161,7 +161,7 @@ static void print_dump_header(const struct phyp_dump_header *ph) | |||
161 | printk(KERN_INFO "cpu length_copied =%llx\n", | 161 | printk(KERN_INFO "cpu length_copied =%llx\n", |
162 | ph->cpu_data.length_copied); | 162 | ph->cpu_data.length_copied); |
163 | 163 | ||
164 | printk(KERN_INFO " HPTE AREA \n"); | 164 | printk(KERN_INFO " HPTE AREA\n"); |
165 | printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags); | 165 | printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags); |
166 | printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type); | 166 | printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type); |
167 | printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags); | 167 | printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags); |
@@ -172,7 +172,7 @@ static void print_dump_header(const struct phyp_dump_header *ph) | |||
172 | printk(KERN_INFO "HPTE length_copied =%llx\n", | 172 | printk(KERN_INFO "HPTE length_copied =%llx\n", |
173 | ph->hpte_data.length_copied); | 173 | ph->hpte_data.length_copied); |
174 | 174 | ||
175 | printk(KERN_INFO " SRSD AREA \n"); | 175 | printk(KERN_INFO " SRSD AREA\n"); |
176 | printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags); | 176 | printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags); |
177 | printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type); | 177 | printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type); |
178 | printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags); | 178 | printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags); |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 1ee66db003be..e9a52ec05a0f 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -127,7 +127,7 @@ static inline unsigned int lpar_xirr_info_get(void) | |||
127 | 127 | ||
128 | lpar_rc = plpar_xirr(&return_value); | 128 | lpar_rc = plpar_xirr(&return_value); |
129 | if (lpar_rc != H_SUCCESS) | 129 | if (lpar_rc != H_SUCCESS) |
130 | panic(" bad return code xirr - rc = %lx \n", lpar_rc); | 130 | panic(" bad return code xirr - rc = %lx\n", lpar_rc); |
131 | return (unsigned int)return_value; | 131 | return (unsigned int)return_value; |
132 | } | 132 | } |
133 | 133 | ||