openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Joe Perches 2016-10-24 21:00:08 -07:00 committed by Michael Ellerman
parent ae64f9bd1d
commit f2c2cbcc35
20 changed files with 56 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/pci-common.c
View File

@ -1276,8 +1276,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
i + PCI_BRIDGE_RESOURCES) == 0) i + PCI_BRIDGE_RESOURCES) == 0)
continue; continue;
} }
pr_warning("PCI: Cannot allocate resource region " pr_warn("PCI: Cannot allocate resource region %d of PCI bridge %d, will remap\n",
"%d of PCI bridge %d, will remap\n", i, bus->number); i, bus->number);
clear_resource: clear_resource:
/* The resource might be figured out when doing /* The resource might be figured out when doing
* reassignment based on the resources required * reassignment based on the resources required

5
arch/powerpc/mm/init_64.c
View File

@ -214,9 +214,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
rc = vmemmap_create_mapping(start, page_size, __pa(p)); rc = vmemmap_create_mapping(start, page_size, __pa(p));
if (rc < 0) { if (rc < 0) {
pr_warning( pr_warn("%s: Unable to create vmemmap mapping: %d\n",
"vmemmap_populate: Unable to create vmemmap mapping: %d\n", __func__, rc);
rc);
return -EFAULT; return -EFAULT;
} }
} }

3
arch/powerpc/mm/mem.c
View File

@ -138,8 +138,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)
start = (unsigned long)__va(start); start = (unsigned long)__va(start);
rc = create_section_mapping(start, start + size); rc = create_section_mapping(start, start + size);
if (rc) { if (rc) {
pr_warning( pr_warn("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",
"Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",
start, start + size, rc); start, start + size, rc);
return -EFAULT; return -EFAULT;
} }

4
arch/powerpc/platforms/512x/mpc512x_shared.c
View File

@ -387,8 +387,8 @@ static unsigned int __init get_fifo_size(struct device_node *np,
if (fp) if (fp)
return *fp; return *fp;
pr_warning("no %s property in %pOF node, defaulting to %d\n", pr_warn("no %s property in %pOF node, defaulting to %d\n",
prop_name, np, DEFAULT_FIFO_SIZE); prop_name, np, DEFAULT_FIFO_SIZE);
return DEFAULT_FIFO_SIZE; return DEFAULT_FIFO_SIZE;
} }

7
arch/powerpc/platforms/85xx/socrates_fpga_pic.c
View File

@ -252,8 +252,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h,
/* type is configurable */ /* type is configurable */
if (intspec[1] != IRQ_TYPE_LEVEL_LOW && if (intspec[1] != IRQ_TYPE_LEVEL_LOW &&
intspec[1] != IRQ_TYPE_LEVEL_HIGH) { intspec[1] != IRQ_TYPE_LEVEL_HIGH) {
pr_warning("FPGA PIC: invalid irq type, " pr_warn("FPGA PIC: invalid irq type, setting default active low\n");
"setting default active low\n");
*out_flags = IRQ_TYPE_LEVEL_LOW; *out_flags = IRQ_TYPE_LEVEL_LOW;
} else { } else {
*out_flags = intspec[1]; *out_flags = intspec[1];
@ -267,7 +266,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h,
if (intspec[2] <= 2) if (intspec[2] <= 2)
fpga_irq->irq_line = intspec[2]; fpga_irq->irq_line = intspec[2];
else else
pr_warning("FPGA PIC: invalid irq routing\n"); pr_warn("FPGA PIC: invalid irq routing\n");
return 0; return 0;
} }
@ -293,7 +292,7 @@ void socrates_fpga_pic_init(struct device_node *pic)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, i); socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, i);
if (!socrates_fpga_irqs[i]) { if (!socrates_fpga_irqs[i]) {
pr_warning("FPGA PIC: can't get irq%d.\n", i); pr_warn("FPGA PIC: can't get irq%d\n", i);
continue; continue;
} }
irq_set_chained_handler(socrates_fpga_irqs[i], irq_set_chained_handler(socrates_fpga_irqs[i],

2
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
View File

@ -101,7 +101,7 @@ static int __init mpc86xx_hpcn_probe(void)
/* Be nice and don't give silent boot death. Delete this in 2.6.27 */ /* Be nice and don't give silent boot death. Delete this in 2.6.27 */
if (of_machine_is_compatible("mpc86xx")) { if (of_machine_is_compatible("mpc86xx")) {
pr_warning("WARNING: your dts/dtb is old. You must update before the next kernel release\n"); pr_warn("WARNING: your dts/dtb is old. You must update before the next kernel release.\n");
return 1; return 1;
} }

4
arch/powerpc/platforms/pasemi/dma_lib.c
View File

@ -589,7 +589,7 @@ int pasemi_dma_init(void)
pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0); pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0);
while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) { while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) {
if (time_after(jiffies, timeout)) { if (time_after(jiffies, timeout)) {
pr_warning("Warning: Could not disable RX section\n"); pr_warn("Warning: Could not disable RX section\n");
break; break;
} }
} }
@ -598,7 +598,7 @@ int pasemi_dma_init(void)
pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0); pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0);
while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) { while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) {
if (time_after(jiffies, timeout)) { if (time_after(jiffies, timeout)) {
pr_warning("Warning: Could not disable TX section\n"); pr_warn("Warning: Could not disable TX section\n");
break; break;
} }
} }

