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

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

diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c
index 74fad941c56c226c2d20ae667c37bd36191d65a7..8b6c4539e7f409cac61c885060a578467d0d1464 100644 (file)
--- a/drivers/power/ds2780_battery.c
+++ b/drivers/power/ds2780_battery.c
@@ -755,7 +755,7 @@ static const struct attribute_group ds2780_attr_group = {
        .attrs = ds2780_attributes,
 };
 
-static int __devinit ds2780_battery_probe(struct platform_device *pdev)
+static int ds2780_battery_probe(struct platform_device *pdev)
 {
        int ret = 0;
        struct ds2780_device_info *dev_info;
@@ -819,7 +819,7 @@ fail:
        return ret;
 }
 
-static int __devexit ds2780_battery_remove(struct platform_device *pdev)
+static int ds2780_battery_remove(struct platform_device *pdev)
 {
        struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
 
@@ -837,7 +837,7 @@ static struct platform_driver ds2780_battery_driver = {
                .name = "ds2780-battery",
        },
        .probe    = ds2780_battery_probe,
-       .remove   = __devexit_p(ds2780_battery_remove),
+       .remove   = ds2780_battery_remove,
 };
 
 module_platform_driver(ds2780_battery_driver);