mfd: wm8994: Add __devinit and __devexit annotations for probe and remove
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Feb 2012 23:57:01 +0000 (15:57 -0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Feb 2012 13:57:02 +0000 (13:57 +0000)
Fixes warnings and needed for correctness.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/mfd/wm8994-core.c

index f117e7f..980f841 100644 (file)
@@ -599,8 +599,8 @@ static const struct of_device_id wm8994_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8994_of_match);
 
-static int wm8994_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static __devinit int wm8994_i2c_probe(struct i2c_client *i2c,
+                                     const struct i2c_device_id *id)
 {
        struct wm8994 *wm8994;
        int ret;
@@ -625,7 +625,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
        return wm8994_device_init(wm8994, i2c->irq);
 }
 
-static int wm8994_i2c_remove(struct i2c_client *i2c)
+static __devexit int wm8994_i2c_remove(struct i2c_client *i2c)
 {
        struct wm8994 *wm8994 = i2c_get_clientdata(i2c);
 
@@ -654,7 +654,7 @@ static struct i2c_driver wm8994_i2c_driver = {
                .of_match_table = wm8994_of_match,
        },
        .probe = wm8994_i2c_probe,
-       .remove = wm8994_i2c_remove,
+       .remove = __devexit_p(wm8994_i2c_remove),
        .id_table = wm8994_i2c_id,
 };