提交 027d6766 编写于 作者: M Mark Brown

mfd: wm8994: Add __devinit and __devexit annotations for probe and remove

Fixes warnings and needed for correctness.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 aca1e172
...@@ -599,8 +599,8 @@ static const struct of_device_id wm8994_of_match[] = { ...@@ -599,8 +599,8 @@ static const struct of_device_id wm8994_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, wm8994_of_match); MODULE_DEVICE_TABLE(of, wm8994_of_match);
static int wm8994_i2c_probe(struct i2c_client *i2c, static __devinit int wm8994_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wm8994 *wm8994; struct wm8994 *wm8994;
int ret; int ret;
...@@ -625,7 +625,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c, ...@@ -625,7 +625,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
return wm8994_device_init(wm8994, i2c->irq); 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); struct wm8994 *wm8994 = i2c_get_clientdata(i2c);
...@@ -654,7 +654,7 @@ static struct i2c_driver wm8994_i2c_driver = { ...@@ -654,7 +654,7 @@ static struct i2c_driver wm8994_i2c_driver = {
.of_match_table = wm8994_of_match, .of_match_table = wm8994_of_match,
}, },
.probe = wm8994_i2c_probe, .probe = wm8994_i2c_probe,
.remove = wm8994_i2c_remove, .remove = __devexit_p(wm8994_i2c_remove),
.id_table = wm8994_i2c_id, .id_table = wm8994_i2c_id,
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册