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/wm8731.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/wm8731.c')
-rw-r--r-- | sound/soc/codecs/wm8731.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 9c9fc3b5a6c8..4cac3195bfa3 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -686,8 +686,8 @@ static struct spi_driver wm8731_spi_driver = { | |||
686 | #endif /* CONFIG_SPI_MASTER */ | 686 | #endif /* CONFIG_SPI_MASTER */ |
687 | 687 | ||
688 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 688 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
689 | static int wm8731_i2c_probe(struct i2c_client *i2c, | 689 | static __devinit int wm8731_i2c_probe(struct i2c_client *i2c, |
690 | const struct i2c_device_id *id) | 690 | const struct i2c_device_id *id) |
691 | { | 691 | { |
692 | struct wm8731_priv *wm8731; | 692 | struct wm8731_priv *wm8731; |
693 | struct snd_soc_codec *codec; | 693 | struct snd_soc_codec *codec; |
@@ -707,7 +707,7 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, | |||
707 | return wm8731_register(wm8731); | 707 | return wm8731_register(wm8731); |
708 | } | 708 | } |
709 | 709 | ||
710 | static int wm8731_i2c_remove(struct i2c_client *client) | 710 | static __devexit int wm8731_i2c_remove(struct i2c_client *client) |
711 | { | 711 | { |
712 | struct wm8731_priv *wm8731 = i2c_get_clientdata(client); | 712 | struct wm8731_priv *wm8731 = i2c_get_clientdata(client); |
713 | wm8731_unregister(wm8731); | 713 | wm8731_unregister(wm8731); |
@@ -726,7 +726,7 @@ static struct i2c_driver wm8731_i2c_driver = { | |||
726 | .owner = THIS_MODULE, | 726 | .owner = THIS_MODULE, |
727 | }, | 727 | }, |
728 | .probe = wm8731_i2c_probe, | 728 | .probe = wm8731_i2c_probe, |
729 | .remove = wm8731_i2c_remove, | 729 | .remove = __devexit_p(wm8731_i2c_remove), |
730 | .id_table = wm8731_i2c_id, | 730 | .id_table = wm8731_i2c_id, |
731 | }; | 731 | }; |
732 | #endif | 732 | #endif |