[alsa-devel] [PATCH 1/3] ASoC: wm8962: Convert to module_i2c_driver()
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/codecs/wm8962.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 2f06886..bc04b49 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3793,17 +3793,7 @@ static struct i2c_driver wm8962_i2c_driver = { .id_table = wm8962_i2c_id, };
-static int __init wm8962_modinit(void) -{ - return i2c_add_driver(&wm8962_i2c_driver); -} -module_init(wm8962_modinit); - -static void __exit wm8962_exit(void) -{ - i2c_del_driver(&wm8962_i2c_driver); -} -module_exit(wm8962_exit); +module_i2c_driver(wm8962_i2c_driver);
MODULE_DESCRIPTION("ASoC WM8962 driver"); MODULE_AUTHOR("Mark Brown broonie@opensource.wolfsonmicro.com");
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/codecs/wm8993.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 1e69f63..d256a93 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1859,24 +1859,7 @@ static struct i2c_driver wm8993_i2c_driver = { .id_table = wm8993_i2c_id, };
-static int __init wm8993_modinit(void) -{ - int ret = 0; - ret = i2c_add_driver(&wm8993_i2c_driver); - if (ret != 0) { - pr_err("WM8993: Unable to register I2C driver: %d\n", - ret); - } - return ret; -} -module_init(wm8993_modinit); - -static void __exit wm8993_exit(void) -{ - i2c_del_driver(&wm8993_i2c_driver); -} -module_exit(wm8993_exit); - +module_i2c_driver(wm8993_i2c_driver);
MODULE_DESCRIPTION("ASoC WM8993 driver"); MODULE_AUTHOR("Mark Brown broonie@opensource.wolfsonmicro.com");
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/codecs/wm8996.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 759ea69..8f6533a 100644 --- a/sound/soc/codecs/wm8996.c +++ b/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");
participants (1)
-
Mark Brown