Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.8

Some incremental updates, nothing too exciting.  The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.

There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.

1 files changed, 7 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index c32249ddb2e0..f31017ed1381 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -492,7 +492,7 @@ static const struct regmap_config wm8776_regmap = {
 };
 
 #if defined(CONFIG_SPI_MASTER)
-static int __devinit wm8776_spi_probe(struct spi_device *spi)
+static int wm8776_spi_probe(struct spi_device *spi)
 {
         struct wm8776_priv *wm8776;
         int ret;
@@ -514,7 +514,7 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)
         return ret;
 }
 
-static int __devexit wm8776_spi_remove(struct spi_device *spi)
+static int wm8776_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
         return 0;
@@ -527,13 +527,13 @@ static struct spi_driver wm8776_spi_driver = {
                 .of_match_table = wm8776_of_match,
         },
         .probe          = wm8776_spi_probe,
-        .remove         = __devexit_p(wm8776_spi_remove),
+        .remove         = wm8776_spi_remove,
 };
 #endif /* CONFIG_SPI_MASTER */
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
-                                      const struct i2c_device_id *id)
+static int wm8776_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
         struct wm8776_priv *wm8776;
         int ret;
@@ -555,7 +555,7 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
         return ret;
 }
 
-static __devexit int wm8776_i2c_remove(struct i2c_client *client)
+static int wm8776_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
         return 0;
@@ -575,7 +575,7 @@ static struct i2c_driver wm8776_i2c_driver = {
                 .of_match_table = wm8776_of_match,
         },
         .probe =    wm8776_i2c_probe,
-        .remove =   __devexit_p(wm8776_i2c_remove),
+        .remove =   wm8776_i2c_remove,
         .id_table = wm8776_i2c_id,
 };
 #endif