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>

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 0ac7aa346c693a6be93adf68b255ecaae2ac075e..7cd2803e2cc3cd3301288f6ac7ad6b9a108dc772 100644 (file)
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1276,8 +1276,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                                                i + PCI_BRIDGE_RESOURCES) == 0)
                                continue;
                }
-               pr_warning("PCI: Cannot allocate resource region "
-                          "%d of PCI bridge %d, will remap\n", i, bus->number);
+               pr_warn("PCI: Cannot allocate resource region %d of PCI bridge %d, will remap\n",
+                       i, bus->number);
        clear_resource:
                /* The resource might be figured out when doing
                 * reassignment based on the resources required

diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index a07722531b32e3dfb329e38460085ef789b0128e..f6eb7e8f4c938c9cb6966924e38525d47e2c33dd 100644 (file)
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -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));
                if (rc < 0) {
-                       pr_warning(
-                               "vmemmap_populate: Unable to create vmemmap mapping: %d\n",
-                               rc);
+                       pr_warn("%s: Unable to create vmemmap mapping: %d\n",
+                               __func__, rc);
                        return -EFAULT;
                }
        }

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4362b86ef84c5daa404e806cf3802128b77b8532..1281c6eb3a85b705f09f8f93e4249d84a3716221 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -138,8 +138,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)
        start = (unsigned long)__va(start);
        rc = create_section_mapping(start, start + size);
        if (rc) {
-               pr_warning(
-                       "Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",
+               pr_warn("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",
                        start, start + size, rc);
                return -EFAULT;
        }

diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index f99e79ee060e11169c3ef72522324fd23b5627c1..48abb4cb304c48562653807e9594a9ce17a7716b 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -387,8 +387,8 @@ static unsigned int __init get_fifo_size(struct device_node *np,
        if (fp)
                return *fp;
 
-       pr_warning("no %s property in %pOF node, defaulting to %d\n",
-                  prop_name, np, DEFAULT_FIFO_SIZE);
+       pr_warn("no %s property in %pOF node, defaulting to %d\n",
+               prop_name, np, DEFAULT_FIFO_SIZE);
 
        return DEFAULT_FIFO_SIZE;
 }

diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index 82f8490b5aa7d9d5494394f9a426243f56881cb8..38d4ba9f37b58acd0b7dd377859a29d238d2baa6 100644 (file)
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -252,8 +252,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h,
                /* type is configurable */
                if (intspec[1] != IRQ_TYPE_LEVEL_LOW &&
                    intspec[1] != IRQ_TYPE_LEVEL_HIGH) {
-                       pr_warning("FPGA PIC: invalid irq type, "
-                                  "setting default active low\n");
+                       pr_warn("FPGA PIC: invalid irq type, setting default active low\n");
                        *out_flags = IRQ_TYPE_LEVEL_LOW;
                } else {
                        *out_flags = intspec[1];
@@ -267,7 +266,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h,
        if (intspec[2] <= 2)
                fpga_irq->irq_line = intspec[2];
        else
-               pr_warning("FPGA PIC: invalid irq routing\n");
+               pr_warn("FPGA PIC: invalid irq routing\n");
 
        return 0;
 }
@@ -293,7 +292,7 @@ void socrates_fpga_pic_init(struct device_node *pic)
        for (i = 0; i < 3; i++) {
                socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, 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;
                }
                irq_set_chained_handler(socrates_fpga_irqs[i],

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index a0e989ed4b6f425036e880d886b6a15476bf9e85..17c6cd3d02e6727bb13abb419ef13d72661d749d 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -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 */
        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;
        }
 

diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index aafa01ba062f80f904a44fa8e7fd7db93763aed0..2c72263ad6abcda28cfb2e3dd0c491114175b999 100644 (file)
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -589,7 +589,7 @@ int pasemi_dma_init(void)
        pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0);
        while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) {
                if (time_after(jiffies, timeout)) {
-                       pr_warning("Warning: Could not disable RX section\n");
+                       pr_warn("Warning: Could not disable RX section\n");
                        break;
                }
        }
@@ -598,7 +598,7 @@ int pasemi_dma_init(void)
        pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0);
        while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) {
                if (time_after(jiffies, timeout)) {
-                       pr_warning("Warning: Could not disable TX section\n");
+                       pr_warn("Warning: Could not disable TX section\n");
                        break;
                }
        }

diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 041ddbd1fc577db3f6d95b28ac3f0fc110c6563f..2c1aa9cef66da6cf1eaab7dc979dee9c5ee78094 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -239,8 +239,8 @@ int opal_message_notifier_register(enum opal_msg_type msg_type,
                                        struct notifier_block *nb)
 {
        if (!nb || msg_type >= OPAL_MSG_TYPE_MAX) {
-               pr_warning("%s: Invalid arguments, msg_type:%d\n",
-                          __func__, msg_type);
+               pr_warn("%s: Invalid arguments, msg_type:%d\n",
+                       __func__, msg_type);
                return -EINVAL;
        }
 
@@ -281,8 +281,8 @@ static void opal_handle_message(void)
 
        /* check for errors. */
        if (ret) {
-               pr_warning("%s: Failed to retrieve opal message, err=%lld\n",
-                               __func__, ret);
+               pr_warn("%s: Failed to retrieve opal message, err=%lld\n",
+                       __func__, ret);
                return;
        }
 

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 749055553064041369d111b01b793ba9368a5d48..080ee202a173dfeceea64e721b15aa6dc15f4ab1 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1059,8 +1059,8 @@ static struct pnv_ioda_pe *pnv_ioda_setup_dev_PE(struct pci_dev *dev)
 
        pe = pnv_ioda_alloc_pe(phb);
        if (!pe) {
-               pr_warning("%s: Not enough PE# available, disabling device\n",
-                          pci_name(dev));
+               pr_warn("%s: Not enough PE# available, disabling device\n",
+                       pci_name(dev));
                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);
 
        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);
                return NULL;
        }
