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

diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c
index d15e5943c85e931bc0ffd5472b27768bbadaeb79..6b6c74cd83e2bcc2d9e5292cca7c2b70618eaa18 100644 (file)
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
@@ -258,8 +258,8 @@ int max9877_add_controls(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(max9877_add_controls);
 
-static int __devinit max9877_i2c_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int max9877_i2c_probe(struct i2c_client *client,
+                            const struct i2c_device_id *id)
 {
        i2c = client;
 
@@ -268,7 +268,7 @@ static int __devinit max9877_i2c_probe(struct i2c_client *client,
        return 0;
 }
 
-static __devexit int max9877_i2c_remove(struct i2c_client *client)
+static int max9877_i2c_remove(struct i2c_client *client)
 {
        i2c = NULL;
 
@@ -287,7 +287,7 @@ static struct i2c_driver max9877_i2c_driver = {
                .owner = THIS_MODULE,
        },
        .probe = max9877_i2c_probe,
-       .remove = __devexit_p(max9877_i2c_remove),
+       .remove = max9877_i2c_remove,
        .id_table = max9877_i2c_id,
 };