Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / ad7414.c

diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
index b420fb3f3a71b78f66aec7991dea181f4f51d022..f3a5d4764eb95be740066d7aaf94ea2a5db3c0a2 100644 (file)
--- a/drivers/hwmon/ad7414.c
+++ b/drivers/hwmon/ad7414.c
@@ -226,7 +226,7 @@ exit_remove:
        return err;
 }
 
-static int __devexit ad7414_remove(struct i2c_client *client)
+static int ad7414_remove(struct i2c_client *client)
 {
        struct ad7414_data *data = i2c_get_clientdata(client);
 
@@ -246,7 +246,7 @@ static struct i2c_driver ad7414_driver = {
                .name   = "ad7414",
        },
        .probe  = ad7414_probe,
-       .remove = __devexit_p(ad7414_remove),
+       .remove = ad7414_remove,
        .id_table = ad7414_id,
 };