8
arch/powerpc/platforms/powernv/opal.c
View File

@ -239,8 +239,8 @@ int opal_message_notifier_register(enum opal_msg_type msg_type,
struct notifier_block *nb) struct notifier_block *nb)
{ {
if (!nb || msg_type >= OPAL_MSG_TYPE_MAX) { if (!nb || msg_type >= OPAL_MSG_TYPE_MAX) {
pr_warning("%s: Invalid arguments, msg_type:%d\n", pr_warn("%s: Invalid arguments, msg_type:%d\n",
__func__, msg_type); __func__, msg_type);
return -EINVAL; return -EINVAL;
} }
@ -281,8 +281,8 @@ static void opal_handle_message(void)
/* check for errors. */ /* check for errors. */
if (ret) { if (ret) {
pr_warning("%s: Failed to retrieve opal message, err=%lld\n", pr_warn("%s: Failed to retrieve opal message, err=%lld\n",
__func__, ret); __func__, ret);
return; return;
} }

10
arch/powerpc/platforms/powernv/pci-ioda.c
View File

@ -1059,8 +1059,8 @@ static struct pnv_ioda_pe *pnv_ioda_setup_dev_PE(struct pci_dev *dev)
pe = pnv_ioda_alloc_pe(phb); pe = pnv_ioda_alloc_pe(phb);
if (!pe) { if (!pe) {
pr_warning("%s: Not enough PE# available, disabling device\n", pr_warn("%s: Not enough PE# available, disabling device\n",
pci_name(dev)); pci_name(dev));
return NULL; return NULL;
} }
@ -1164,7 +1164,7 @@ static struct pnv_ioda_pe *pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all)
pe = pnv_ioda_alloc_pe(phb); pe = pnv_ioda_alloc_pe(phb);
if (!pe) { if (!pe) {
pr_warning("%s: Not enough PE# available for PCI bus %04x:%02x\n", pr_warn("%s: Not enough PE# available for PCI bus %04x:%02x\n",
__func__, pci_domain_nr(bus), bus->number); __func__, pci_domain_nr(bus), bus->number);
return NULL; return NULL;
} }
@ -3293,7 +3293,7 @@ static void pnv_pci_ioda_create_dbgfs(void)
sprintf(name, "PCI%04x", hose->global_number); sprintf(name, "PCI%04x", hose->global_number);
phb->dbgfs = debugfs_create_dir(name, powerpc_debugfs_root); phb->dbgfs = debugfs_create_dir(name, powerpc_debugfs_root);
if (!phb->dbgfs) { if (!phb->dbgfs) {
pr_warning("%s: Error on creating debugfs on PHB#%x\n", pr_warn("%s: Error on creating debugfs on PHB#%x\n",
__func__, hose->global_number); __func__, hose->global_number);
continue; continue;
} }
@ -4026,7 +4026,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
/* Reset IODA tables to a clean state */ /* Reset IODA tables to a clean state */
rc = opal_pci_reset(phb_id, OPAL_RESET_PCI_IODA_TABLE, OPAL_ASSERT_RESET); rc = opal_pci_reset(phb_id, OPAL_RESET_PCI_IODA_TABLE, OPAL_ASSERT_RESET);
if (rc) if (rc)
pr_warning(" OPAL Error %ld performing IODA table reset !\n", rc); pr_warn(" OPAL Error %ld performing IODA table reset !\n", rc);
/* /*
* If we're running in kdump kernel, the previous kernel never * If we're running in kdump kernel, the previous kernel never

12
arch/powerpc/platforms/ps3/device-init.c
View File

@ -663,8 +663,8 @@ static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
if (rem) if (rem)
break; break;
} }
pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__, pr_warn("%s:%u: device %llu:%llu not found\n",
bus_id, dev_id); __func__, __LINE__, bus_id, dev_id);
return; return;
found: found:
@ -859,11 +859,9 @@ static int ps3_probe_thread(void *data)
if (notify_event->event_type != notify_region_probe || if (notify_event->event_type != notify_region_probe ||
notify_event->bus_id != dev.sbd.bus_id) { notify_event->bus_id != dev.sbd.bus_id) {
pr_warning("%s:%u: bad notify_event: event %llu, " pr_warn("%s:%u: bad notify_event: event %llu, dev_id %llu, dev_type %llu\n",
"dev_id %llu, dev_type %llu\n", __func__, __LINE__, notify_event->event_type,
__func__, __LINE__, notify_event->event_type, notify_event->dev_id, notify_event->dev_type);
notify_event->dev_id,
notify_event->dev_type);
continue; continue;
} }

4
arch/powerpc/platforms/ps3/mm.c
View File

@ -607,8 +607,8 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
r->ioid, r->ioid,
iopte_flag); iopte_flag);
if (result) { if (result) {
pr_warning("%s:%d: lv1_put_iopte failed: %s\n", pr_warn("%s:%d: lv1_put_iopte failed: %s\n",
__func__, __LINE__, ps3_result(result)); __func__, __LINE__, ps3_result(result));
goto fail_map; goto fail_map;
} }
DBG("%s: pg=%d bus=%#lx, lpar=%#lx, ioid=%#x\n", __func__, DBG("%s: pg=%d bus=%#lx, lpar=%#lx, ioid=%#x\n", __func__,

2
arch/powerpc/platforms/ps3/os-area.c
View File

@ -699,7 +699,7 @@ static void os_area_queue_work_handler(struct work_struct *work)
error = update_flash_db(); error = update_flash_db();
if (error) if (error)
pr_warning("%s: Could not update FLASH ROM\n", __func__); pr_warn("%s: Could not update FLASH ROM\n", __func__);
pr_debug(" <- %s:%d\n", __func__, __LINE__); pr_debug(" <- %s:%d\n", __func__, __LINE__);
} }

8
arch/powerpc/platforms/pseries/iommu.c
View File

@ -816,15 +816,15 @@ static void remove_ddw(struct device_node *np, bool remove_prop)
ret = tce_clearrange_multi_pSeriesLP(0, ret = tce_clearrange_multi_pSeriesLP(0,
1ULL << (be32_to_cpu(dwp->window_shift) - PAGE_SHIFT), dwp); 1ULL << (be32_to_cpu(dwp->window_shift) - PAGE_SHIFT), dwp);
if (ret) if (ret)
pr_warning("%pOF failed to clear tces in window.\n", pr_warn("%pOF failed to clear tces in window.\n",
np); np);
else else
pr_debug("%pOF successfully cleared tces in window.\n", pr_debug("%pOF successfully cleared tces in window.\n",
np); np);
ret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn); ret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn);
if (ret) if (ret)
pr_warning("%pOF: failed to remove direct window: rtas returned " pr_warn("%pOF: failed to remove direct window: rtas returned "
"%d to ibm,remove-pe-dma-window(%x) %llx\n", "%d to ibm,remove-pe-dma-window(%x) %llx\n",
np, ret, ddw_avail[2], liobn); np, ret, ddw_avail[2], liobn);
else else
@ -836,7 +836,7 @@ static void remove_ddw(struct device_node *np, bool remove_prop)
if (remove_prop) if (remove_prop)
ret = of_remove_property(np, win64); ret = of_remove_property(np, win64);
if (ret) if (ret)
pr_warning("%pOF: failed to remove direct window property: %d\n", pr_warn("%pOF: failed to remove direct window property: %d\n",
np, ret); np, ret);
} }

4
arch/powerpc/platforms/pseries/setup.c
View File

@ -371,8 +371,8 @@ void pseries_disable_reloc_on_exc(void)
mdelay(get_longbusy_msecs(rc)); mdelay(get_longbusy_msecs(rc));
} }
if (rc != H_SUCCESS) if (rc != H_SUCCESS)
pr_warning("Warning: Failed to disable relocation on " pr_warn("Warning: Failed to disable relocation on exceptions: %ld\n",
"exceptions: %ld\n", rc); rc);
} }
EXPORT_SYMBOL(pseries_disable_reloc_on_exc); EXPORT_SYMBOL(pseries_disable_reloc_on_exc);

8
arch/powerpc/sysdev/fsl_pci.c
View File

@ -448,7 +448,7 @@ static void setup_pci_atmu(struct pci_controller *hose)
#endif #endif
/* adjusting outbound windows could reclaim space in mem map */ /* adjusting outbound windows could reclaim space in mem map */
if (paddr_hi < 0xffffffffull) 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 " "gaps in memory map. Adjusting the memory map "
"could reduce unnecessary bounce buffering.\n", "could reduce unnecessary bounce buffering.\n",
hose->dn); hose->dn);
@ -531,7 +531,7 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary)
dev = pdev->dev.of_node; dev = pdev->dev.of_node;
if (!of_device_is_available(dev)) { if (!of_device_is_available(dev)) {
pr_warning("%pOF: disabled\n", dev); pr_warn("%pOF: disabled\n", dev);
return -ENODEV; return -ENODEV;
} }
@ -808,8 +808,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
is_mpc83xx_pci = 1; is_mpc83xx_pci = 1;
if (!of_device_is_available(dev)) { if (!of_device_is_available(dev)) {
pr_warning("%pOF: disabled by the firmware.\n", pr_warn("%pOF: disabled by the firmware.\n",
dev); dev);
return -ENODEV; return -ENODEV;
} }
pr_debug("Adding PCI host bridge %pOF\n", dev); pr_debug("Adding PCI host bridge %pOF\n", dev);

