Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[firefly-linux-kernel-4.4.55.git] / drivers / power / jz4740-battery.c

diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index fc7550d4d56807f72c5a135c96e7a8fe15838f6b..bf914893c6fd40e2a54423fd3352d6522f039288 100644 (file)
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -237,7 +237,7 @@ static void jz_battery_work(struct work_struct *work)
        schedule_delayed_work(&jz_battery->work, interval);
 }
 
-static int __devinit jz_battery_probe(struct platform_device *pdev)
+static int jz_battery_probe(struct platform_device *pdev)
 {
        int ret = 0;
        struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data;
@@ -353,7 +353,7 @@ err:
        return ret;
 }
 
-static int __devexit jz_battery_remove(struct platform_device *pdev)
+static int jz_battery_remove(struct platform_device *pdev)
 {
        struct jz_battery *jz_battery = platform_get_drvdata(pdev);
 
@@ -404,7 +404,7 @@ static const struct dev_pm_ops jz_battery_pm_ops = {
 
 static struct platform_driver jz_battery_driver = {
        .probe          = jz_battery_probe,
-       .remove         = __devexit_p(jz_battery_remove),
+       .remove         = jz_battery_remove,
        .driver = {
                .name = "jz4740-battery",
                .owner = THIS_MODULE,