leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: 8152/1: Convert pr_warning to pr_warn

Browse Source 
Use the more common pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Joe Perches
2014-09-16 20:41:43 +01:00
committed by Russell King
parent 9f9ec08cf9
commit 8b521cb294
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/syscall.h
View File

@@ -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;
} }

2
arch/arm/kernel/atags_parse.c
View File

@@ -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);

16
arch/arm/kernel/hw_breakpoint.c
View File

@@ -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. */

4
arch/arm/kernel/irq.c
View File

@@ -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);

2
arch/arm/kernel/perf_event_cpu.c
View File

@@ -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;
} }

2
arch/arm/kernel/smp.c
View File

@@ -646,7 +646,7 @@ void smp_send_stop(void)
udelay(1); udelay(1);
if (num_online_cpus() > 1) if (num_online_cpus() > 1)
pr_warning("SMP: failed to stop secondary CPUs\n"); pr_warn("SMP: failed to stop secondary CPUs\n");
} }
/* /*

16
arch/arm/kernel/unwind.c
View File

@@ -157,7 +157,7 @@ static const struct unwind_idx *search_index(unsigned long addr,
if (likely(start->addr_offset <= addr_prel31)) if (likely(start->addr_offset <= addr_prel31))
return start; return start;
else { else {
pr_warning("unwind: Unknown symbol address %08lx\n", addr); pr_warn("unwind: Unknown symbol address %08lx\n", addr);
return NULL; return NULL;
} }
} }
@@ -225,7 +225,7 @@ static unsigned long unwind_get_byte(struct unwind_ctrl_block *ctrl)
unsigned long ret; unsigned long ret;
if (ctrl->entries <= 0) { if (ctrl->entries <= 0) {
pr_warning("unwind: Corrupt unwind table\n"); pr_warn("unwind: Corrupt unwind table\n");
return 0; return 0;
} }
@@ -333,7 +333,7 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl)
insn = (insn << 8) | unwind_get_byte(ctrl); insn = (insn << 8) | unwind_get_byte(ctrl);
mask = insn & 0x0fff; mask = insn & 0x0fff;
if (mask == 0) { if (mask == 0) {
pr_warning("unwind: 'Refuse to unwind' instruction %04lx\n", pr_warn("unwind: 'Refuse to unwind' instruction %04lx\n",
insn); insn);
return -URC_FAILURE; return -URC_FAILURE;
} }
@@ -357,7 +357,7 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl)
unsigned long mask = unwind_get_byte(ctrl); unsigned long mask = unwind_get_byte(ctrl);
if (mask == 0 || mask & 0xf0) { if (mask == 0 || mask & 0xf0) {
pr_warning("unwind: Spare encoding %04lx\n", pr_warn("unwind: Spare encoding %04lx\n",
(insn << 8) | mask); (insn << 8) | mask);
return -URC_FAILURE; return -URC_FAILURE;
} }
@@ -370,7 +370,7 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl)
ctrl->vrs[SP] += 0x204 + (uleb128 << 2); ctrl->vrs[SP] += 0x204 + (uleb128 << 2);
} else { } else {
pr_warning("unwind: Unhandled instruction %02lx\n", insn); pr_warn("unwind: Unhandled instruction %02lx\n", insn);
return -URC_FAILURE; return -URC_FAILURE;
} }
@@ -403,7 +403,7 @@ int unwind_frame(struct stackframe *frame)
idx = unwind_find_idx(frame->pc); idx = unwind_find_idx(frame->pc);
if (!idx) { if (!idx) {
pr_warning("unwind: Index not found %08lx\n", frame->pc); pr_warn("unwind: Index not found %08lx\n", frame->pc);
return -URC_FAILURE; return -URC_FAILURE;
} }
@@ -422,7 +422,7 @@ int unwind_frame(struct stackframe *frame)
/* only personality routine 0 supported in the index */ /* only personality routine 0 supported in the index */
ctrl.insn = &idx->insn; ctrl.insn = &idx->insn;
else { else {
pr_warning("unwind: Unsupported personality routine %08lx in the index at %p\n", pr_warn("unwind: Unsupported personality routine %08lx in the index at %p\n",
idx->insn, idx); idx->insn, idx);
return -URC_FAILURE; return -URC_FAILURE;
} }
@@ -435,7 +435,7 @@ int unwind_frame(struct stackframe *frame)
ctrl.byte = 1; ctrl.byte = 1;
ctrl.entries = 1 + ((*ctrl.insn & 0x00ff0000) >> 16); ctrl.entries = 1 + ((*ctrl.insn & 0x00ff0000) >> 16);
} else { } else {
pr_warning("unwind: Unsupported personality routine %08lx at %p\n", pr_warn("unwind: Unsupported personality routine %08lx at %p\n",
*ctrl.insn, ctrl.insn); *ctrl.insn, ctrl.insn);
return -URC_FAILURE; return -URC_FAILURE;
} }

2
arch/arm/mm/idmap.c
View File

@@ -27,7 +27,7 @@ static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,
if (pud_none_or_clear_bad(pud) || (pud_val(*pud) & L_PGD_SWAPPER)) { if (pud_none_or_clear_bad(pud) || (pud_val(*pud) & L_PGD_SWAPPER)) {
pmd = pmd_alloc_one(&init_mm, addr); pmd = pmd_alloc_one(&init_mm, addr);
if (!pmd) { if (!pmd) {
pr_warning("Failed to allocate identity pmd.\n"); pr_warn("Failed to allocate identity pmd.\n");
return; return;
} }
/* /*

4
arch/arm/mm/mmu.c
View File

@@ -223,13 +223,13 @@ early_param("ecc", early_ecc);
static int __init early_cachepolicy(char *p) static int __init early_cachepolicy(char *p)
{ {
pr_warning("cachepolicy kernel parameter not supported without cp15\n"); pr_warn("cachepolicy kernel parameter not supported without cp15\n");
} }
early_param("cachepolicy", early_cachepolicy); early_param("cachepolicy", early_cachepolicy);
static int __init noalign_setup(char *__unused) static int __init noalign_setup(char *__unused)
{ {
pr_warning("noalign kernel parameter not supported without cp15\n"); pr_warn("noalign kernel parameter not supported without cp15\n");
} }
__setup("noalign", noalign_setup); __setup("noalign", noalign_setup);