From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: liam.r.girdwood@linux.intel.com, tiwai@suse.de,
broonie@kernel.org, Vinod Koul <vinod.koul@intel.com>,
patches.audio@intel.com
Subject: [PATCH 2/3] ALSA: hda: remove module_pci_driver
Date: Thu, 30 Apr 2015 20:22:35 +0530 [thread overview]
Message-ID: <1430405556-19166-2-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1430405556-19166-1-git-send-email-vinod.koul@intel.com>
Since we want to selectively register for Intel aDSP systems based on the
module flag we need to bring back explicit code for driver registration and
remove module_pci_driver
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
sound/pci/hda/hda_intel.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f7cdf4d2e24e..488dab208ddc 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2217,4 +2217,19 @@ static struct pci_driver azx_driver = {
},
};
-module_pci_driver(azx_driver);
+static int __init azx_module_init(void)
+{
+ int ret;
+
+ ret = pci_register_driver(&azx_driver);
+
+ return ret;
+}
+module_init(azx_module_init);
+
+static void __exit azx_module_exit(void)
+{
+ pci_unregister_driver(&azx_driver);
+
+}
+module_exit(azx_module_exit);
--
1.9.1
next prev parent reply other threads:[~2015-04-30 14:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-30 14:52 [PATCH 1/3] ALSA: hda: add hdac_adsp_enable module flag Vinod Koul
2015-04-30 14:52 ` Vinod Koul [this message]
2015-04-30 14:52 ` [PATCH 3/3] ALSA: hda: register selectively for SPT-LP Vinod Koul
2015-04-30 20:33 ` Mark Brown
2015-04-30 20:59 ` Takashi Iwai
2015-04-30 21:23 ` Mark Brown
2015-05-01 4:31 ` Vinod Koul
2015-04-30 16:02 ` [PATCH 1/3] ALSA: hda: add hdac_adsp_enable module flag Pierre-Louis Bossart
2015-04-30 19:27 ` Mark Brown
2015-04-30 20:44 ` Takashi Iwai
2015-05-01 4:39 ` Vinod Koul
2015-05-01 14:15 ` Pierre-Louis Bossart
2015-05-01 14:41 ` Mark Brown
2015-05-01 11:13 ` Mark Brown
2015-04-30 20:47 ` Takashi Iwai
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=1430405556-19166-2-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=patches.audio@intel.com \
--cc=tiwai@suse.de \
/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