---

yaml
---
r: 342975
b: refs/heads/master
c: c88f3de
h: refs/heads/master
i:
  342973: f824428
  342971: 959dc06
  342967: 8575b2a
  342959: 830f6df
  342943: 56b989e
  342911: 8a6ae54
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 570f6fe1c35481a2f70f848216978a68b96dc92a
+refs/heads/master: c88f3de8555486706c87f5f34f9b45e4c4826283

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,
 };