From 9f51c219ac5140c74d9bbb8701eae94c1c4dcdf2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 3 Apr 2012 22:35:18 +0100
Subject: [PATCH] --- yaml --- r: 305583 b: refs/heads/master c:
 67d45090e6154d401e50c3e0f4a2844cfea404c4 h: refs/heads/master i:   305581:
 69a9c91dfd832ae32154ace5926d18d458c16da9   305579:
 c0493eef3be8f919e26a3890788cf47bb67b2d85   305575:
 2db2c8ed0833fa5943e74b74c5a45c31c9729b53   305567:
 ed1fa0e6ccd832c795546f9363e64a922dd3425c v: v3

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

diff --git a/[refs] b/[refs]
index 099c8d7c7ab6..faec9f57b819 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd041f642c706fdda679877cdabf3dc8a6a8e58f
+refs/heads/master: 67d45090e6154d401e50c3e0f4a2844cfea404c4
diff --git a/trunk/sound/soc/codecs/sgtl5000.c b/trunk/sound/soc/codecs/sgtl5000.c
index 977be8c456ff..84077aae7c4a 100644
--- a/trunk/sound/soc/codecs/sgtl5000.c
+++ b/trunk/sound/soc/codecs/sgtl5000.c
@@ -1450,17 +1450,7 @@ static struct i2c_driver sgtl5000_i2c_driver = {
 	.id_table = sgtl5000_id,
 };
 
-static int __init sgtl5000_modinit(void)
-{
-	return i2c_add_driver(&sgtl5000_i2c_driver);
-}
-module_init(sgtl5000_modinit);
-
-static void __exit sgtl5000_exit(void)
-{
-	i2c_del_driver(&sgtl5000_i2c_driver);
-}
-module_exit(sgtl5000_exit);
+module_i2c_driver(sgtl5000_i2c_driver);
 
 MODULE_DESCRIPTION("Freescale SGTL5000 ALSA SoC Codec Driver");
 MODULE_AUTHOR("Zeng Zhaoming <zengzm.kernel@gmail.com>");