Commit a395d6a7 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

kernel/...: convert pr_warning to pr_warn 



Use the more common logging method with the eventual goal of removing
pr_warning altogether.

Miscellanea:

 - Realign arguments
 - Coalesce formats
 - Add missing space between a few coalesced formats

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>	[kernel/power/suspend.c]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 20d7a35b

kernel/irq/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 


		if (nmsk != omsk)

			/* hope the handler works with current  trigger mode */

			pr_warning("irq %d uses trigger mode %u; requested %u\n",

			pr_warn("irq %d uses trigger mode %u; requested %u\n",

				irq, nmsk, omsk);

	}

kernel/power/suspend.c

+1 −2
Original line number Diff line number Diff line
@@ -473,8 +473,7 @@ static int enter_state(suspend_state_t state) 
	if (state == PM_SUSPEND_FREEZE) {

#ifdef CONFIG_PM_DEBUG

		if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) {

			pr_warning("PM: Unsupported test mode for suspend to idle,"

				   "please choose none/freezer/devices/platform.\n");

			pr_warn("PM: Unsupported test mode for suspend to idle, please choose none/freezer/devices/platform.\n");

			return -EAGAIN;

		}

#endif

kernel/time/tick-sched.c

+4 −4
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int __init tick_nohz_full_setup(char *str) 
{

	alloc_bootmem_cpumask_var(&tick_nohz_full_mask);

	if (cpulist_parse(str, tick_nohz_full_mask) < 0) {

		pr_warning("NOHZ: Incorrect nohz_full cpumask\n");

		pr_warn("NO_HZ: Incorrect nohz_full cpumask\n");

		free_bootmem_cpumask_var(tick_nohz_full_mask);

		return 1;

	}
@@ -446,8 +446,7 @@ void __init tick_nohz_init(void) 
	 * interrupts to avoid circular dependency on the tick

	 */

	if (!arch_irq_work_has_interrupt()) {

		pr_warning("NO_HZ: Can't run full dynticks because arch doesn't "

			   "support irq work self-IPIs\n");

		pr_warn("NO_HZ: Can't run full dynticks because arch doesn't support irq work self-IPIs\n");

		cpumask_clear(tick_nohz_full_mask);

		cpumask_copy(housekeeping_mask, cpu_possible_mask);

		tick_nohz_full_running = false;
@@ -457,7 +456,8 @@ void __init tick_nohz_init(void) 
	cpu = smp_processor_id();



	if (cpumask_test_cpu(cpu, tick_nohz_full_mask)) {

		pr_warning("NO_HZ: Clearing %d from nohz_full range for timekeeping\n", cpu);

		pr_warn("NO_HZ: Clearing %d from nohz_full range for timekeeping\n",

			cpu);

		cpumask_clear_cpu(cpu, tick_nohz_full_mask);

	}

kernel/trace/blktrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1437,12 +1437,12 @@ static struct trace_event trace_blk_event = { 
static int __init init_blk_tracer(void)

{

	if (!register_trace_event(&trace_blk_event)) {

		pr_warning("Warning: could not register block events\n");

		pr_warn("Warning: could not register block events\n");

		return 1;

	}



	if (register_tracer(&blk_tracer) != 0) {

		pr_warning("Warning: could not register the block tracer\n");

		pr_warn("Warning: could not register the block tracer\n");

		unregister_trace_event(&trace_blk_event);

		return 1;

	}

kernel/trace/ftrace.c

+3 −4
Original line number Diff line number Diff line
@@ -1058,8 +1058,7 @@ static __init void ftrace_profile_tracefs(struct dentry *d_tracer) 
	entry = tracefs_create_file("function_profile_enabled", 0644,

				    d_tracer, NULL, &ftrace_profile_fops);

	if (!entry)

		pr_warning("Could not create tracefs "

			   "'function_profile_enabled' entry\n");

		pr_warn("Could not create tracefs 'function_profile_enabled' entry\n");

}



#else /* CONFIG_FUNCTION_PROFILER */
@@ -2314,7 +2313,7 @@ unsigned long ftrace_get_addr_curr(struct dyn_ftrace *rec) 
	if (rec->flags & FTRACE_FL_TRAMP_EN) {

		ops = ftrace_find_tramp_ops_curr(rec);

		if (FTRACE_WARN_ON(!ops)) {

			pr_warning("Bad trampoline accounting at: %p (%pS)\n",

			pr_warn("Bad trampoline accounting at: %p (%pS)\n",

				(void *)rec->ip, (void *)rec->ip);

			/* Ftrace is shutting down, return anything */

			return (unsigned long)FTRACE_ADDR;

CRA Git | Maintained and supported by SUSTech CRA and CCSE