diff options
| author | Joe Perches <joe@perches.com> | 2016-10-24 21:00:08 -0700 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-12-04 11:54:34 +1100 |
| commit | f2c2cbcc35d47f1471a04155ac357521f5170371 (patch) | |
| tree | 7326dd8c67804daaf86902394b78c7469c271a58 /arch/powerpc/sysdev/xics/icp-native.c | |
| parent | ae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff) | |
| download | linux-stable-f2c2cbcc35d47f1471a04155ac357521f5170371.tar.gz linux-stable-f2c2cbcc35d47f1471a04155ac357521f5170371.tar.bz2 linux-stable-f2c2cbcc35d47f1471a04155ac357521f5170371.zip | |
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>
Diffstat (limited to 'arch/powerpc/sysdev/xics/icp-native.c')
| -rw-r--r-- | arch/powerpc/sysdev/xics/icp-native.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c index 2bfb9968d562..1459f4e8b698 100644 --- 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; } |