Merge tag 'pull_req_20121122' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx...

[firefly-linux-kernel-4.4.55.git] / drivers / misc / eeprom / at24.c

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index ab1ad41786d118327a5cb7210486454430de8f8c..2baeec56edfe9432494d67814c9a57b4da9b916d 100644 (file)
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -656,7 +656,7 @@ err_out:
        return err;
 }
 
-static int __devexit at24_remove(struct i2c_client *client)
+static int at24_remove(struct i2c_client *client)
 {
        struct at24_data *at24;
        int i;
@@ -680,7 +680,7 @@ static struct i2c_driver at24_driver = {
                .owner = THIS_MODULE,
        },
        .probe = at24_probe,
-       .remove = __devexit_p(at24_remove),
+       .remove = at24_remove,
        .id_table = at24_ids,
 };