diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 05:21:37 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 05:21:37 -0500 |
commit | 327ec5699c29454322d0136375f717f509c145b6 (patch) | |
tree | 6d7903906cd8e40c6075b695d29e1cf428319bd4 /kernel/irq/manage.c | |
parent | 0e43785c57fee50fbc00ea0378e941efb61fa0c2 (diff) |
irq: clean up manage.c
- make printk message git-greppable
- fix a few style details
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 1c5055069170..8f4bc61f0df9 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -397,7 +397,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, | |||
397 | * allocate special interrupts that are part of the architecture. | 397 | * allocate special interrupts that are part of the architecture. |
398 | */ | 398 | */ |
399 | static int | 399 | static int |
400 | __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new) | 400 | __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) |
401 | { | 401 | { |
402 | struct irqaction *old, **p; | 402 | struct irqaction *old, **p; |
403 | const char *old_name = NULL; | 403 | const char *old_name = NULL; |
@@ -687,11 +687,12 @@ int request_irq(unsigned int irq, irq_handler_t handler, | |||
687 | * the behavior is classified as "will not fix" so we need to | 687 | * the behavior is classified as "will not fix" so we need to |
688 | * start nudging drivers away from using that idiom. | 688 | * start nudging drivers away from using that idiom. |
689 | */ | 689 | */ |
690 | if ((irqflags & (IRQF_SHARED|IRQF_DISABLED)) | 690 | if ((irqflags & (IRQF_SHARED|IRQF_DISABLED)) == |
691 | == (IRQF_SHARED|IRQF_DISABLED)) | 691 | (IRQF_SHARED|IRQF_DISABLED)) { |
692 | pr_warning("IRQ %d/%s: IRQF_DISABLED is not " | 692 | pr_warning( |
693 | "guaranteed on shared IRQs\n", | 693 | "IRQ %d/%s: IRQF_DISABLED is not guaranteed on shared IRQs\n", |
694 | irq, devname); | 694 | irq, devname); |
695 | } | ||
695 | 696 | ||
696 | #ifdef CONFIG_LOCKDEP | 697 | #ifdef CONFIG_LOCKDEP |
697 | /* | 698 | /* |