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

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

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 66b2c7b509149beefe5ea7f4e3e6c3f31366b46f..d664ef58afa7d0ffd34d03e89444cd015f31ab7d 100644 (file)
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -682,7 +682,7 @@ max17042_get_pdata(struct device *dev)
 }
 #endif
 
-static int __devinit max17042_probe(struct i2c_client *client,
+static int max17042_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@@ -776,7 +776,7 @@ static int __devinit max17042_probe(struct i2c_client *client,
        return 0;
 }
 
-static int __devexit max17042_remove(struct i2c_client *client)
+static int max17042_remove(struct i2c_client *client)
 {
        struct max17042_chip *chip = i2c_get_clientdata(client);
 
@@ -852,7 +852,7 @@ static struct i2c_driver max17042_i2c_driver = {
                .pm     = MAX17042_PM_OPS,
        },
        .probe          = max17042_probe,
-       .remove         = __devexit_p(max17042_remove),
+       .remove         = max17042_remove,
        .id_table       = max17042_id,
 };
 module_i2c_driver(max17042_i2c_driver);