diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-07 05:03:19 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-07 05:32:08 -0400 |
commit | 63745d4068de8ccea3580214c6dbfdca0ec37859 (patch) | |
tree | cc684ed93ef655c307d9a4acedfafa388a433cce /drivers/mfd/tps65910.c | |
parent | b6c9eeef4e775e1fff76f4395d11638dc198271d (diff) |
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/tps65910.c')
-rw-r--r-- | drivers/mfd/tps65910.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index ae7f47b6e71b..7a55af921e25 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c | |||
@@ -90,7 +90,7 @@ static const struct regmap_config tps65910_regmap_config = { | |||
90 | .cache_type = REGCACHE_RBTREE, | 90 | .cache_type = REGCACHE_RBTREE, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static int __init tps65910_sleepinit(struct tps65910 *tps65910, | 93 | static int __devinit tps65910_sleepinit(struct tps65910 *tps65910, |
94 | struct tps65910_board *pmic_pdata) | 94 | struct tps65910_board *pmic_pdata) |
95 | { | 95 | { |
96 | struct device *dev = NULL; | 96 | struct device *dev = NULL; |
@@ -150,8 +150,8 @@ err_sleep_init: | |||
150 | } | 150 | } |
151 | 151 | ||
152 | 152 | ||
153 | static int tps65910_i2c_probe(struct i2c_client *i2c, | 153 | static __devinit int tps65910_i2c_probe(struct i2c_client *i2c, |
154 | const struct i2c_device_id *id) | 154 | const struct i2c_device_id *id) |
155 | { | 155 | { |
156 | struct tps65910 *tps65910; | 156 | struct tps65910 *tps65910; |
157 | struct tps65910_board *pmic_plat_data; | 157 | struct tps65910_board *pmic_plat_data; |
@@ -213,7 +213,7 @@ regmap_err: | |||
213 | return ret; | 213 | return ret; |
214 | } | 214 | } |
215 | 215 | ||
216 | static int tps65910_i2c_remove(struct i2c_client *i2c) | 216 | static __devexit int tps65910_i2c_remove(struct i2c_client *i2c) |
217 | { | 217 | { |
218 | struct tps65910 *tps65910 = i2c_get_clientdata(i2c); | 218 | struct tps65910 *tps65910 = i2c_get_clientdata(i2c); |
219 | 219 | ||
@@ -239,7 +239,7 @@ static struct i2c_driver tps65910_i2c_driver = { | |||
239 | .owner = THIS_MODULE, | 239 | .owner = THIS_MODULE, |
240 | }, | 240 | }, |
241 | .probe = tps65910_i2c_probe, | 241 | .probe = tps65910_i2c_probe, |
242 | .remove = tps65910_i2c_remove, | 242 | .remove = __devexit_p(tps65910_i2c_remove), |
243 | .id_table = tps65910_i2c_id, | 243 | .id_table = tps65910_i2c_id, |
244 | }; | 244 | }; |
245 | 245 | ||