From 2e16b64eb46647b99eb25992c40140c4b407e3b8 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Fri, 7 Dec 2012 09:26:18 -0500
Subject: [PATCH] --- yaml --- r: 342975 b: refs/heads/master c:
 c88f3de8555486706c87f5f34f9b45e4c4826283 h: refs/heads/master i:   342973:
 f8244280ee3702c36626b86c90c6d1f8de4b180b   342971:
 959dc06ef988a2a64f0429d143df5aebb0e1459e   342967:
 8575b2a1394e3a1c054d67c38699265a294a2862   342959:
 830f6dfeaa94e61ea90455ac94d35ededbe8423a   342943:
 56b989ee8bba3efab327a9f8c728b149e7e89e5a   342911:
 8a6ae54c68998c210ff23babcb9cf1cb00374c55 v: v3

---
 [refs]                            | 2 +-
 trunk/sound/soc/codecs/isabelle.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 845a35960da3..b52e5a9b3c6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 570f6fe1c35481a2f70f848216978a68b96dc92a
+refs/heads/master: c88f3de8555486706c87f5f34f9b45e4c4826283
diff --git a/trunk/sound/soc/codecs/isabelle.c b/trunk/sound/soc/codecs/isabelle.c
index 1bf55602c9eb..53b455b8c07a 100644
--- a/trunk/sound/soc/codecs/isabelle.c
+++ b/trunk/sound/soc/codecs/isabelle.c
@@ -1119,8 +1119,8 @@ static const struct regmap_config isabelle_regmap_config = {
 	.cache_type = REGCACHE_RBTREE,
 };
 
-static int __devinit isabelle_i2c_probe(struct i2c_client *i2c,
-					const struct i2c_device_id *id)
+static int isabelle_i2c_probe(struct i2c_client *i2c,
+			      const struct i2c_device_id *id)
 {
 	struct regmap *isabelle_regmap;
 	int ret = 0;
@@ -1145,7 +1145,7 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c,
 	return ret;
 }
 
-static int __devexit isabelle_i2c_remove(struct i2c_client *client)
+static int isabelle_i2c_remove(struct i2c_client *client)
 {
 	snd_soc_unregister_codec(&client->dev);
 	return 0;
@@ -1163,7 +1163,7 @@ static struct i2c_driver isabelle_i2c_driver = {
 		.owner = THIS_MODULE,
 	},
 	.probe = isabelle_i2c_probe,
-	.remove = __devexit_p(isabelle_i2c_remove),
+	.remove = isabelle_i2c_remove,
 	.id_table = isabelle_i2c_id,
 };