lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Add device init/exit annotations to new-style Wolfson CODEC drivers

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2009-02-18 21:25:40 +00:00
parent 519cf2df5f
commit c6f2981170
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm8350.c
View File

@@ -1574,7 +1574,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8350 = {
}; };
EXPORT_SYMBOL_GPL(soc_codec_dev_wm8350); EXPORT_SYMBOL_GPL(soc_codec_dev_wm8350);
static int wm8350_codec_probe(struct platform_device *pdev) static __devinit int wm8350_codec_probe(struct platform_device *pdev)
{ {
struct wm8350 *wm8350 = platform_get_drvdata(pdev); struct wm8350 *wm8350 = platform_get_drvdata(pdev);
struct wm8350_data *priv; struct wm8350_data *priv;

8
sound/soc/codecs/wm8731.c
View File

@@ -686,8 +686,8 @@ static struct spi_driver wm8731_spi_driver = {
#endif /* CONFIG_SPI_MASTER */ #endif /* CONFIG_SPI_MASTER */
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static int wm8731_i2c_probe(struct i2c_client *i2c, static __devinit int wm8731_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wm8731_priv *wm8731; struct wm8731_priv *wm8731;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
@@ -707,7 +707,7 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
return wm8731_register(wm8731); 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); struct wm8731_priv *wm8731 = i2c_get_clientdata(client);
wm8731_unregister(wm8731); wm8731_unregister(wm8731);
@@ -726,7 +726,7 @@ static struct i2c_driver wm8731_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = wm8731_i2c_probe, .probe = wm8731_i2c_probe,
.remove = wm8731_i2c_remove, .remove = __devexit_p(wm8731_i2c_remove),
.id_table = wm8731_i2c_id, .id_table = wm8731_i2c_id,
}; };
#endif #endif

8
sound/soc/codecs/wm8900.c
View File

@@ -1272,8 +1272,8 @@ static int wm8900_resume(struct platform_device *pdev)
static struct snd_soc_codec *wm8900_codec; static struct snd_soc_codec *wm8900_codec;
static int wm8900_i2c_probe(struct i2c_client *i2c, static __devinit int wm8900_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wm8900_priv *wm8900; struct wm8900_priv *wm8900;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
@@ -1372,7 +1372,7 @@ err:
return ret; return ret;
} }
static int wm8900_i2c_remove(struct i2c_client *client) static __devexit int wm8900_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_dai(&wm8900_dai); snd_soc_unregister_dai(&wm8900_dai);
snd_soc_unregister_codec(wm8900_codec); snd_soc_unregister_codec(wm8900_codec);
@@ -1398,7 +1398,7 @@ static struct i2c_driver wm8900_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = wm8900_i2c_probe, .probe = wm8900_i2c_probe,
.remove = wm8900_i2c_remove, .remove = __devexit_p(wm8900_i2c_remove),
.id_table = wm8900_i2c_id, .id_table = wm8900_i2c_id,
}; };

8
sound/soc/codecs/wm8903.c
View File

@@ -1562,8 +1562,8 @@ static int wm8903_resume(struct platform_device *pdev)
static struct snd_soc_codec *wm8903_codec; static struct snd_soc_codec *wm8903_codec;
static int wm8903_i2c_probe(struct i2c_client *i2c, static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wm8903_priv *wm8903; struct wm8903_priv *wm8903;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
@@ -1669,7 +1669,7 @@ err:
return ret; return ret;
} }
static int wm8903_i2c_remove(struct i2c_client *client) static __devexit int wm8903_i2c_remove(struct i2c_client *client)
{ {
struct snd_soc_codec *codec = i2c_get_clientdata(client); struct snd_soc_codec *codec = i2c_get_clientdata(client);
@@ -1699,7 +1699,7 @@ static struct i2c_driver wm8903_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = wm8903_i2c_probe, .probe = wm8903_i2c_probe,
.remove = wm8903_i2c_remove, .remove = __devexit_p(wm8903_i2c_remove),
.id_table = wm8903_i2c_id, .id_table = wm8903_i2c_id,
}; };