Merge tag 'spi-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

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

diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index b0a73d37ed52b4dfb52fb97a367e03f37a6df291..f230292ba96bbfc0c5cf7c7264dd4435de3d7590 100644 (file)
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -746,24 +746,7 @@ static struct i2c_driver aic32x4_i2c_driver = {
        .id_table = aic32x4_i2c_id,
 };
 
-static int __init aic32x4_modinit(void)
-{
-       int ret = 0;
-
-       ret = i2c_add_driver(&aic32x4_i2c_driver);
-       if (ret != 0) {
-               printk(KERN_ERR "Failed to register aic32x4 I2C driver: %d\n",
-                      ret);
-       }
-       return ret;
-}
-module_init(aic32x4_modinit);
-
-static void __exit aic32x4_exit(void)
-{
-       i2c_del_driver(&aic32x4_i2c_driver);
-}
-module_exit(aic32x4_exit);
+module_i2c_driver(aic32x4_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC tlv320aic32x4 codec driver");
 MODULE_AUTHOR("Javier Martin <javier.martin@vista-silicon.com>");