lkml.org 
[lkml]   [2009]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] mfd: Convert WM8350 to use request_threaded_irq()
    Date
    Instead of hand rolling our own variant.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    ---
    drivers/mfd/wm8350-core.c | 24 ++++++------------------
    include/linux/mfd/wm8350/core.h | 1 -
    2 files changed, 6 insertions(+), 19 deletions(-)

    diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
    index 9d662a5..ba27c9d 100644
    --- a/drivers/mfd/wm8350-core.c
    +++ b/drivers/mfd/wm8350-core.c
    @@ -353,15 +353,15 @@ static void wm8350_irq_call_handler(struct wm8350 *wm8350, int irq)
    }

    /*
    - * wm8350_irq_worker actually handles the interrupts. Since all
    + * This is a threaded IRQ handler so can access I2C/SPI. Since all
    * interrupts are clear on read the IRQ line will be reasserted and
    * the physical IRQ will be handled again if another interrupt is
    * asserted while we run - in the normal course of events this is a
    * rare occurrence so we save I2C/SPI reads.
    */
    -static void wm8350_irq_worker(struct work_struct *work)
    +static irqreturn_t wm8350_irq(int irq, void *data)
    {
    - struct wm8350 *wm8350 = container_of(work, struct wm8350, irq_work);
    + struct wm8350 *wm8350 = data;
    u16 level_one, status1, status2, comp;

    /* TODO: Use block reads to improve performance? */
    @@ -552,16 +552,6 @@ static void wm8350_irq_worker(struct work_struct *work)
    }
    }

    - enable_irq(wm8350->chip_irq);
    -}
    -
    -static irqreturn_t wm8350_irq(int irq, void *data)
    -{
    - struct wm8350 *wm8350 = data;
    -
    - disable_irq_nosync(irq);
    - schedule_work(&wm8350->irq_work);
    -
    return IRQ_HANDLED;
    }

    @@ -1428,9 +1418,8 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,

    mutex_init(&wm8350->auxadc_mutex);
    mutex_init(&wm8350->irq_mutex);
    - INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
    if (irq) {
    - int flags = 0;
    + int flags = IRQF_ONESHOT;

    if (pdata && pdata->irq_high) {
    flags |= IRQF_TRIGGER_HIGH;
    @@ -1444,8 +1433,8 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
    WM8350_IRQ_POL);
    }

    - ret = request_irq(irq, wm8350_irq, flags,
    - "wm8350", wm8350);
    + ret = request_threaded_irq(irq, NULL, wm8350_irq, flags,
    + "wm8350", wm8350);
    if (ret != 0) {
    dev_err(wm8350->dev, "Failed to request IRQ: %d\n",
    ret);
    @@ -1505,7 +1494,6 @@ void wm8350_device_exit(struct wm8350 *wm8350)
    platform_device_unregister(wm8350->codec.pdev);

    free_irq(wm8350->chip_irq, wm8350);
    - flush_work(&wm8350->irq_work);
    kfree(wm8350->reg_cache);
    }
    EXPORT_SYMBOL_GPL(wm8350_device_exit);
    diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h
    index 969b0b5..1d595de 100644
    --- a/include/linux/mfd/wm8350/core.h
    +++ b/include/linux/mfd/wm8350/core.h
    @@ -626,7 +626,6 @@ struct wm8350 {
    struct mutex auxadc_mutex;

    /* Interrupt handling */
    - struct work_struct irq_work;
    struct mutex irq_mutex; /* IRQ table mutex */
    struct wm8350_irq irq[WM8350_NUM_IRQ];
    int chip_irq;
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2009-09-16 20:09    [W:0.064 / U:30.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site