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

Commit 935bd5b9 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Thomas Gleixner
Browse files

genirq: add support for threaded interrupts to devres 



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: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3aa551c9

include/linux/interrupt.h

+14 −3
Original line number Original line Diff line number Diff line
@@ -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);





/*

/*

kernel/irq/devres.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -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