summaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-12 21:05:51 +0900
committerIngo Molnar <mingo@elte.hu>2009-03-12 13:16:33 +0100
commitcbf94f06824780183e4bba165c7c29d5c7bd9a51 (patch)
treee1cfa04aee8ba76d79737526061c706defb1552c /kernel/irq
parentf21cfb258df6dd3ea0b3e56d75c7e994edb81b35 (diff)
downloadop-kernel-dev-cbf94f06824780183e4bba165c7c29d5c7bd9a51.zip
op-kernel-dev-cbf94f06824780183e4bba165c7c29d5c7bd9a51.tar.gz
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 8b069a7..fc16570 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -550,15 +550,11 @@ int setup_irq(unsigned int irq, struct irqaction *act)
return __setup_irq(irq, desc, act);
}
-/**
- * remove_irq - free an interrupt
- * @irq: Interrupt line to free
- * @dev_id: Device identity to free
- *
- * Used to remove interrupts statically setup by the early boot process.
+ /*
+ * Internal function to unregister an irqaction - used to free
+ * regular and special interrupts that are part of the architecture.
*/
-
-struct irqaction *remove_irq(unsigned int irq, void *dev_id)
+static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
{
struct irq_desc *desc = irq_to_desc(irq);
struct irqaction *action, **action_ptr;
@@ -634,6 +630,18 @@ struct irqaction *remove_irq(unsigned int irq, void *dev_id)
}
/**
+ * remove_irq - free an interrupt
+ * @irq: Interrupt line to free
+ * @act: irqaction for the interrupt
+ *
+ * Used to remove interrupts statically setup by the early boot process.
+ */
+void remove_irq(unsigned int irq, struct irqaction *act)
+{
+ __free_irq(irq, act->dev_id);
+}
+
+/**
* free_irq - free an interrupt allocated with request_irq
* @irq: Interrupt line to free
* @dev_id: Device identity to free
@@ -649,7 +657,7 @@ struct irqaction *remove_irq(unsigned int irq, void *dev_id)
*/
void free_irq(unsigned int irq, void *dev_id)
{
- kfree(remove_irq(irq, dev_id));
+ kfree(__free_irq(irq, dev_id));
}
EXPORT_SYMBOL(free_irq);
OpenPOWER on IntegriCloud