aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/wm831x_power.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/wm831x_power.c')
-rw-r--r--drivers/power/wm831x_power.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index fc1ad9551182..3bed2f55cf7d 100644
--- 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)
489 return IRQ_HANDLED; 489 return IRQ_HANDLED;
490} 490}
491 491
492static __devinit int wm831x_power_probe(struct platform_device *pdev) 492static int wm831x_power_probe(struct platform_device *pdev)
493{ 493{
494 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); 494 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
495 struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data; 495 struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
@@ -625,7 +625,7 @@ err_kmalloc:
625 return ret; 625 return ret;
626} 626}
627 627
628static __devexit int wm831x_power_remove(struct platform_device *pdev) 628static int wm831x_power_remove(struct platform_device *pdev)
629{ 629{
630 struct wm831x_power *wm831x_power = platform_get_drvdata(pdev); 630 struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
631 struct wm831x *wm831x = wm831x_power->wm831x; 631 struct wm831x *wm831x = wm831x_power->wm831x;
@@ -654,7 +654,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)
654 654
655static struct platform_driver wm831x_power_driver = { 655static struct platform_driver wm831x_power_driver = {
656 .probe = wm831x_power_probe, 656 .probe = wm831x_power_probe,
657 .remove = __devexit_p(wm831x_power_remove), 657 .remove = wm831x_power_remove,
658 .driver = { 658 .driver = {
659 .name = "wm831x-power", 659 .name = "wm831x-power",
660 }, 660 },