diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-18 16:25:40 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-18 16:26:58 -0500 |
commit | c6f2981170272cce2c192087a16dd74dbde25ed2 (patch) | |
tree | 53b482c2e5fc318b29596ea3be43c3be40e7d89d /sound/soc/codecs/wm8900.c | |
parent | 519cf2df5fb50c6d24412b2421ce2d1ff0346163 (diff) |
ASoC: Add device init/exit annotations to new-style Wolfson CODEC drivers
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8900.c')
-rw-r--r-- | sound/soc/codecs/wm8900.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 85c0f1bc6766..da5ca64f89bb 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -1272,8 +1272,8 @@ static int wm8900_resume(struct platform_device *pdev) | |||
1272 | 1272 | ||
1273 | static struct snd_soc_codec *wm8900_codec; | 1273 | static struct snd_soc_codec *wm8900_codec; |
1274 | 1274 | ||
1275 | static int wm8900_i2c_probe(struct i2c_client *i2c, | 1275 | static __devinit int wm8900_i2c_probe(struct i2c_client *i2c, |
1276 | const struct i2c_device_id *id) | 1276 | const struct i2c_device_id *id) |
1277 | { | 1277 | { |
1278 | struct wm8900_priv *wm8900; | 1278 | struct wm8900_priv *wm8900; |
1279 | struct snd_soc_codec *codec; | 1279 | struct snd_soc_codec *codec; |
@@ -1372,7 +1372,7 @@ err: | |||
1372 | return ret; | 1372 | return ret; |
1373 | } | 1373 | } |
1374 | 1374 | ||
1375 | static int wm8900_i2c_remove(struct i2c_client *client) | 1375 | static __devexit int wm8900_i2c_remove(struct i2c_client *client) |
1376 | { | 1376 | { |
1377 | snd_soc_unregister_dai(&wm8900_dai); | 1377 | snd_soc_unregister_dai(&wm8900_dai); |
1378 | snd_soc_unregister_codec(wm8900_codec); | 1378 | snd_soc_unregister_codec(wm8900_codec); |
@@ -1398,7 +1398,7 @@ static struct i2c_driver wm8900_i2c_driver = { | |||
1398 | .owner = THIS_MODULE, | 1398 | .owner = THIS_MODULE, |
1399 | }, | 1399 | }, |
1400 | .probe = wm8900_i2c_probe, | 1400 | .probe = wm8900_i2c_probe, |
1401 | .remove = wm8900_i2c_remove, | 1401 | .remove = __devexit_p(wm8900_i2c_remove), |
1402 | .id_table = wm8900_i2c_id, | 1402 | .id_table = wm8900_i2c_id, |
1403 | }; | 1403 | }; |
1404 | 1404 | ||