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/wm8731.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 4f9a1eb..c5cf2a5 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -728,6 +728,7 @@ static int wm8731_spi_remove(struct spi_device *spi) .probe = wm8731_spi_probe, .remove = wm8731_spi_remove, }; +module_spi_driver(wm8731_spi_driver); #endif /* CONFIG_SPI_MASTER */
#if IS_ENABLED(CONFIG_I2C) @@ -806,40 +807,9 @@ static int wm8731_i2c_remove(struct i2c_client *client) .remove = wm8731_i2c_remove, .id_table = wm8731_i2c_id, }; +module_i2c_driver(wm8731_i2c_driver); #endif
-static int __init wm8731_modinit(void) -{ - int ret = 0; -#if IS_ENABLED(CONFIG_I2C) - ret = i2c_add_driver(&wm8731_i2c_driver); - if (ret != 0) { - printk(KERN_ERR "Failed to register WM8731 I2C driver: %d\n", - ret); - } -#endif -#if defined(CONFIG_SPI_MASTER) - ret = spi_register_driver(&wm8731_spi_driver); - if (ret != 0) { - printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n", - ret); - } -#endif - return ret; -} -module_init(wm8731_modinit); - -static void __exit wm8731_exit(void) -{ -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&wm8731_i2c_driver); -#endif -#if defined(CONFIG_SPI_MASTER) - spi_unregister_driver(&wm8731_spi_driver); -#endif -} -module_exit(wm8731_exit); - MODULE_DESCRIPTION("ASoC WM8731 driver"); MODULE_AUTHOR("Richard Purdie"); MODULE_LICENSE("GPL");