powerpc: Use pr_warn instead of pr_warning
At some point, pr_warning will be removed so all logging messages use a consistent <prefix>_warn style. Update arch/powerpc/ Miscellanea: o Coalesce formats o Realign arguments o Use %s, __func__ instead of embedded function names o Remove unnecessary line continuations Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Geoff Levand <geoff@infradead.org> [mpe: Rebase due to some %pOF changes.] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
@@ -448,7 +448,7 @@ static void setup_pci_atmu(struct pci_controller *hose)
|
||||
#endif
|
||||
/* adjusting outbound windows could reclaim space in mem map */
|
||||
if (paddr_hi < 0xffffffffull)
|
||||
pr_warning("%pOF: WARNING: Outbound window cfg leaves "
|
||||
pr_warn("%pOF: WARNING: Outbound window cfg leaves "
|
||||
"gaps in memory map. Adjusting the memory map "
|
||||
"could reduce unnecessary bounce buffering.\n",
|
||||
hose->dn);
|
||||
@@ -531,7 +531,7 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary)
|
||||
dev = pdev->dev.of_node;
|
||||
|
||||
if (!of_device_is_available(dev)) {
|
||||
pr_warning("%pOF: disabled\n", dev);
|
||||
pr_warn("%pOF: disabled\n", dev);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -808,8 +808,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
|
||||
is_mpc83xx_pci = 1;
|
||||
|
||||
if (!of_device_is_available(dev)) {
|
||||
pr_warning("%pOF: disabled by the firmware.\n",
|
||||
dev);
|
||||
pr_warn("%pOF: disabled by the firmware.\n",
|
||||
dev);
|
||||
return -ENODEV;
|
||||
}
|
||||
pr_debug("Adding PCI host bridge %pOF\n", dev);
|
||||
|
@@ -1008,9 +1008,8 @@ static int mpic_host_map(struct irq_domain *h, unsigned int virq,
|
||||
if (hw == mpic->spurious_vec)
|
||||
return -EINVAL;
|
||||
if (mpic->protected && test_bit(hw, mpic->protected)) {
|
||||
pr_warning("mpic: Mapping of source 0x%x failed, "
|
||||
"source protected by firmware !\n",\
|
||||
(unsigned int)hw);
|
||||
pr_warn("mpic: Mapping of source 0x%x failed, source protected by firmware !\n",
|
||||
(unsigned int)hw);
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
@@ -1040,9 +1039,8 @@ static int mpic_host_map(struct irq_domain *h, unsigned int virq,
|
||||
return 0;
|
||||
|
||||
if (hw >= mpic->num_sources) {
|
||||
pr_warning("mpic: Mapping of source 0x%x failed, "
|
||||
"source out of range !\n",\
|
||||
(unsigned int)hw);
|
||||
pr_warn("mpic: Mapping of source 0x%x failed, source out of range !\n",
|
||||
(unsigned int)hw);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@@ -241,18 +241,16 @@ static int __init icp_native_map_one_cpu(int hw_id, unsigned long addr,
|
||||
cpu, hw_id);
|
||||
|
||||
if (!request_mem_region(addr, size, rname)) {
|
||||
pr_warning("icp_native: Could not reserve ICP MMIO"
|
||||
" for CPU %d, interrupt server #0x%x\n",
|
||||
cpu, hw_id);
|
||||
pr_warn("icp_native: Could not reserve ICP MMIO for CPU %d, interrupt server #0x%x\n",
|
||||
cpu, hw_id);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
icp_native_regs[cpu] = ioremap(addr, size);
|
||||
kvmppc_set_xics_phys(cpu, addr);
|
||||
if (!icp_native_regs[cpu]) {
|
||||
pr_warning("icp_native: Failed ioremap for CPU %d, "
|
||||
"interrupt server #0x%x, addr %#lx\n",
|
||||
cpu, hw_id, addr);
|
||||
pr_warn("icp_native: Failed ioremap for CPU %d, interrupt server #0x%x, addr %#lx\n",
|
||||
cpu, hw_id, addr);
|
||||
release_mem_region(addr, size);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
@@ -131,8 +131,8 @@ static int ics_opal_set_affinity(struct irq_data *d,
|
||||
|
||||
wanted_server = xics_get_irq_server(d->irq, cpumask, 1);
|
||||
if (wanted_server < 0) {
|
||||
pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
|
||||
__func__, cpumask_pr_args(cpumask), d->irq);
|
||||
pr_warn("%s: No online cpus in the mask %*pb for irq %d\n",
|
||||
__func__, cpumask_pr_args(cpumask), d->irq);
|
||||
return -1;
|
||||
}
|
||||
server = ics_opal_mangle_server(wanted_server);
|
||||
|
@@ -141,8 +141,8 @@ static int ics_rtas_set_affinity(struct irq_data *d,
|
||||
|
||||
irq_server = xics_get_irq_server(d->irq, cpumask, 1);
|
||||
if (irq_server == -1) {
|
||||
pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
|
||||
__func__, cpumask_pr_args(cpumask), d->irq);
|
||||
pr_warn("%s: No online cpus in the mask %*pb for irq %d\n",
|
||||
__func__, cpumask_pr_args(cpumask), d->irq);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@@ -243,8 +243,8 @@ void xics_migrate_irqs_away(void)
|
||||
|
||||
/* This is expected during cpu offline. */
|
||||
if (cpu_online(cpu))
|
||||
pr_warning("IRQ %u affinity broken off cpu %u\n",
|
||||
virq, cpu);
|
||||
pr_warn("IRQ %u affinity broken off cpu %u\n",
|
||||
virq, cpu);
|
||||
|
||||
/* Reset affinity to all cpus */
|
||||
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
||||
@@ -466,7 +466,7 @@ void __init xics_init(void)
|
||||
rc = icp_opal_init();
|
||||
}
|
||||
if (rc < 0) {
|
||||
pr_warning("XICS: Cannot find a Presentation Controller !\n");
|
||||
pr_warn("XICS: Cannot find a Presentation Controller !\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -481,7 +481,7 @@ void __init xics_init(void)
|
||||
if (rc < 0)
|
||||
rc = ics_opal_init();
|
||||
if (rc < 0)
|
||||
pr_warning("XICS: Cannot find a Source Controller !\n");
|
||||
pr_warn("XICS: Cannot find a Source Controller !\n");
|
||||
|
||||
/* Initialize common bits */
|
||||
xics_get_server_size();
|
||||
|
Reference in New Issue
Block a user