Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[~andy/linux] / drivers / power / max8997_charger.c

diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index 6e88c5d026b93485a942c3102cf27971cd64df1f..e757885b620c5c6cf00639fc6a5952631308041b 100644 (file)
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -86,7 +86,7 @@ static int max8997_battery_get_property(struct power_supply *psy,
        return 0;
 }
 
-static __devinit int max8997_battery_probe(struct platform_device *pdev)
+static int max8997_battery_probe(struct platform_device *pdev)
 {
        int ret = 0;
        struct charger_data *charger;
@@ -167,7 +167,7 @@ err:
        return ret;
 }
 
-static int __devexit max8997_battery_remove(struct platform_device *pdev)
+static int max8997_battery_remove(struct platform_device *pdev)
 {
        struct charger_data *charger = platform_get_drvdata(pdev);
 
@@ -187,7 +187,7 @@ static struct platform_driver max8997_battery_driver = {
                .owner = THIS_MODULE,
        },
        .probe = max8997_battery_probe,
-       .remove = __devexit_p(max8997_battery_remove),
+       .remove = max8997_battery_remove,
        .id_table = max8997_battery_id,
 };