[alsa-devel] [PATCH 13/19] ASoC: wm8750: Convert to module_i2c/spi_driver()
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Tue Nov 15 06:13:00 CET 2016
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Let's use module_i2c/spi_driver()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
sound/soc/codecs/wm8750.c | 34 ++--------------------------------
1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 0da2bba..244f6a4 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -785,6 +785,7 @@ static int wm8750_spi_remove(struct spi_device *spi)
.probe = wm8750_spi_probe,
.remove = wm8750_spi_remove,
};
+module_spi_driver(wm8750_spi_driver);
#endif /* CONFIG_SPI_MASTER */
#if IS_ENABLED(CONFIG_I2C)
@@ -833,40 +834,9 @@ static int wm8750_i2c_remove(struct i2c_client *client)
.remove = wm8750_i2c_remove,
.id_table = wm8750_i2c_id,
};
+module_i2c_driver(wm8750_i2c_driver);
#endif
-static int __init wm8750_modinit(void)
-{
- int ret = 0;
-#if IS_ENABLED(CONFIG_I2C)
- ret = i2c_add_driver(&wm8750_i2c_driver);
- if (ret != 0) {
- printk(KERN_ERR "Failed to register wm8750 I2C driver: %d\n",
- ret);
- }
-#endif
-#if defined(CONFIG_SPI_MASTER)
- ret = spi_register_driver(&wm8750_spi_driver);
- if (ret != 0) {
- printk(KERN_ERR "Failed to register wm8750 SPI driver: %d\n",
- ret);
- }
-#endif
- return ret;
-}
-module_init(wm8750_modinit);
-
-static void __exit wm8750_exit(void)
-{
-#if IS_ENABLED(CONFIG_I2C)
- i2c_del_driver(&wm8750_i2c_driver);
-#endif
-#if defined(CONFIG_SPI_MASTER)
- spi_unregister_driver(&wm8750_spi_driver);
-#endif
-}
-module_exit(wm8750_exit);
-
MODULE_DESCRIPTION("ASoC WM8750 driver");
MODULE_AUTHOR("Liam Girdwood");
MODULE_LICENSE("GPL");
--
1.9.1
More information about the Alsa-devel
mailing list