Merge tag 'please-pull-vm_unwrapped' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / misc / isl29003.c

diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
index eb5de2e210d742ff1d7902c4fd7c8b2156a4f555..29b306c6bdb3bbf3d5e4c2b225984d9572acdd10 100644 (file)
--- a/drivers/misc/isl29003.c
+++ b/drivers/misc/isl29003.c
@@ -365,7 +365,7 @@ static int isl29003_init_client(struct i2c_client *client)
  * I2C layer
  */
 
-static int __devinit isl29003_probe(struct i2c_client *client,
+static int isl29003_probe(struct i2c_client *client,
                                    const struct i2c_device_id *id)
 {
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@@ -401,7 +401,7 @@ exit_kfree:
        return err;
 }
 
-static int __devexit isl29003_remove(struct i2c_client *client)
+static int isl29003_remove(struct i2c_client *client)
 {
        sysfs_remove_group(&client->dev.kobj, &isl29003_attr_group);
        isl29003_set_power_state(client, 0);
@@ -451,7 +451,7 @@ static struct i2c_driver isl29003_driver = {
        .suspend = isl29003_suspend,
        .resume = isl29003_resume,
        .probe  = isl29003_probe,
-       .remove = __devexit_p(isl29003_remove),
+       .remove = isl29003_remove,
        .id_table = isl29003_id,
 };