As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.

Cc: Will Deacon <w...@kernel.org>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
---
 arch/arm64/kernel/hw_breakpoint.c |  8 ++++----
 arch/arm64/kernel/smp.c           | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/kernel/hw_breakpoint.c 
b/arch/arm64/kernel/hw_breakpoint.c
index 38ee1514cd9c..0b727edf4104 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -51,7 +51,7 @@ int hw_breakpoint_slots(int type)
        case TYPE_DATA:
                return get_num_wrps();
        default:
-               pr_warning("unknown slot type: %d\n", type);
+               pr_warn("unknown slot type: %d\n", type);
                return 0;
        }
 }
@@ -112,7 +112,7 @@ static u64 read_wb_reg(int reg, int n)
        GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, 
val);
        GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, 
val);
        default:
-               pr_warning("attempt to read from unknown breakpoint register 
%d\n", n);
+               pr_warn("attempt to read from unknown breakpoint register 
%d\n", n);
        }
 
        return val;
@@ -127,7 +127,7 @@ static void write_wb_reg(int reg, int n, u64 val)
        GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, 
val);
        GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, 
val);
        default:
-               pr_warning("attempt to write to unknown breakpoint register 
%d\n", n);
+               pr_warn("attempt to write to unknown breakpoint register %d\n", 
n);
        }
        isb();
 }
@@ -145,7 +145,7 @@ static enum dbg_active_el debug_exception_level(int 
privilege)
        case AARCH64_BREAKPOINT_EL1:
                return DBG_ACTIVE_EL1;
        default:
-               pr_warning("invalid breakpoint privilege level %d\n", 
privilege);
+               pr_warn("invalid breakpoint privilege level %d\n", privilege);
                return -EINVAL;
        }
 }
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index dc9fe879c279..ab149bcc3dc7 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -345,8 +345,7 @@ void __cpu_die(unsigned int cpu)
         */
        err = op_cpu_kill(cpu);
        if (err)
-               pr_warn("CPU%d may not have shut down cleanly: %d\n",
-                       cpu, err);
+               pr_warn("CPU%d may not have shut down cleanly: %d\n", cpu, err);
 }
 
 /*
@@ -976,8 +975,8 @@ void smp_send_stop(void)
                udelay(1);
 
        if (num_online_cpus() > 1)
-               pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
-                          cpumask_pr_args(cpu_online_mask));
+               pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
+                       cpumask_pr_args(cpu_online_mask));
 
        sdei_mask_local_cpu();
 }
@@ -1017,8 +1016,8 @@ void crash_smp_send_stop(void)
                udelay(1);
 
        if (atomic_read(&waiting_for_crash_ipi) > 0)
-               pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
-                          cpumask_pr_args(&mask));
+               pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
+                       cpumask_pr_args(&mask));
 
        sdei_mask_local_cpu();
 }
-- 
2.20.1

Reply via email to