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 / ak4671.c

diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 2b457976a7bff0f18ada9248acdc0c25b4bd82cd..25bdf6ad4a546c16363381a1a4922c4a334ea48d 100644 (file)
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -655,8 +655,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4671 = {
        .num_dapm_routes = ARRAY_SIZE(ak4671_intercon),
 };
 
-static int __devinit ak4671_i2c_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int ak4671_i2c_probe(struct i2c_client *client,
+                           const struct i2c_device_id *id)
 {
        struct ak4671_priv *ak4671;
        int ret;
@@ -674,7 +674,7 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client,
        return ret;
 }
 
-static __devexit int ak4671_i2c_remove(struct i2c_client *client)
+static int ak4671_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
        return 0;
@@ -692,7 +692,7 @@ static struct i2c_driver ak4671_i2c_driver = {
                .owner = THIS_MODULE,
        },
        .probe = ak4671_i2c_probe,
-       .remove = __devexit_p(ak4671_i2c_remove),
+       .remove = ak4671_i2c_remove,
        .id_table = ak4671_i2c_id,
 };