Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[~andy/linux] / sound / soc / codecs / wm8903.c

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 73f1c8d7bafbdc591e990f2dc2fd678a61ff1f8a..839414f9e2ed3866d41f09c96cd3d50ec9dcc045 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2241,23 +2241,7 @@ static struct i2c_driver wm8903_i2c_driver = {
        .id_table = wm8903_i2c_id,
 };
 
-static int __init wm8903_modinit(void)
-{
-       int ret = 0;
-       ret = i2c_add_driver(&wm8903_i2c_driver);
-       if (ret != 0) {
-               printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n",
-                      ret);
-       }
-       return ret;
-}
-module_init(wm8903_modinit);
-
-static void __exit wm8903_exit(void)
-{
-       i2c_del_driver(&wm8903_i2c_driver);
-}
-module_exit(wm8903_exit);
+module_i2c_driver(wm8903_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8903 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.cm>");