Commit a74ec64a authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

arm64: Use pr_warn instead of pr_warning 

As said in commit f2c2cbcc ("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.

Link: http://lkml.kernel.org/r/20191018031850.48498-2-wangkefeng.wang@huawei.com


To: linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent a7590d68

arch/arm64/kernel/hw_breakpoint.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

}

arch/arm64/kernel/smp.c

+5 −6
Original line number Diff line number Diff line
@@ -343,8 +343,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);

}



/*
@@ -979,7 +978,7 @@ void smp_send_stop(void) 
		udelay(1);



	if (num_online_cpus() > 1)

		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",

		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",

			cpumask_pr_args(cpu_online_mask));



	sdei_mask_local_cpu();
@@ -1020,7 +1019,7 @@ 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",

		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",

			cpumask_pr_args(&mask));



	sdei_mask_local_cpu();