git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
drivers
/
regulator
/
wm831x-isink.c
diff --git
a/drivers/regulator/wm831x-isink.c
b/drivers/regulator/wm831x-isink.c
index
6c446cd
..
01f27c7
100644
(file)
--- 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);
}
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);
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);
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);
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);
regulator_unregister(isink->regulator);
kfree(isink);