lkml.org 
[lkml]   [2007]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/13] devres: implement managed IRQ interface
    Date
    From
    Implement managed IRQ interface - devm_request_irq() and
    devm_free_irq(). Except for the first @dev argument and being
    managed, these take the same arguments and have the same effect as
    non-managed coutnerparts.

    Signed-off-by: Tejun Heo <htejun@gmail.com>
    ---
    include/linux/interrupt.h | 6 +++
    kernel/irq/manage.c | 86 +++++++++++++++++++++++++++++++++++++++++++++
    2 files changed, 92 insertions(+), 0 deletions(-)

    diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
    index e36e86c..5a8ba0b 100644
    --- a/include/linux/interrupt.h
    +++ b/include/linux/interrupt.h
    @@ -12,6 +12,7 @@
    #include <linux/sched.h>
    #include <linux/irqflags.h>
    #include <linux/bottom_half.h>
    +#include <linux/device.h>
    #include <asm/atomic.h>
    #include <asm/ptrace.h>
    #include <asm/system.h>
    @@ -83,6 +84,11 @@ extern int request_irq(unsigned int, irq_handler_t handler,
    unsigned long, const char *, void *);
    extern void free_irq(unsigned int, void *);

    +extern int devm_request_irq(struct device *dev, unsigned int irq,
    + irq_handler_t handler, unsigned long irqflags,
    + const char *devname, void *dev_id);
    +extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
    +
    /*
    * On lockdep we dont want to enable hardirqs in hardirq
    * context. Use local_irq_enable_in_hardirq() to annotate
    diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
    index b385878..9aa6544 100644
    --- a/kernel/irq/manage.c
    +++ b/kernel/irq/manage.c
    @@ -479,3 +479,89 @@ int request_irq(unsigned int irq, irq_handler_t handler,
    return retval;
    }
    EXPORT_SYMBOL(request_irq);
    +
    +/*
    + * 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_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
    + * @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_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, dev_free_irq() must be used.
    + */
    +int devm_request_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_irq(irq, handler, irqflags, devname, dev_id);
    + if (rc) {
    + kfree(dr);
    + return rc;
    + }
    +
    + dr->irq = irq;
    + dr->dev_id = dev_id;
    + devres_add(dev, dr);
    +
    + return 0;
    +}
    +EXPORT_SYMBOL(devm_request_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 dev_request_irq().
    + */
    +void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id)
    +{
    + struct irq_devres match_data = { irq, dev_id };
    +
    + free_irq(irq, dev_id);
    + WARN_ON(devres_destroy(dev, devm_irq_release, devm_irq_match,
    + &match_data));
    +}
    +EXPORT_SYMBOL(devm_free_irq);
    --
    1.4.4.3

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-01-10 07:01    [W:0.026 / U:0.312 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site