提交 63745d40 编写于 作者: M Mark Brown 提交者: Samuel Ortiz

mfd: Fix tps65910 section annotations

A warning was being generated by the reference from tps65910_i2c_probe()
to tps65910_sleepinit() since the latter was annotated as __init but the
former was unannotated. Since these functions can only be called during
device init make them both __devinit, and while we're at it also annotate
tps65910_i2c_remove() __devexit for symmetry.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
上级 b6c9eeef
...@@ -90,7 +90,7 @@ static const struct regmap_config tps65910_regmap_config = { ...@@ -90,7 +90,7 @@ static const struct regmap_config tps65910_regmap_config = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int __init tps65910_sleepinit(struct tps65910 *tps65910, static int __devinit tps65910_sleepinit(struct tps65910 *tps65910,
struct tps65910_board *pmic_pdata) struct tps65910_board *pmic_pdata)
{ {
struct device *dev = NULL; struct device *dev = NULL;
...@@ -150,8 +150,8 @@ static int __init tps65910_sleepinit(struct tps65910 *tps65910, ...@@ -150,8 +150,8 @@ static int __init tps65910_sleepinit(struct tps65910 *tps65910,
} }
static int tps65910_i2c_probe(struct i2c_client *i2c, static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct tps65910 *tps65910; struct tps65910 *tps65910;
struct tps65910_board *pmic_plat_data; struct tps65910_board *pmic_plat_data;
...@@ -213,7 +213,7 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, ...@@ -213,7 +213,7 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
static int tps65910_i2c_remove(struct i2c_client *i2c) static __devexit int tps65910_i2c_remove(struct i2c_client *i2c)
{ {
struct tps65910 *tps65910 = i2c_get_clientdata(i2c); struct tps65910 *tps65910 = i2c_get_clientdata(i2c);
...@@ -239,7 +239,7 @@ static struct i2c_driver tps65910_i2c_driver = { ...@@ -239,7 +239,7 @@ static struct i2c_driver tps65910_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = tps65910_i2c_probe, .probe = tps65910_i2c_probe,
.remove = tps65910_i2c_remove, .remove = __devexit_p(tps65910_i2c_remove),
.id_table = tps65910_i2c_id, .id_table = tps65910_i2c_id,
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册