A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

irq: match remove_irq() args with setup_irq()

Browse source 
Modify remove_irq() to match setup_irq().

Signed-off-by: Magnus Damm <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Magnus Damm 2009-03-12 21:05:51 +09:00 • committed by Ingo Molnar
commit cbf94f0682
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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);