adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

genirq: add support for threaded interrupts to devres

Browse source 
Some devices use devres_request_irq() for to install their interrupt
handler. Add support for threaded interrupts to devres as well.

[tglx - simplified and adapted to latest threadirq version]

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Arjan van de Ven 2009-03-23 18:28:16 +01:00 committed by Thomas Gleixner
parent 3aa551c9b4
commit 935bd5b971
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/linux/interrupt.h
View file

@ -123,9 +123,20 @@ extern void free_irq(unsigned int, void *);
struct device; struct device;
extern int __must_check devm_request_irq(struct device *dev, unsigned int irq, extern int __must_check
irq_handler_t handler, unsigned long irqflags, devm_request_threaded_irq(struct device *dev, unsigned int irq,
const char *devname, void *dev_id); irq_handler_t handler, irq_handler_t thread_fn,
unsigned long irqflags, const char *devname,
void *dev_id);
static inline int __must_check
devm_request_irq(struct device *dev, unsigned int irq, irq_handler_t handler,
unsigned long irqflags, const char *devname, void *dev_id)
{
return devm_request_threaded_irq(dev, irq, handler, NULL, irqflags,
devname, dev_id);
}
extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id); extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
/* /*

16
kernel/irq/devres.c
View file

@ -26,10 +26,12 @@ static int devm_irq_match(struct device *dev, void *res, void *data)
} }
/** /**
* devm_request_irq - allocate an interrupt line for a managed device * devm_request_threaded_irq - allocate an interrupt line for a managed device
* @dev: device to request interrupt for * @dev: device to request interrupt for
* @irq: Interrupt line to allocate * @irq: Interrupt line to allocate
* @handler: Function to be called when the IRQ occurs * @handler: Function to be called when the IRQ occurs
* @thread_fn: function to be called in a threaded interrupt context. NULL
* for devices which handle everything in @handler
* @irqflags: Interrupt type flags * @irqflags: Interrupt type flags
* @devname: An ascii name for the claiming device * @devname: An ascii name for the claiming device
* @dev_id: A cookie passed back to the handler function * @dev_id: A cookie passed back to the handler function
@ -42,9 +44,10 @@ static int devm_irq_match(struct device *dev, void *res, void *data)
* If an IRQ allocated with this function needs to be freed * If an IRQ allocated with this function needs to be freed
* separately, dev_free_irq() must be used. * separately, dev_free_irq() must be used.
*/ */
int devm_request_irq(struct device *dev, unsigned int irq, int devm_request_threaded_irq(struct device *dev, unsigned int irq,
irq_handler_t handler, unsigned long irqflags, irq_handler_t handler, irq_handler_t thread_fn,
const char *devname, void *dev_id) unsigned long irqflags, const char *devname,
void *dev_id)
{ {
struct irq_devres *dr; struct irq_devres *dr;
int rc; int rc;
@ -54,7 +57,8 @@ int devm_request_irq(struct device *dev, unsigned int irq,
if (!dr) if (!dr)
return -ENOMEM; return -ENOMEM;
rc = request_irq(irq, handler, irqflags, devname, dev_id); rc = request_threaded_irq(irq, handler, thread_fn, irqflags, devname,
dev_id);
if (rc) { if (rc) {
devres_free(dr); devres_free(dr);
return rc; return rc;
@ -66,7 +70,7 @@ int devm_request_irq(struct device *dev, unsigned int irq,
return 0; return 0;
} }
EXPORT_SYMBOL(devm_request_irq); EXPORT_SYMBOL(devm_request_threaded_irq);
/** /**
* devm_free_irq - free an interrupt * devm_free_irq - free an interrupt