63781394c5
request_any_context_irq() returns a negative value on failure.
It returns either IRQC_IS_HARDIRQ or IRQC_IS_NESTED on success.
So fix testing return value of request_any_context_irq().
Also fixup the return value of devm_request_any_context_irq() to make it
consistent with request_any_context_irq().
Fixes: 0668d30651 ("genirq: Add devm_request_any_context_irq()")
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1431334978.17783.4.camel@ingics.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
140 lines
4.0 KiB
C
140 lines
4.0 KiB
C
#include <linux/module.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/device.h>
|
|
#include <linux/gfp.h>
|
|
|
|
/*
|
|
* Device resource management aware IRQ request/free implementation.
|
|
*/
|
|
struct irq_devres {
|
|
unsigned int irq;
|
|
void *dev_id;
|
|
};
|
|
|
|
static void devm_irq_release(struct device *dev, void *res)
|
|
{
|
|
struct irq_devres *this = res;
|
|
|
|
free_irq(this->irq, this->dev_id);
|
|
}
|
|
|
|
static int devm_irq_match(struct device *dev, void *res, void *data)
|
|
{
|
|
struct irq_devres *this = res, *match = data;
|
|
|
|
return this->irq == match->irq && this->dev_id == match->dev_id;
|
|
}
|
|
|
|
/**
|
|
* devm_request_threaded_irq - allocate an interrupt line for a managed device
|
|
* @dev: device to request interrupt for
|
|
* @irq: Interrupt line to allocate
|
|
* @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
|
|
* @devname: An ascii name for the claiming device
|
|
* @dev_id: A cookie passed back to the handler function
|
|
*
|
|
* Except for the extra @dev argument, this function takes the
|
|
* same arguments and performs the same function as
|
|
* request_threaded_irq(). IRQs requested with this function will be
|
|
* automatically freed on driver detach.
|
|
*
|
|
* If an IRQ allocated with this function needs to be freed
|
|
* separately, devm_free_irq() must be used.
|
|
*/
|
|
int devm_request_threaded_irq(struct device *dev, unsigned int irq,
|
|
irq_handler_t handler, irq_handler_t thread_fn,
|
|
unsigned long irqflags, const char *devname,
|
|
void *dev_id)
|
|
{
|
|
struct irq_devres *dr;
|
|
int rc;
|
|
|
|
dr = devres_alloc(devm_irq_release, sizeof(struct irq_devres),
|
|
GFP_KERNEL);
|
|
if (!dr)
|
|
return -ENOMEM;
|
|
|
|
rc = request_threaded_irq(irq, handler, thread_fn, irqflags, devname,
|
|
dev_id);
|
|
if (rc) {
|
|
devres_free(dr);
|
|
return rc;
|
|
}
|
|
|
|
dr->irq = irq;
|
|
dr->dev_id = dev_id;
|
|
devres_add(dev, dr);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(devm_request_threaded_irq);
|
|
|
|
/**
|
|
* devm_request_any_context_irq - allocate an interrupt line for a managed device
|
|
* @dev: device to request interrupt for
|
|
* @irq: Interrupt line to allocate
|
|
* @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
|
|
* @devname: An ascii name for the claiming device
|
|
* @dev_id: A cookie passed back to the handler function
|
|
*
|
|
* Except for the extra @dev argument, this function takes the
|
|
* same arguments and performs the same function as
|
|
* request_any_context_irq(). IRQs requested with this function will be
|
|
* automatically freed on driver detach.
|
|
*
|
|
* If an IRQ allocated with this function needs to be freed
|
|
* separately, devm_free_irq() must be used.
|
|
*/
|
|
int devm_request_any_context_irq(struct device *dev, unsigned int irq,
|
|
irq_handler_t handler, unsigned long irqflags,
|
|
const char *devname, void *dev_id)
|
|
{
|
|
struct irq_devres *dr;
|
|
int rc;
|
|
|
|
dr = devres_alloc(devm_irq_release, sizeof(struct irq_devres),
|
|
GFP_KERNEL);
|
|
if (!dr)
|
|
return -ENOMEM;
|
|
|
|
rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id);
|
|
if (rc < 0) {
|
|
devres_free(dr);
|
|
return rc;
|
|
}
|
|
|
|
dr->irq = irq;
|
|
dr->dev_id = dev_id;
|
|
devres_add(dev, dr);
|
|
|
|
return rc;
|
|
}
|
|
EXPORT_SYMBOL(devm_request_any_context_irq);
|
|
|
|
/**
|
|
* devm_free_irq - free an interrupt
|
|
* @dev: device to free interrupt for
|
|
* @irq: Interrupt line to free
|
|
* @dev_id: Device identity to free
|
|
*
|
|
* Except for the extra @dev argument, this function takes the
|
|
* same arguments and performs the same function as free_irq().
|
|
* This function instead of free_irq() should be used to manually
|
|
* free IRQs allocated with devm_request_irq().
|
|
*/
|
|
void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id)
|
|
{
|
|
struct irq_devres match_data = { irq, dev_id };
|
|
|
|
WARN_ON(devres_destroy(dev, devm_irq_release, devm_irq_match,
|
|
&match_data));
|
|
free_irq(irq, dev_id);
|
|
}
|
|
EXPORT_SYMBOL(devm_free_irq);
|