alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>
Subject: [PATCH 09/19] ASoC: wm8983: Convert to module_i2c/spi_driver()
Date: Tue, 15 Nov 2016 05:11:48 +0000	[thread overview]
Message-ID: <87oa1h8h0r.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <871syd9vq9.wl%kuninori.morimoto.gx@renesas.com>


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/wm8983.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index bfdbe72..023d0b4 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -1039,6 +1039,7 @@ static int wm8983_spi_remove(struct spi_device *spi)
 	.probe = wm8983_spi_probe,
 	.remove = wm8983_spi_remove
 };
+module_spi_driver(wm8983_spi_driver);
 #endif
 
 #if IS_ENABLED(CONFIG_I2C)
@@ -1087,41 +1088,9 @@ static int wm8983_i2c_remove(struct i2c_client *client)
 	.remove = wm8983_i2c_remove,
 	.id_table = wm8983_i2c_id
 };
+module_i2c_driver(wm8983_i2c_driver);
 #endif
 
-static int __init wm8983_modinit(void)
-{
-	int ret = 0;
-
-#if IS_ENABLED(CONFIG_I2C)
-	ret = i2c_add_driver(&wm8983_i2c_driver);
-	if (ret) {
-		printk(KERN_ERR "Failed to register wm8983 I2C driver: %d\n",
-		       ret);
-	}
-#endif
-#if defined(CONFIG_SPI_MASTER)
-	ret = spi_register_driver(&wm8983_spi_driver);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to register wm8983 SPI driver: %d\n",
-		       ret);
-	}
-#endif
-	return ret;
-}
-module_init(wm8983_modinit);
-
-static void __exit wm8983_exit(void)
-{
-#if IS_ENABLED(CONFIG_I2C)
-	i2c_del_driver(&wm8983_i2c_driver);
-#endif
-#if defined(CONFIG_SPI_MASTER)
-	spi_unregister_driver(&wm8983_spi_driver);
-#endif
-}
-module_exit(wm8983_exit);
-
 MODULE_DESCRIPTION("ASoC WM8983 driver");
 MODULE_AUTHOR("Dimitris Papastamos <dp@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");
-- 
1.9.1

  parent reply	other threads:[~2016-11-15  5:11 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-15  5:08 [PATCH 00/19] ASoC: Convert to module_i2c/spi_driver() Kuninori Morimoto
2016-11-15  5:09 ` [PATCH 01/19] ASoC: uda1380: Convert to module_i2c_driver() Kuninori Morimoto
2016-11-15  6:21   ` Takashi Iwai
2016-11-15  6:42     ` Kuninori Morimoto
2016-11-15  7:30       ` Takashi Iwai
2016-11-15 12:08       ` Lars-Peter Clausen
2016-11-16 18:01         ` Mark Brown
2016-11-17  0:18           ` Kuninori Morimoto
2016-11-21 19:20   ` Applied "ASoC: uda1380: Remove #if IS_ENABLED(CONFIG_I2C)" to the asoc tree Mark Brown
2016-11-15  5:09 ` [PATCH 02/19] ASoC: wm9081: Convert to module_i2c_driver() Kuninori Morimoto
2016-11-16  9:38   ` [alsa-devel] " Charles Keepax
2016-11-16  9:39   ` Charles Keepax
2016-11-17  0:43     ` Kuninori Morimoto
2016-11-21 19:20   ` Applied "ASoC: wm9081: Remove #if IS_ENABLED(CONFIG_I2C)" to the asoc tree Mark Brown
2016-11-15  5:09 ` [PATCH 03/19] ASoC: wm8580: Convert to module_i2c_driver() Kuninori Morimoto
2016-11-16  9:41   ` Charles Keepax
2016-11-17  0:10     ` Kuninori Morimoto
2016-11-15  5:10 ` [PATCH 04/19] ASoC: wm8523: " Kuninori Morimoto
2016-11-16  9:42   ` Charles Keepax
2016-11-21 19:20   ` Applied "ASoC: wm8523: Remove #if IS_ENABLED(CONFIG_I2C)" to the asoc tree Mark Brown
2016-11-15  5:10 ` [PATCH 05/19] ASoC: wm8510: Convert to module_i2c/spi_driver() Kuninori Morimoto
2016-11-15  8:33   ` Lars-Peter Clausen
2016-11-15  8:49     ` Kuninori Morimoto
2016-11-15 17:21   ` kbuild test robot
2016-11-16  9:44   ` Charles Keepax
2016-11-17  0:16     ` Kuninori Morimoto
2016-11-17  9:33       ` Charles Keepax
2016-11-17  9:51         ` Kuninori Morimoto
2016-11-15  5:10 ` [PATCH 06/19] ASoC: wm8995: " Kuninori Morimoto
2016-11-15 18:05   ` kbuild test robot
2016-11-15  5:11 ` [PATCH 07/19] ASoC: wm8988: " Kuninori Morimoto
2016-11-15  5:11 ` [PATCH 08/19] ASoC: wm8985: " Kuninori Morimoto
2016-11-15 17:40   ` kbuild test robot
2016-11-15  5:11 ` Kuninori Morimoto [this message]
2016-11-15  5:12 ` [PATCH 10/19] ASoC: wm8900: " Kuninori Morimoto
2016-11-15  5:12 ` [PATCH 11/19] ASoC: wm8776: " Kuninori Morimoto
2016-11-15 17:51   ` kbuild test robot
2016-11-15  5:12 ` [PATCH 12/19] ASoC: wm8753: " Kuninori Morimoto
2016-11-15 17:35   ` kbuild test robot
2016-11-15  5:13 ` [PATCH 13/19] ASoC: wm8750: " Kuninori Morimoto
2016-11-15  5:13 ` [PATCH 14/19] ASoC: wm8741: " Kuninori Morimoto
2016-11-15 17:51   ` kbuild test robot
2016-11-15  5:13 ` [PATCH 15/19] ASoC: wm8731: " Kuninori Morimoto
2016-11-15 18:07   ` kbuild test robot
2016-11-15  5:13 ` [PATCH 16/19] ASoC: wm8737: " Kuninori Morimoto
2016-11-15  5:14 ` [PATCH 17/19] ASoC: wm8728: " Kuninori Morimoto
2016-11-15  5:14 ` [PATCH 18/19] ASoC: wm8711: " Kuninori Morimoto
2016-11-15  5:14 ` [PATCH 19/19] ASoC: da7210: " Kuninori Morimoto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87oa1h8h0r.wl%kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=horms@verge.net.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).