@@ -3293,7 +3293,7 @@ static void pnv_pci_ioda_create_dbgfs(void)
                sprintf(name, "PCI%04x", hose->global_number);
                phb->dbgfs = debugfs_create_dir(name, powerpc_debugfs_root);
                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);
                        continue;
                }
@@ -4026,7 +4026,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
        /* Reset IODA tables to a clean state */
        rc = opal_pci_reset(phb_id, OPAL_RESET_PCI_IODA_TABLE, OPAL_ASSERT_RESET);
        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

diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index e48462447ff0049af5cf27ac24355f8929078b6f..e7075aaff1bb62094f8d8f1df706c7d5157496e3 100644 (file)
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -663,8 +663,8 @@ static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
                if (rem)
                        break;
        }
-       pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__,
-                  bus_id, dev_id);
+       pr_warn("%s:%u: device %llu:%llu not found\n",
+               __func__, __LINE__, bus_id, dev_id);
        return;
 
 found:
@@ -859,11 +859,9 @@ static int ps3_probe_thread(void *data)
 
                if (notify_event->event_type != notify_region_probe ||
                    notify_event->bus_id != dev.sbd.bus_id) {
-                       pr_warning("%s:%u: bad notify_event: event %llu, "
-                                  "dev_id %llu, dev_type %llu\n",
-                                  __func__, __LINE__, notify_event->event_type,
-                                  notify_event->dev_id,
-                                  notify_event->dev_type);
+                       pr_warn("%s:%u: bad notify_event: event %llu, dev_id %llu, dev_type %llu\n",
+                               __func__, __LINE__, notify_event->event_type,
+                               notify_event->dev_id, notify_event->dev_type);
                        continue;
                }
 

diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index b0f34663b1aecf388a5e6cf6e09bebbf7ae76bc3..7f870ec29daf0675e366daff6552096de03adb41 100644 (file)
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -607,8 +607,8 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
                                       r->ioid,
                                       iopte_flag);
                if (result) {
-                       pr_warning("%s:%d: lv1_put_iopte failed: %s\n",
-                                  __func__, __LINE__, ps3_result(result));
+                       pr_warn("%s:%d: lv1_put_iopte failed: %s\n",
+                               __func__, __LINE__, ps3_result(result));
                        goto fail_map;
                }
                DBG("%s: pg=%d bus=%#lx, lpar=%#lx, ioid=%#x\n", __func__,

diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 3db53e8aff9279cfe761ac9f43926559e347eaf4..cdbfc5cfd6f38ee85620288c14d2288808572e1e 100644 (file)
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -699,7 +699,7 @@ static void os_area_queue_work_handler(struct work_struct *work)
 
        error = update_flash_db();
        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__);
 }

diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 69921f72e2dad38ff9e9ad9ec6ebe8a2d93c8071..5fe77ac2e95537ec64b991794a4c69a28ca05871 100644 (file)
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -816,15 +816,15 @@ static void remove_ddw(struct device_node *np, bool remove_prop)
        ret = tce_clearrange_multi_pSeriesLP(0,
                1ULL << (be32_to_cpu(dwp->window_shift) - PAGE_SHIFT), dwp);
        if (ret)
-               pr_warning("%pOF failed to clear tces in window.\n",
-                        np);
+               pr_warn("%pOF failed to clear tces in window.\n",
+                       np);
        else
                pr_debug("%pOF successfully cleared tces in window.\n",
                         np);
 
        ret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn);
        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",
                        np, ret, ddw_avail[2], liobn);
        else
@@ -836,7 +836,7 @@ delprop:
        if (remove_prop)
                ret = of_remove_property(np, win64);
        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);
 }
 

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 5f1beb8367acaa4562dbc647ad06a1f4c12a8f72..1d6e2de2445cb2a21964f4e2108cf4bac4e2ef70 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -371,8 +371,8 @@ void pseries_disable_reloc_on_exc(void)
                mdelay(get_longbusy_msecs(rc));
        }
        if (rc != H_SUCCESS)
-               pr_warning("Warning: Failed to disable relocation on "
-                          "exceptions: %ld\n", rc);
+               pr_warn("Warning: Failed to disable relocation on exceptions: %ld\n",
+                       rc);
 }
 EXPORT_SYMBOL(pseries_disable_reloc_on_exc);
 

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 22d98057f773bf5837ef26a51fb9ea2427006dae..1e57edd4947a64d873b12cbeed0c9200dae7b9c3 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -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);

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index ead3e2549ebfe2b891e54e37e8ef3e3f77e963d0..73067805300a26338b0868292cff95c8b78f5ce1 100644 (file)
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -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;
        }
 

diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index 2bfb9968d56222ca6060177d9cf6f6a4829d0505..1459f4e8b698e440d524e5454460bc3f9206baa6 100644 (file)
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -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;
        }

diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c
index 1c6bf4b66f56854d0717a644c75dea70e3fabde7..f85f916ba432efaa7c3979ef2088d5886154fe96 100644 (file)
--- a/arch/powerpc/sysdev/xics/ics-opal.c
+++ b/arch/powerpc/sysdev/xics/ics-opal.c
@@ -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);

diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index 42e0c56ff81c3fcde6e4ad27c523b049cce38995..6aabc74688a6e20002f78326a0d593786c0f0b83 100644 (file)
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -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;
        }
 

diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index ffe138b8b9dc458646aaa45b79f1c18410a56c74..77e864d5506d3d815a46188eddcc752bdecb1423 100644 (file)
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -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();