aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-12 08:05:51 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-12 08:16:33 -0400
commitcbf94f06824780183e4bba165c7c29d5c7bd9a51 (patch)
treee1cfa04aee8ba76d79737526061c706defb1552c /kernel/irq
parentf21cfb258df6dd3ea0b3e56d75c7e994edb81b35 (diff)
irq: match remove_irq() args with setup_irq()
Modify remove_irq() to match setup_irq(). Signed-off-by: Magnus Damm <damm@igel.co.jp> LKML-Reference: <20090312120551.2926.43942.sendpatchset@rx1.opensource.se> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/manage.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 8b069a7046e9..fc16570c9b46 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -550,15 +550,11 @@ int setup_irq(unsigned int irq, struct irqaction *act)
550 return __setup_irq(irq, desc, act); 550 return __setup_irq(irq, desc, act);
551} 551}
552 552
553/** 553 /*
554 * remove_irq - free an interrupt 554 * Internal function to unregister an irqaction - used to free
555 * @irq: Interrupt line to free 555 * regular and special interrupts that are part of the architecture.
556 * @dev_id: Device identity to free
557 *
558 * Used to remove interrupts statically setup by the early boot process.
559 */ 556 */
560 557static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
561struct irqaction *remove_irq(unsigned int irq, void *dev_id)
562{ 558{
563 struct irq_desc *desc = irq_to_desc(irq); 559 struct irq_desc *desc = irq_to_desc(irq);
564 struct irqaction *action, **action_ptr; 560 struct irqaction *action, **action_ptr;
@@ -634,6 +630,18 @@ struct irqaction *remove_irq(unsigned int irq, void *dev_id)
634} 630}
635 631
636/** 632/**
633 * remove_irq - free an interrupt
634 * @irq: Interrupt line to free
635 * @act: irqaction for the interrupt
636 *
637 * Used to remove interrupts statically setup by the early boot process.
638 */
639void remove_irq(unsigned int irq, struct irqaction *act)
640{
641 __free_irq(irq, act->dev_id);
642}
643
644/**
637 * free_irq - free an interrupt allocated with request_irq 645 * free_irq - free an interrupt allocated with request_irq
638 * @irq: Interrupt line to free 646 * @irq: Interrupt line to free
639 * @dev_id: Device identity to free 647 * @dev_id: Device identity to free
@@ -649,7 +657,7 @@ struct irqaction *remove_irq(unsigned int irq, void *dev_id)
649 */ 657 */
650void free_irq(unsigned int irq, void *dev_id) 658void free_irq(unsigned int irq, void *dev_id)
651{ 659{
652 kfree(remove_irq(irq, dev_id)); 660 kfree(__free_irq(irq, dev_id));
653} 661}
654EXPORT_SYMBOL(free_irq); 662EXPORT_SYMBOL(free_irq);
655 663