Merge tag 'v3.8-rc7' into regulator-core

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / mpr121_touchkey.c

diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
index 38b1c0f72ed3828f309e327314b2ca655f698167..f7f3e9a9fd3f5c4b63234fd63b750f10b327afb0 100644 (file)
--- a/drivers/input/keyboard/mpr121_touchkey.c
+++ b/drivers/input/keyboard/mpr121_touchkey.c
@@ -123,7 +123,7 @@ out:
        return IRQ_HANDLED;
 }
 
-static int __devinit mpr121_phys_init(const struct mpr121_platform_data *pdata,
+static int mpr121_phys_init(const struct mpr121_platform_data *pdata,
                                      struct mpr121_touchkey *mpr121,
                                      struct i2c_client *client)
 {
@@ -185,8 +185,8 @@ err_i2c_write:
        return ret;
 }
 
-static int __devinit mpr_touchkey_probe(struct i2c_client *client,
-                                       const struct i2c_device_id *id)
+static int mpr_touchkey_probe(struct i2c_client *client,
+                             const struct i2c_device_id *id)
 {
        const struct mpr121_platform_data *pdata = client->dev.platform_data;
        struct mpr121_touchkey *mpr121;
@@ -272,7 +272,7 @@ err_free_mem:
        return error;
 }
 
-static int __devexit mpr_touchkey_remove(struct i2c_client *client)
+static int mpr_touchkey_remove(struct i2c_client *client)
 {
        struct mpr121_touchkey *mpr121 = i2c_get_clientdata(client);