lkml.org 
[lkml]   [2012]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH RFT 4/4] regulator: wm831x-dcdc: Convert to devm_request_threaded_irq
    From
    Date
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/wm831x-dcdc.c | 35 ++++++++++++-----------------------
    1 file changed, 12 insertions(+), 23 deletions(-)

    diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
    index eea53e1..5ec10d7 100644
    --- a/drivers/regulator/wm831x-dcdc.c
    +++ b/drivers/regulator/wm831x-dcdc.c
    @@ -532,8 +532,9 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
    }

    irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
    - ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
    - IRQF_TRIGGER_RISING, dcdc->name, dcdc);
    + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
    + wm831x_dcdc_uv_irq, IRQF_TRIGGER_RISING,
    + dcdc->name, dcdc);
    if (ret != 0) {
    dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
    irq, ret);
    @@ -541,8 +542,9 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
    }

    irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC"));
    - ret = request_threaded_irq(irq, NULL, wm831x_dcdc_oc_irq,
    - IRQF_TRIGGER_RISING, dcdc->name, dcdc);
    + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
    + wm831x_dcdc_oc_irq, IRQF_TRIGGER_RISING,
    + dcdc->name, dcdc);
    if (ret != 0) {
    dev_err(&pdev->dev, "Failed to request HC IRQ %d: %d\n",
    irq, ret);
    @@ -554,8 +556,6 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
    return 0;

    err_uv:
    - free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
    - dcdc);
    err_regulator:
    regulator_unregister(dcdc->regulator);
    err:
    @@ -567,14 +567,8 @@ err:
    static __devexit int wm831x_buckv_remove(struct platform_device *pdev)
    {
    struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
    - struct wm831x *wm831x = dcdc->wm831x;

    platform_set_drvdata(pdev, NULL);
    -
    - free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC")),
    - dcdc);
    - free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
    - dcdc);
    regulator_unregister(dcdc->regulator);
    if (dcdc->dvs_gpio)
    gpio_free(dcdc->dvs_gpio);
    @@ -694,8 +688,9 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
    }

    irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
    - ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
    - IRQF_TRIGGER_RISING, dcdc->name, dcdc);
    + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
    + wm831x_dcdc_uv_irq, IRQF_TRIGGER_RISING,
    + dcdc->name, dcdc);
    if (ret != 0) {
    dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
    irq, ret);
    @@ -717,9 +712,6 @@ static __devexit int wm831x_buckp_remove(struct platform_device *pdev)
    struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);

    platform_set_drvdata(pdev, NULL);
    -
    - free_irq(wm831x_irq(dcdc->wm831x, platform_get_irq_byname(pdev, "UV")),
    - dcdc);
    regulator_unregister(dcdc->regulator);

    return 0;
    @@ -828,9 +820,9 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
    }

    irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
    - ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
    - IRQF_TRIGGER_RISING, dcdc->name,
    - dcdc);
    + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
    + wm831x_dcdc_uv_irq, IRQF_TRIGGER_RISING,
    + dcdc->name, dcdc);
    if (ret != 0) {
    dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
    irq, ret);
    @@ -852,9 +844,6 @@ static __devexit int wm831x_boostp_remove(struct platform_device *pdev)
    struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);

    platform_set_drvdata(pdev, NULL);
    -
    - free_irq(wm831x_irq(dcdc->wm831x, platform_get_irq_byname(pdev, "UV")),
    - dcdc);
    regulator_unregister(dcdc->regulator);

    return 0;
    --
    1.7.9.5




    \
     
     \ /
      Last update: 2012-06-12 05:01    [W:0.028 / U:32.848 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site