mfd: wm8994: Add __devinit and __devexit annotations for probe and remove
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Feb 2012 23:58:03 +0000 (15:58 -0800)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 6 Mar 2012 17:46:46 +0000 (18:46 +0100)
Fixes warnings and needed for correctness.

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

index ecc3a42160f96e55dba779f69fd391d3f731712e..46d867140af888e22fe4869a8727b691109635f8 100644 (file)
@@ -613,8 +613,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;
@@ -639,7 +639,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);
 
@@ -668,7 +668,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,
 };