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/wm8985.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-)
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 05344f9..34eb3cb 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1172,6 +1172,7 @@ static int wm8985_spi_remove(struct spi_device *spi) .probe = wm8985_spi_probe, .remove = wm8985_spi_remove }; +module_spi_driver(wm8985_spi_driver); #endif
#if IS_ENABLED(CONFIG_I2C) @@ -1223,41 +1224,9 @@ static int wm8985_i2c_remove(struct i2c_client *i2c) .remove = wm8985_i2c_remove, .id_table = wm8985_i2c_id }; +module_i2c_driver(wm8985_i2c_driver); #endif
-static int __init wm8985_modinit(void) -{ - int ret = 0; - -#if IS_ENABLED(CONFIG_I2C) - ret = i2c_add_driver(&wm8985_i2c_driver); - if (ret) { - printk(KERN_ERR "Failed to register wm8985 I2C driver: %d\n", - ret); - } -#endif -#if defined(CONFIG_SPI_MASTER) - ret = spi_register_driver(&wm8985_spi_driver); - if (ret != 0) { - printk(KERN_ERR "Failed to register wm8985 SPI driver: %d\n", - ret); - } -#endif - return ret; -} -module_init(wm8985_modinit); - -static void __exit wm8985_exit(void) -{ -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&wm8985_i2c_driver); -#endif -#if defined(CONFIG_SPI_MASTER) - spi_unregister_driver(&wm8985_spi_driver); -#endif -} -module_exit(wm8985_exit); - MODULE_DESCRIPTION("ASoC WM8985 / WM8758 driver"); MODULE_AUTHOR("Dimitris Papastamos dp@opensource.wolfsonmicro.com"); MODULE_LICENSE("GPL");