summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 14:13:00 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 14:13:00 +0000
commit735fe4cfbc3cedea41bd0ed31955054dae6beb46 (patch)
treec9386395fe625bb364858479baee88061e9d3be5
parent03e7a35c0ef7a462385fb6a301dfc1b287cac6de (diff)
downloadlinux-735fe4cfbc3cedea41bd0ed31955054dae6beb46.tar.gz
ASoC: Add missing __devexit and __devinit annotations
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/da7210.c6
-rw-r--r--sound/soc/codecs/tlv320dac33.c6
-rw-r--r--sound/soc/codecs/tpa6130a2.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index fbf3ab482015..cf2975a7294a 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -471,8 +471,8 @@ init_err:
 }
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-static int da7210_i2c_probe(struct i2c_client *i2c,
-			    const struct i2c_device_id *id)
+static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
+			   	      const struct i2c_device_id *id)
 {
 	struct da7210_priv *da7210;
 	struct snd_soc_codec *codec;
@@ -495,7 +495,7 @@ static int da7210_i2c_probe(struct i2c_client *i2c,
 	return ret;
 }
 
-static int da7210_i2c_remove(struct i2c_client *client)
+static int __devexit da7210_i2c_remove(struct i2c_client *client)
 {
 	struct da7210_priv *da7210 = i2c_get_clientdata(client);
 
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 3ef3255cd1e7..2df9c20b7d52 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1191,8 +1191,8 @@ struct snd_soc_dai dac33_dai = {
 };
 EXPORT_SYMBOL_GPL(dac33_dai);
 
-static int dac33_i2c_probe(struct i2c_client *client,
-			   const struct i2c_device_id *id)
+static int __devinit dac33_i2c_probe(struct i2c_client *client,
+				     const struct i2c_device_id *id)
 {
 	struct tlv320dac33_platform_data *pdata;
 	struct tlv320dac33_priv *dac33;
@@ -1345,7 +1345,7 @@ error_reg:
 	return ret;
 }
 
-static int dac33_i2c_remove(struct i2c_client *client)
+static int __devexit dac33_i2c_remove(struct i2c_client *client)
 {
 	struct tlv320dac33_priv *dac33;
 
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 8b27281e62a1..958d49c969ac 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -379,8 +379,8 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(tpa6130a2_add_controls);
 
-static int tpa6130a2_probe(struct i2c_client *client,
-			   const struct i2c_device_id *id)
+static int __devinit tpa6130a2_probe(struct i2c_client *client,
+				     const struct i2c_device_id *id)
 {
 	struct device *dev;
 	struct tpa6130a2_data *data;
@@ -479,7 +479,7 @@ err_gpio:
 	return ret;
 }
 
-static int tpa6130a2_remove(struct i2c_client *client)
+static int __devexit tpa6130a2_remove(struct i2c_client *client)
 {
 	struct tpa6130a2_data *data = i2c_get_clientdata(client);