Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git...

[karo-tx-linux.git] / drivers / power / wm831x_power.c

diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index fc1ad9551182602f8d485d5e18a2f56e0b057908..3bed2f55cf7d1532cfb1552c6c7c95a15d228098 100644 (file)
--- a/drivers/power/wm831x_power.c
+++ b/drivers/power/wm831x_power.c
@@ -489,7 +489,7 @@ static irqreturn_t wm831x_pwr_src_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static __devinit int wm831x_power_probe(struct platform_device *pdev)
+static int wm831x_power_probe(struct platform_device *pdev)
 {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
@@ -625,7 +625,7 @@ err_kmalloc:
        return ret;
 }
 
-static __devexit int wm831x_power_remove(struct platform_device *pdev)
+static int wm831x_power_remove(struct platform_device *pdev)
 {
        struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
        struct wm831x *wm831x = wm831x_power->wm831x;
@@ -654,7 +654,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_power_driver = {
        .probe = wm831x_power_probe,
-       .remove = __devexit_p(wm831x_power_remove),
+       .remove = wm831x_power_remove,
        .driver = {
                .name = "wm831x-power",
        },