Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b521cb2 authored by Joe Perches's avatar Joe Perches Committed by Russell King
Browse files

ARM: 8152/1: Convert pr_warning to pr_warn 



Use the more common pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9f9ec08c

arch/arm/include/asm/syscall.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ static inline void syscall_get_arguments(struct task_struct *task, 
	if (i + n > SYSCALL_MAX_ARGS) {

	if (i + n > SYSCALL_MAX_ARGS) {

		unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;

		unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;

		unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;

		unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;

		pr_warning("%s called with max args %d, handling only %d\n",

		pr_warn("%s called with max args %d, handling only %d\n",

			__func__, i + n, SYSCALL_MAX_ARGS);

			__func__, i + n, SYSCALL_MAX_ARGS);

		memset(args_bad, 0, n_bad * sizeof(args[0]));

		memset(args_bad, 0, n_bad * sizeof(args[0]));

		n = SYSCALL_MAX_ARGS - i;

		n = SYSCALL_MAX_ARGS - i;
@@ -88,7 +88,7 @@ static inline void syscall_set_arguments(struct task_struct *task, 
		return;

		return;





	if (i + n > SYSCALL_MAX_ARGS) {

	if (i + n > SYSCALL_MAX_ARGS) {

		pr_warning("%s called with max args %d, handling only %d\n",

		pr_warn("%s called with max args %d, handling only %d\n",

			__func__, i + n, SYSCALL_MAX_ARGS);

			__func__, i + n, SYSCALL_MAX_ARGS);

		n = SYSCALL_MAX_ARGS - i;

		n = SYSCALL_MAX_ARGS - i;

	}

	}

arch/arm/kernel/atags_parse.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ static int __init parse_tag_cmdline(const struct tag *tag) 
	strlcat(default_command_line, tag->u.cmdline.cmdline,

	strlcat(default_command_line, tag->u.cmdline.cmdline,

		COMMAND_LINE_SIZE);

		COMMAND_LINE_SIZE);

#elif defined(CONFIG_CMDLINE_FORCE)

#elif defined(CONFIG_CMDLINE_FORCE)

	pr_warning("Ignoring tag cmdline (using the default kernel command line)\n");

	pr_warn("Ignoring tag cmdline (using the default kernel command line)\n");

#else

#else

	strlcpy(default_command_line, tag->u.cmdline.cmdline,

	strlcpy(default_command_line, tag->u.cmdline.cmdline,

		COMMAND_LINE_SIZE);

		COMMAND_LINE_SIZE);

arch/arm/kernel/hw_breakpoint.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -113,8 +113,8 @@ static u32 read_wb_reg(int n) 
	GEN_READ_WB_REG_CASES(ARM_OP2_WVR, val);

	GEN_READ_WB_REG_CASES(ARM_OP2_WVR, val);

	GEN_READ_WB_REG_CASES(ARM_OP2_WCR, val);

	GEN_READ_WB_REG_CASES(ARM_OP2_WCR, val);

	default:

	default:

		pr_warning("attempt to read from unknown breakpoint "

		pr_warn("attempt to read from unknown breakpoint register %d\n",

				"register %d\n", n);

			n);

	}

	}





	return val;

	return val;
@@ -128,8 +128,8 @@ static void write_wb_reg(int n, u32 val) 
	GEN_WRITE_WB_REG_CASES(ARM_OP2_WVR, val);

	GEN_WRITE_WB_REG_CASES(ARM_OP2_WVR, val);

	GEN_WRITE_WB_REG_CASES(ARM_OP2_WCR, val);

	GEN_WRITE_WB_REG_CASES(ARM_OP2_WCR, val);

	default:

	default:

		pr_warning("attempt to write to unknown breakpoint "

		pr_warn("attempt to write to unknown breakpoint register %d\n",

				"register %d\n", n);

			n);

	}

	}

	isb();

	isb();

}

}
@@ -292,7 +292,7 @@ int hw_breakpoint_slots(int type) 
	case TYPE_DATA:

	case TYPE_DATA:

		return get_num_wrps();

		return get_num_wrps();

	default:

	default:

		pr_warning("unknown slot type: %d\n", type);

		pr_warn("unknown slot type: %d\n", type);

		return 0;

		return 0;

	}

	}

}

}
@@ -365,7 +365,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp) 
	}

	}





	if (i == max_slots) {

	if (i == max_slots) {

		pr_warning("Can't find any breakpoint slot\n");

		pr_warn("Can't find any breakpoint slot\n");

		return -EBUSY;

		return -EBUSY;

	}

	}
@@ -417,7 +417,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp) 
	}

	}





	if (i == max_slots) {

	if (i == max_slots) {

		pr_warning("Can't find any breakpoint slot\n");

		pr_warn("Can't find any breakpoint slot\n");

		return;

		return;

	}

	}
@@ -894,7 +894,7 @@ static int debug_reg_trap(struct pt_regs *regs, unsigned int instr) 
{

{

	int cpu = smp_processor_id();

	int cpu = smp_processor_id();





	pr_warning("Debug register access (0x%x) caused undefined instruction on CPU %d\n",

	pr_warn("Debug register access (0x%x) caused undefined instruction on CPU %d\n",

		instr, cpu);

		instr, cpu);





	/* Set the error flag for this CPU and skip the faulting instruction. */

	/* Set the error flag for this CPU and skip the faulting instruction. */

arch/arm/kernel/irq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -205,8 +205,8 @@ void migrate_irqs(void) 
		raw_spin_unlock(&desc->lock);

		raw_spin_unlock(&desc->lock);





		if (affinity_broken && printk_ratelimit())

		if (affinity_broken && printk_ratelimit())

			pr_warning("IRQ%u no longer affine to CPU%u\n", i,

			pr_warn("IRQ%u no longer affine to CPU%u\n",

				smp_processor_id());

				i, smp_processor_id());

	}

	}





	local_irq_restore(flags);

	local_irq_restore(flags);

arch/arm/kernel/perf_event_cpu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) 
			 * continue. Otherwise, continue without this interrupt.

			 * continue. Otherwise, continue without this interrupt.

			 */

			 */

			if (irq_set_affinity(irq, cpumask_of(i)) && irqs > 1) {

			if (irq_set_affinity(irq, cpumask_of(i)) && irqs > 1) {

				pr_warning("unable to set irq affinity (irq=%d, cpu=%u)\n",

				pr_warn("unable to set irq affinity (irq=%d, cpu=%u)\n",

					irq, i);

					irq, i);

				continue;

				continue;

			}

			}