diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-01 16:50:43 +0000 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-03-26 14:15:04 +0000 |
| commit | dfda9c27ba15330f37453c389d775ecf9e981d05 (patch) | |
| tree | c8b6eb3bcab3fc4f15d5949c858342cbfa56ef31 /drivers/regulator/wm831x-isink.c | |
| parent | 23c2f041efa891e6ec0706dc9ad4f776a9aa8c14 (diff) | |
| download | kernel_samsung_smdk4412-dfda9c27ba15330f37453c389d775ecf9e981d05.zip kernel_samsung_smdk4412-dfda9c27ba15330f37453c389d775ecf9e981d05.tar.gz kernel_samsung_smdk4412-dfda9c27ba15330f37453c389d775ecf9e981d05.tar.bz2 | |
regulator: Convert WM831x regulators to genirq
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/wm831x-isink.c')
| -rw-r--r-- | drivers/regulator/wm831x-isink.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c index 6c446cd..01f27c7 100644 --- a/drivers/regulator/wm831x-isink.c +++ b/drivers/regulator/wm831x-isink.c @@ -198,9 +198,8 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev) } irq = platform_get_irq(pdev, 0); - ret = wm831x_request_irq(wm831x, irq, wm831x_isink_irq, - IRQF_TRIGGER_RISING, isink->name, - isink); + ret = request_threaded_irq(irq, NULL, wm831x_isink_irq, + IRQF_TRIGGER_RISING, isink->name, isink); if (ret != 0) { dev_err(&pdev->dev, "Failed to request ISINK IRQ %d: %d\n", irq, ret); @@ -221,11 +220,10 @@ err: static __devexit int wm831x_isink_remove(struct platform_device *pdev) { struct wm831x_isink *isink = platform_get_drvdata(pdev); - struct wm831x *wm831x = isink->wm831x; platform_set_drvdata(pdev, NULL); - wm831x_free_irq(wm831x, platform_get_irq(pdev, 0), isink); + free_irq(platform_get_irq(pdev, 0), isink); regulator_unregister(isink->regulator); kfree(isink); |