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

[can-eth-gw-linux.git] / sound / soc / codecs / tpa6130a2.c

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 565ff39ad3a35ced5598c9532bc33b85f1d8983a..8d75aa152c8cd29dab7133791db83955d5a6bd14 100644 (file)
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -359,8 +359,8 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(tpa6130a2_add_controls);
 
-static int __devinit tpa6130a2_probe(struct i2c_client *client,
-                                    const struct i2c_device_id *id)
+static int tpa6130a2_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
        struct device *dev;
        struct tpa6130a2_data *data;
@@ -455,7 +455,7 @@ err_gpio:
        return ret;
 }
 
-static int __devexit tpa6130a2_remove(struct i2c_client *client)
+static int tpa6130a2_remove(struct i2c_client *client)
 {
        struct tpa6130a2_data *data = i2c_get_clientdata(client);
 
@@ -483,7 +483,7 @@ static struct i2c_driver tpa6130a2_i2c_driver = {
                .owner = THIS_MODULE,
        },
        .probe = tpa6130a2_probe,
-       .remove = __devexit_p(tpa6130a2_remove),
+       .remove = tpa6130a2_remove,
        .id_table = tpa6130a2_id,
 };