10
arch/powerpc/sysdev/mpic.c
View File

@ -1008,9 +1008,8 @@ static int mpic_host_map(struct irq_domain *h, unsigned int virq,
if (hw == mpic->spurious_vec) if (hw == mpic->spurious_vec)
return -EINVAL; return -EINVAL;
if (mpic->protected && test_bit(hw, mpic->protected)) { if (mpic->protected && test_bit(hw, mpic->protected)) {
pr_warning("mpic: Mapping of source 0x%x failed, " pr_warn("mpic: Mapping of source 0x%x failed, source protected by firmware !\n",
"source protected by firmware !\n",\ (unsigned int)hw);
(unsigned int)hw);
return -EPERM; return -EPERM;
} }
@ -1040,9 +1039,8 @@ static int mpic_host_map(struct irq_domain *h, unsigned int virq,
return 0; return 0;
if (hw >= mpic->num_sources) { if (hw >= mpic->num_sources) {
pr_warning("mpic: Mapping of source 0x%x failed, " pr_warn("mpic: Mapping of source 0x%x failed, source out of range !\n",
"source out of range !\n",\ (unsigned int)hw);
(unsigned int)hw);
return -EINVAL; return -EINVAL;
} }

10
arch/powerpc/sysdev/xics/icp-native.c
View File

@ -241,18 +241,16 @@ static int __init icp_native_map_one_cpu(int hw_id, unsigned long addr,
cpu, hw_id); cpu, hw_id);
if (!request_mem_region(addr, size, rname)) { if (!request_mem_region(addr, size, rname)) {
pr_warning("icp_native: Could not reserve ICP MMIO" pr_warn("icp_native: Could not reserve ICP MMIO for CPU %d, interrupt server #0x%x\n",
" for CPU %d, interrupt server #0x%x\n", cpu, hw_id);
cpu, hw_id);
return -EBUSY; return -EBUSY;
} }
icp_native_regs[cpu] = ioremap(addr, size); icp_native_regs[cpu] = ioremap(addr, size);
kvmppc_set_xics_phys(cpu, addr); kvmppc_set_xics_phys(cpu, addr);
if (!icp_native_regs[cpu]) { if (!icp_native_regs[cpu]) {
pr_warning("icp_native: Failed ioremap for CPU %d, " pr_warn("icp_native: Failed ioremap for CPU %d, interrupt server #0x%x, addr %#lx\n",
"interrupt server #0x%x, addr %#lx\n", cpu, hw_id, addr);
cpu, hw_id, addr);
release_mem_region(addr, size); release_mem_region(addr, size);
return -ENOMEM; return -ENOMEM;
} }

4
arch/powerpc/sysdev/xics/ics-opal.c
View File

@ -131,8 +131,8 @@ static int ics_opal_set_affinity(struct irq_data *d,
wanted_server = xics_get_irq_server(d->irq, cpumask, 1); wanted_server = xics_get_irq_server(d->irq, cpumask, 1);
if (wanted_server < 0) { if (wanted_server < 0) {
pr_warning("%s: No online cpus in the mask %*pb for irq %d\n", pr_warn("%s: No online cpus in the mask %*pb for irq %d\n",
__func__, cpumask_pr_args(cpumask), d->irq); __func__, cpumask_pr_args(cpumask), d->irq);
return -1; return -1;
} }
server = ics_opal_mangle_server(wanted_server); server = ics_opal_mangle_server(wanted_server);

4
arch/powerpc/sysdev/xics/ics-rtas.c
View File

@ -141,8 +141,8 @@ static int ics_rtas_set_affinity(struct irq_data *d,
irq_server = xics_get_irq_server(d->irq, cpumask, 1); irq_server = xics_get_irq_server(d->irq, cpumask, 1);
if (irq_server == -1) { if (irq_server == -1) {
pr_warning("%s: No online cpus in the mask %*pb for irq %d\n", pr_warn("%s: No online cpus in the mask %*pb for irq %d\n",
__func__, cpumask_pr_args(cpumask), d->irq); __func__, cpumask_pr_args(cpumask), d->irq);
return -1; return -1;
} }

8
arch/powerpc/sysdev/xics/xics-common.c
View File

@ -243,8 +243,8 @@ void xics_migrate_irqs_away(void)
/* This is expected during cpu offline. */ /* This is expected during cpu offline. */
if (cpu_online(cpu)) if (cpu_online(cpu))
pr_warning("IRQ %u affinity broken off cpu %u\n", pr_warn("IRQ %u affinity broken off cpu %u\n",
virq, cpu); virq, cpu);
/* Reset affinity to all cpus */ /* Reset affinity to all cpus */
raw_spin_unlock_irqrestore(&desc->lock, flags); raw_spin_unlock_irqrestore(&desc->lock, flags);
@ -466,7 +466,7 @@ void __init xics_init(void)
rc = icp_opal_init(); rc = icp_opal_init();
} }
if (rc < 0) { if (rc < 0) {
pr_warning("XICS: Cannot find a Presentation Controller !\n"); pr_warn("XICS: Cannot find a Presentation Controller !\n");
return; return;
} }
@ -481,7 +481,7 @@ void __init xics_init(void)
if (rc < 0) if (rc < 0)
rc = ics_opal_init(); rc = ics_opal_init();
if (rc < 0) if (rc < 0)
pr_warning("XICS: Cannot find a Source Controller !\n"); pr_warn("XICS: Cannot find a Source Controller !\n");
/* Initialize common bits */ /* Initialize common bits */
xics_get_server_size(); xics_get_server_size();