From 31ea5134980a5ad1b713c9d6a2430cd92496e0d1 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 7 May 2012 10:03:23 +0100
Subject: [PATCH] --- yaml --- r: 308711 b: refs/heads/master c:
 ceb57d27e28a8f979cbfd6391b7da6da51484059 h: refs/heads/master i:   308709:
 2c0771d68271df36d3faae7487eb7b25677a6e36   308707:
 690348c8aa885d20c31680df59e49d94d114999f   308703:
 ecfe3c2a01519c4c91ffa051a4b825b23b855840 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/mfd/wm8994-core.c | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 5e4db9830788..56ef74c8839e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc7a727941193e3e59be2e9f6522eb78bc7ee909
+refs/heads/master: ceb57d27e28a8f979cbfd6391b7da6da51484059
diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c
index 60e617549edd..1e321d349777 100644
--- a/trunk/drivers/mfd/wm8994-core.c
+++ b/trunk/drivers/mfd/wm8994-core.c
@@ -733,23 +733,7 @@ static struct i2c_driver wm8994_i2c_driver = {
 	.id_table = wm8994_i2c_id,
 };
 
-static int __init wm8994_i2c_init(void)
-{
-	int ret;
-
-	ret = i2c_add_driver(&wm8994_i2c_driver);
-	if (ret != 0)
-		pr_err("Failed to register wm8994 I2C driver: %d\n", ret);
-
-	return ret;
-}
-module_init(wm8994_i2c_init);
-
-static void __exit wm8994_i2c_exit(void)
-{
-	i2c_del_driver(&wm8994_i2c_driver);
-}
-module_exit(wm8994_i2c_exit);
+module_i2c_driver(wm8994_i2c_driver);
 
 MODULE_DESCRIPTION("Core support for the WM8994 audio CODEC");
 MODULE_LICENSE("GPL");