Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf94f06 authored by Magnus Damm's avatar Magnus Damm Committed by Ingo Molnar
Browse files

irq: match remove_irq() args with setup_irq() 



Modify remove_irq() to match setup_irq().

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
LKML-Reference: <20090312120551.2926.43942.sendpatchset@rx1.opensource.se>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f21cfb25

include/linux/irq.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -236,7 +236,7 @@ typedef struct irq_desc irq_desc_t; 
#include <asm/hw_irq.h>

#include <asm/hw_irq.h>





extern int setup_irq(unsigned int irq, struct irqaction *new);

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

#ifdef CONFIG_GENERIC_HARDIRQS

kernel/irq/manage.c

+17 −9
Original line number Original line Diff line number Diff line
@@ -550,15 +550,11 @@ int setup_irq(unsigned int irq, struct irqaction *act) 
	return __setup_irq(irq, desc, act);

	return __setup_irq(irq, desc, act);

}

}





/**

 /*

 *	remove_irq - free an interrupt

 * Internal function to unregister an irqaction - used to free

 *	@irq: Interrupt line to free

 * regular and special interrupts that are part of the architecture.

 *	@dev_id: Device identity to free

 *

 * Used to remove interrupts statically setup by the early boot process.

 */

 */



static struct irqaction *__free_irq(unsigned int irq, void *dev_id)

struct irqaction *remove_irq(unsigned int irq, void *dev_id)

{

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_desc *desc = irq_to_desc(irq);

	struct irqaction *action, **action_ptr;

	struct irqaction *action, **action_ptr;
@@ -633,6 +629,18 @@ struct irqaction *remove_irq(unsigned int irq, void *dev_id) 
	return action;

	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

 *	free_irq - free an interrupt allocated with request_irq

 *	@irq: Interrupt line to free

 *	@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)

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

EXPORT_SYMBOL(free_irq);