From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Let's use module_i2c/spi_driver()
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8741.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 565d477..9621f94 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -607,6 +607,7 @@ static int wm8741_i2c_remove(struct i2c_client *client) .remove = wm8741_i2c_remove, .id_table = wm8741_i2c_id, }; +module_i2c_driver(wm8741_i2c_driver); #endif
#if defined(CONFIG_SPI_MASTER) @@ -664,40 +665,9 @@ static int wm8741_spi_remove(struct spi_device *spi) .probe = wm8741_spi_probe, .remove = wm8741_spi_remove, }; +module_spi_driver(wm8741_spi_driver); #endif /* CONFIG_SPI_MASTER */
-static int __init wm8741_modinit(void) -{ - int ret = 0; - -#if IS_ENABLED(CONFIG_I2C) - ret = i2c_add_driver(&wm8741_i2c_driver); - if (ret != 0) - pr_err("Failed to register WM8741 I2C driver: %d\n", ret); -#endif -#if defined(CONFIG_SPI_MASTER) - ret = spi_register_driver(&wm8741_spi_driver); - if (ret != 0) { - printk(KERN_ERR "Failed to register wm8741 SPI driver: %d\n", - ret); - } -#endif - - return ret; -} -module_init(wm8741_modinit); - -static void __exit wm8741_exit(void) -{ -#if defined(CONFIG_SPI_MASTER) - spi_unregister_driver(&wm8741_spi_driver); -#endif -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&wm8741_i2c_driver); -#endif -} -module_exit(wm8741_exit); - MODULE_DESCRIPTION("ASoC WM8741 driver"); MODULE_AUTHOR("Ian Lartey ian@opensource.wolfsonmicro.com"); MODULE_LICENSE("GPL");