redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Magnus Damm 2009-03-12 21:05:51 +09:00 committed by Ingo Molnar
parent f21cfb258d
commit cbf94f0682
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/irq.h
View File

@ -236,7 +236,7 @@ typedef struct irq_desc irq_desc_t;
#include <asm/hw_irq.h>
extern int setup_irq(unsigned int irq, struct irqaction *new);
extern struct irqaction *remove_irq(unsigned int irq, void *dev_id);
extern void remove_irq(unsigned int irq, struct irqaction *act);
#ifdef CONFIG_GENERIC_HARDIRQS

26
kernel/irq/manage.c
View File

@ -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;
@ -633,6 +629,18 @@ struct irqaction *remove_irq(unsigned int irq, void *dev_id)
return action;
}
/**
* 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
@ -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);