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>
This commit is contained in:
parent
0b9612c210
commit
8354be9c10
@ -359,7 +359,7 @@ static void parse_system_parameter_string(struct seq_file *m)
|
|||||||
|
|
||||||
unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
|
unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
|
||||||
if (!local_buffer) {
|
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__);
|
__FILE__, __func__, __LINE__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -383,13 +383,13 @@ static void parse_system_parameter_string(struct seq_file *m)
|
|||||||
int idx, w_idx;
|
int idx, w_idx;
|
||||||
char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
|
char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
|
||||||
if (!workbuffer) {
|
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__);
|
__FILE__, __func__, __LINE__);
|
||||||
kfree(local_buffer);
|
kfree(local_buffer);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#ifdef LPARCFG_DEBUG
|
#ifdef LPARCFG_DEBUG
|
||||||
printk(KERN_INFO "success calling get-system-parameter \n");
|
printk(KERN_INFO "success calling get-system-parameter\n");
|
||||||
#endif
|
#endif
|
||||||
splpar_strlen = local_buffer[0] * 256 + local_buffer[1];
|
splpar_strlen = local_buffer[0] * 256 + local_buffer[1];
|
||||||
local_buffer += 2; /* step over strlen value */
|
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"))) {
|
while ((cpus_dn = of_find_node_by_type(cpus_dn, "cpu"))) {
|
||||||
#ifdef LPARCFG_DEBUG
|
#ifdef LPARCFG_DEBUG
|
||||||
printk(KERN_ERR "cpus_dn %p \n", cpus_dn);
|
printk(KERN_ERR "cpus_dn %p\n", cpus_dn);
|
||||||
#endif
|
#endif
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
@ -725,7 +725,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
|
|||||||
const unsigned int *lp_index_ptr;
|
const unsigned int *lp_index_ptr;
|
||||||
unsigned int lp_index = 0;
|
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("/");
|
rootdn = of_find_node_by_path("/");
|
||||||
if (rootdn) {
|
if (rootdn) {
|
||||||
|
@ -304,7 +304,7 @@ static void __devinit __of_scan_bus(struct device_node *node,
|
|||||||
int reglen, devfn;
|
int reglen, devfn;
|
||||||
struct pci_dev *dev;
|
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);
|
node->full_name, bus->number);
|
||||||
|
|
||||||
/* Scan direct children */
|
/* Scan direct children */
|
||||||
|
@ -134,7 +134,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
|
|||||||
pvid = mfspr(SPRN_PVR);
|
pvid = mfspr(SPRN_PVR);
|
||||||
svid = mfspr(SPRN_SVR);
|
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, "PVR\t\t: 0x%x\n", pvid);
|
||||||
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
||||||
|
|
||||||
|
@ -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, " titan elapsed = %lu uSec\n", titan_usec);
|
||||||
seq_printf(m, " tb elapsed = %lu ticks\n", tb_ticks);
|
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);
|
titan_jiff_rem_usec);
|
||||||
seq_printf(m, " tb jiffies = %lu.%04lu\n", tb_jiffies,
|
seq_printf(m, " tb jiffies = %lu.%04lu\n", tb_jiffies,
|
||||||
tb_jiff_rem_usec);
|
tb_jiff_rem_usec);
|
||||||
|
@ -256,7 +256,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
|
|||||||
mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array,
|
mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array,
|
||||||
max_entries);
|
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) {
|
for (i = 0; i < mem_blocks; ++i) {
|
||||||
printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n"
|
printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n"
|
||||||
" abs chunks %016lx - %016lx\n",
|
" abs chunks %016lx - %016lx\n",
|
||||||
|
@ -539,7 +539,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
|
|||||||
if (model
|
if (model
|
||||||
&& (strcmp(model, "iMac,1") == 0
|
&& (strcmp(model, "iMac,1") == 0
|
||||||
|| strcmp(model, "PowerMac1,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 */
|
out_le32((unsigned __iomem *)0x80880008, 1); /* XXX */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -554,7 +554,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
|
|||||||
} else
|
} else
|
||||||
space = bi->totalParamsSize;
|
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
|
/* New BootX will have flushed all TLBs and enters kernel with
|
||||||
* MMU switched OFF, so this should not be useful anymore.
|
* MMU switched OFF, so this should not be useful anymore.
|
||||||
|
@ -478,9 +478,9 @@ excess_failures:
|
|||||||
* due to actual, failed cards.
|
* due to actual, failed cards.
|
||||||
*/
|
*/
|
||||||
printk(KERN_ERR
|
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 "
|
"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",
|
"Please try reseating this device or replacing it.\n",
|
||||||
location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
|
location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
|
||||||
goto perm_error;
|
goto perm_error;
|
||||||
@ -488,7 +488,7 @@ excess_failures:
|
|||||||
hard_fail:
|
hard_fail:
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"EEH: Unable to recover from failure of PCI device "
|
"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",
|
"Please try reseating this device or replacing it.\n",
|
||||||
location, drv_str, pci_str);
|
location, drv_str, pci_str);
|
||||||
|
|
||||||
|
@ -165,7 +165,7 @@ int remove_phb_dynamic(struct pci_controller *phb)
|
|||||||
struct resource *res;
|
struct resource *res;
|
||||||
int rc, i;
|
int rc, i;
|
||||||
|
|
||||||
pr_debug("PCI: Removing PHB %04x:%02x... \n",
|
pr_debug("PCI: Removing PHB %04x:%02x...\n",
|
||||||
pci_domain_nr(b), b->number);
|
pci_domain_nr(b), b->number);
|
||||||
|
|
||||||
/* We cannot to remove a root bus that has children */
|
/* We cannot to remove a root bus that has children */
|
||||||
|
@ -150,7 +150,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)
|
|||||||
printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
|
printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
|
||||||
|
|
||||||
/*set cpu state and hpte states as well scratch pad area */
|
/*set cpu state and hpte states as well scratch pad area */
|
||||||
printk(KERN_INFO " CPU AREA \n");
|
printk(KERN_INFO " CPU AREA\n");
|
||||||
printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
|
printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
|
||||||
printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
|
printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
|
||||||
printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags);
|
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)
|
|||||||
printk(KERN_INFO "cpu length_copied =%llx\n",
|
printk(KERN_INFO "cpu length_copied =%llx\n",
|
||||||
ph->cpu_data.length_copied);
|
ph->cpu_data.length_copied);
|
||||||
|
|
||||||
printk(KERN_INFO " HPTE AREA \n");
|
printk(KERN_INFO " HPTE AREA\n");
|
||||||
printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
|
printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
|
||||||
printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
|
printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
|
||||||
printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags);
|
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)
|
|||||||
printk(KERN_INFO "HPTE length_copied =%llx\n",
|
printk(KERN_INFO "HPTE length_copied =%llx\n",
|
||||||
ph->hpte_data.length_copied);
|
ph->hpte_data.length_copied);
|
||||||
|
|
||||||
printk(KERN_INFO " SRSD AREA \n");
|
printk(KERN_INFO " SRSD AREA\n");
|
||||||
printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
|
printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
|
||||||
printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
|
printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
|
||||||
printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
|
printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
|
||||||
|
@ -127,7 +127,7 @@ static inline unsigned int lpar_xirr_info_get(void)
|
|||||||
|
|
||||||
lpar_rc = plpar_xirr(&return_value);
|
lpar_rc = plpar_xirr(&return_value);
|
||||||
if (lpar_rc != H_SUCCESS)
|
if (lpar_rc != H_SUCCESS)
|
||||||
panic(" bad return code xirr - rc = %lx \n", lpar_rc);
|
panic(" bad return code xirr - rc = %lx\n", lpar_rc);
|
||||||
return (unsigned int)return_value;
|
return (unsigned int)return_value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1575,7 +1575,7 @@ void mpic_request_ipis(void)
|
|||||||
int i;
|
int i;
|
||||||
BUG_ON(mpic == NULL);
|
BUG_ON(mpic == NULL);
|
||||||
|
|
||||||
printk(KERN_INFO "mpic: requesting IPIs ... \n");
|
printk(KERN_INFO "mpic: requesting IPIs...\n");
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
unsigned int vipi = irq_create_mapping(mpic->irqhost,
|
unsigned int vipi = irq_create_mapping(mpic->irqhost,
|
||||||
|
@ -256,7 +256,7 @@ static int qe_ic_host_map(struct irq_host *h, unsigned int virq,
|
|||||||
struct irq_chip *chip;
|
struct irq_chip *chip;
|
||||||
|
|
||||||
if (qe_ic_info[hw].mask == 0) {
|
if (qe_ic_info[hw].mask == 0) {
|
||||||
printk(KERN_ERR "Can't map reserved IRQ \n");
|
printk(KERN_ERR "Can't map reserved IRQ\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
/* Default chip */
|
/* Default chip */
|
||||||
|
@ -157,13 +157,13 @@ int par_io_of_config(struct device_node *np)
|
|||||||
const unsigned int *pio_map;
|
const unsigned int *pio_map;
|
||||||
|
|
||||||
if (par_io == NULL) {
|
if (par_io == NULL) {
|
||||||
printk(KERN_ERR "par_io not initialized \n");
|
printk(KERN_ERR "par_io not initialized\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ph = of_get_property(np, "pio-handle", NULL);
|
ph = of_get_property(np, "pio-handle", NULL);
|
||||||
if (ph == NULL) {
|
if (ph == NULL) {
|
||||||
printk(KERN_ERR "pio-handle not available \n");
|
printk(KERN_ERR "pio-handle not available\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,12 +171,12 @@ int par_io_of_config(struct device_node *np)
|
|||||||
|
|
||||||
pio_map = of_get_property(pio, "pio-map", &pio_map_len);
|
pio_map = of_get_property(pio, "pio-map", &pio_map_len);
|
||||||
if (pio_map == NULL) {
|
if (pio_map == NULL) {
|
||||||
printk(KERN_ERR "pio-map is not set! \n");
|
printk(KERN_ERR "pio-map is not set!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
pio_map_len /= sizeof(unsigned int);
|
pio_map_len /= sizeof(unsigned int);
|
||||||
if ((pio_map_len % 6) != 0) {
|
if ((pio_map_len % 6) != 0) {
|
||||||
printk(KERN_ERR "pio-map format wrong! \n");
|
printk(KERN_ERR "pio-map format wrong!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,7 +316,7 @@ static void update_fans_speed (struct thermostat *th)
|
|||||||
|
|
||||||
if (verbose)
|
if (verbose)
|
||||||
printk(KERN_DEBUG "adt746x: Setting fans speed to %d "
|
printk(KERN_DEBUG "adt746x: Setting fans speed to %d "
|
||||||
"(limit exceeded by %d on %s) \n",
|
"(limit exceeded by %d on %s)\n",
|
||||||
new_speed, var,
|
new_speed, var,
|
||||||
sensor_location[fan_number+1]);
|
sensor_location[fan_number+1]);
|
||||||
write_both_fan_speed(th, new_speed);
|
write_both_fan_speed(th, new_speed);
|
||||||
|
@ -532,7 +532,7 @@ static void ps3av_set_videomode_packet(u32 id)
|
|||||||
res = ps3av_cmd_avb_param(&avb_param, len);
|
res = ps3av_cmd_avb_param(&avb_param, len);
|
||||||
if (res == PS3AV_STATUS_NO_SYNC_HEAD)
|
if (res == PS3AV_STATUS_NO_SYNC_HEAD)
|
||||||
printk(KERN_WARNING
|
printk(KERN_WARNING
|
||||||
"%s: Command failed. Please try your request again. \n",
|
"%s: Command failed. Please try your request again.\n",
|
||||||
__func__);
|
__func__);
|
||||||
else if (res)
|
else if (res)
|
||||||
dev_dbg(&ps3av->dev->core, "ps3av_cmd_avb_param failed\n");
|
dev_dbg(&ps3av->dev->core, "ps3av_cmd_avb_param failed\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user