---

yaml --- r: 293379 b: refs/heads/master c: 8005f39 h: refs/heads/master i: 293377: f5a904b 293375: d6c68e3 v: v3
git-mirror · Feb 17, 2012 · d690d84 · d690d84
1 parent 41a8df0
commit d690d84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7813561a39cbb4dfe5871ce13e1b54b5061c4625
+refs/heads/master: 8005f394ab3ffe2051c68dc434dd230f415cdd96
diff --git a/trunk/sound/soc/codecs/wm8996.c b/trunk/sound/soc/codecs/wm8996.c
@@ -3264,25 +3264,7 @@ static struct i2c_driver wm8996_i2c_driver = {
 	.id_table = wm8996_i2c_id,
 };
 
-static int __init wm8996_modinit(void)
-{
-	int ret;
-
-	ret = i2c_add_driver(&wm8996_i2c_driver);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to register WM8996 I2C driver: %d\n",
-		       ret);
-	}
-
-	return ret;
-}
-module_init(wm8996_modinit);
-
-static void __exit wm8996_exit(void)
-{
-	i2c_del_driver(&wm8996_i2c_driver);
-}
-module_exit(wm8996_exit);
+module_i2c_driver(wm8996_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8996 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");