Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / sound / soc / codecs / max9850.c

diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index efe535c..58c38a5 100644 (file)
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -329,8 +329,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = {
        .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes),
 };
 
-static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
-               const struct i2c_device_id *id)
+static int max9850_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
        struct max9850_priv *max9850;
        int ret;
@@ -347,7 +347,7 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
        return ret;
 }
 
-static __devexit int max9850_i2c_remove(struct i2c_client *client)
+static int max9850_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
        return 0;
@@ -365,7 +365,7 @@ static struct i2c_driver max9850_i2c_driver = {
                .owner = THIS_MODULE,
        },
        .probe = max9850_i2c_probe,
-       .remove = __devexit_p(max9850_i2c_remove),
+       .remove = max9850_i2c_remove,
        .id_table = max9850_i2c_id,
 };