summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8731.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-18 21:25:40 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-18 21:26:58 +0000
commitc6f2981170272cce2c192087a16dd74dbde25ed2 (patch)
tree53b482c2e5fc318b29596ea3be43c3be40e7d89d /sound/soc/codecs/wm8731.c
parent519cf2df5fb50c6d24412b2421ce2d1ff0346163 (diff)
downloadop-kernel-dev-c6f2981170272cce2c192087a16dd74dbde25ed2.zip
op-kernel-dev-c6f2981170272cce2c192087a16dd74dbde25ed2.tar.gz
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/wm8731.c')
-rw-r--r--sound/soc/codecs/wm8731.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 9c9fc3b..4cac319 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -686,8 +686,8 @@ static struct spi_driver wm8731_spi_driver = {
#endif /* CONFIG_SPI_MASTER */
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-static int wm8731_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static __devinit int wm8731_i2c_probe(struct i2c_client *i2c,
+ const struct i2c_device_id *id)
{
struct wm8731_priv *wm8731;
struct snd_soc_codec *codec;
@@ -707,7 +707,7 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
return wm8731_register(wm8731);
}
-static int wm8731_i2c_remove(struct i2c_client *client)
+static __devexit int wm8731_i2c_remove(struct i2c_client *client)
{
struct wm8731_priv *wm8731 = i2c_get_clientdata(client);
wm8731_unregister(wm8731);
@@ -726,7 +726,7 @@ static struct i2c_driver wm8731_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = wm8731_i2c_probe,
- .remove = wm8731_i2c_remove,
+ .remove = __devexit_p(wm8731_i2c_remove),
.id_table = wm8731_i2c_id,
};
#endif
OpenPOWER on IntegriCloud