mfd: Fix tps65910 section annotations
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 7 May 2012 09:03:19 +0000 (10:03 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 7 May 2012 09:32:08 +0000 (11:32 +0200)
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>
drivers/mfd/tps65910.c

index ae7f47b..7a55af9 100644 (file)
@@ -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,
 };