projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 7613f1cac9517c1ecf30e18f2946c872c3e25252..f7f3e9a9fd3f5c4b63234fd63b750f10b327afb0 100644
(file)
--- a/
drivers/input/keyboard/mpr121_touchkey.c
+++ b/
drivers/input/keyboard/mpr121_touchkey.c
@@
-71,7
+71,7
@@
struct mpr121_init_register {
u8 val;
};
u8 val;
};
-static const struct mpr121_init_register init_reg_table[]
__devinitconst
= {
+static const struct mpr121_init_register init_reg_table[] = {
{ MHD_RISING_ADDR, 0x1 },
{ NHD_RISING_ADDR, 0x1 },
{ MHD_FALLING_ADDR, 0x1 },
{ MHD_RISING_ADDR, 0x1 },
{ NHD_RISING_ADDR, 0x1 },
{ MHD_FALLING_ADDR, 0x1 },
@@
-123,7
+123,7
@@
out:
return IRQ_HANDLED;
}
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)
{
struct mpr121_touchkey *mpr121,
struct i2c_client *client)
{
@@
-185,8
+185,8
@@
err_i2c_write:
return ret;
}
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;
{
const struct mpr121_platform_data *pdata = client->dev.platform_data;
struct mpr121_touchkey *mpr121;
@@
-272,7
+272,7
@@
err_free_mem:
return error;
}
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);
{
struct mpr121_touchkey *mpr121 = i2c_get_clientdata(client);
@@
-327,7
+327,7
@@
static struct i2c_driver mpr_touchkey_driver = {
},
.id_table = mpr121_id,
.probe = mpr_touchkey_probe,
},
.id_table = mpr121_id,
.probe = mpr_touchkey_probe,
- .remove =
__devexit_p(mpr_touchkey_remove)
,
+ .remove =
mpr_touchkey_remove
,
};
module_i2c_driver(mpr_touchkey_driver);
};
module_i2c_driver(mpr_touchkey_driver);