summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tps65910.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-07 10:03:19 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-07 11:32:08 +0200
commit63745d4068de8ccea3580214c6dbfdca0ec37859 (patch)
treecc684ed93ef655c307d9a4acedfafa388a433cce /drivers/mfd/tps65910.c
parentb6c9eeef4e775e1fff76f4395d11638dc198271d (diff)
downloadlinux-63745d4068de8ccea3580214c6dbfdca0ec37859.tar.gz
linux-63745d4068de8ccea3580214c6dbfdca0ec37859.tar.bz2
linux-63745d4068de8ccea3580214c6dbfdca0ec37859.zip
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.c10
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 = {
.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 device *dev = NULL;
@@ -150,8 +150,8 @@ err_sleep_init:
}
-static int tps65910_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
+ const struct i2c_device_id *id)
{
struct tps65910 *tps65910;
struct tps65910_board *pmic_plat_data;
@@ -213,7 +213,7 @@ regmap_err:
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);
@@ -239,7 +239,7 @@ static struct i2c_driver tps65910_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = tps65910_i2c_probe,
- .remove = tps65910_i2c_remove,
+ .remove = __devexit_p(tps65910_i2c_remove),
.id_table = tps65910_i2c_id,
};