Skip to content

Commit

Permalink
kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks
Browse files Browse the repository at this point in the history
Use the module-wide pr_fmt() mechanism rather than open-coding "genirq: "
everywhere.

Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
akpm00 authored and torvalds committed Jun 1, 2012
1 parent 499eea6 commit 97fd75b
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* This file contains driver APIs to the irq subsystem.
*/

#define pr_fmt(fmt) "genirq: " fmt

#include <linux/irq.h>
#include <linux/kthread.h>
#include <linux/module.h>
Expand Down Expand Up @@ -565,7 +567,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
* IRQF_TRIGGER_* but the PIC does not support multiple
* flow-types?
*/
pr_debug("genirq: No set_type function for IRQ %d (%s)\n", irq,
pr_debug("No set_type function for IRQ %d (%s)\n", irq,
chip ? (chip->name ? : "unknown") : "unknown");
return 0;
}
Expand Down Expand Up @@ -600,7 +602,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
ret = 0;
break;
default:
pr_err("genirq: Setting trigger mode %lu for irq %u failed (%pF)\n",
pr_err("Setting trigger mode %lu for irq %u failed (%pF)\n",
flags, irq, chip->irq_set_type);
}
if (unmask)
Expand Down Expand Up @@ -837,7 +839,7 @@ void exit_irq_thread(void)

action = kthread_data(tsk);

pr_err("genirq: exiting task \"%s\" (%d) is an active IRQ thread (irq %d)\n",
pr_err("exiting task \"%s\" (%d) is an active IRQ thread (irq %d)\n",
tsk->comm ? tsk->comm : "", tsk->pid, action->irq);

desc = irq_to_desc(action->irq);
Expand Down Expand Up @@ -1044,7 +1046,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
* has. The type flags are unreliable as the
* underlying chip implementation can override them.
*/
pr_err("genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq %d\n",
pr_err("Threaded irq requested with handler=NULL and !ONESHOT for irq %d\n",
irq);
ret = -EINVAL;
goto out_mask;
Expand Down Expand Up @@ -1095,7 +1097,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("genirq: irq %d uses trigger mode %u; requested %u\n",
pr_warning("irq %d uses trigger mode %u; requested %u\n",
irq, nmsk, omsk);
}

Expand Down Expand Up @@ -1133,7 +1135,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)

mismatch:
if (!(new->flags & IRQF_PROBE_SHARED)) {
pr_err("genirq: Flags mismatch irq %d. %08x (%s) vs. %08x (%s)\n",
pr_err("Flags mismatch irq %d. %08x (%s) vs. %08x (%s)\n",
irq, new->flags, new->name, old->flags, old->name);
#ifdef CONFIG_DEBUG_SHIRQ
dump_stack();
Expand Down

0 comments on commit 97fd75b

Please sign in to comment.