diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-02-17 09:25:37 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-23 03:16:06 -0500 |
commit | d8a766a16ed90c4b3bd7afa6e1417f8d715db507 (patch) | |
tree | 2810742bf71c851726f27e99f9984fe334f97b8d /sound/pci/hda/patch_cmedia.c | |
parent | 327ef4f02582d01f7eedb291794106823b44a0cf (diff) |
ALSA: hda - Bind codecs via standard bus
Now we create the standard HD-audio bus (/sys/bus/hdaudio), and bind
the codec driver with the codec device over there. This is the first
step of the whole transition so that the changes to each codec driver
are kept as minimal as possible.
Each codec driver needs to register hda_codec_driver struct containing
the currently existing preset via the new helper macro
module_hda_codec_driver(). The old hda_codec_preset_list is replaced
with this infrastructure. The generic parsers (for HDMI and other)
are also included in the preset with the special IDs to bind
uniquely.
In HD-audio core side, the device binding code is split to
hda_bind.c. It provides the snd_hda_bus_type implementation to match
the codec driver with the given codec vendor ID. It also manages the
module auto-loading by itself like before: when the matching isn't
found, it tries to probe the corresponding codec modules, and finally
falls back to the generic drivers. (The special ID mentioned above is
set at this stage.)
The only visible change to outside is that the hdaudio sysfs entry now
appears in /sys/bus/devices, not as a sound class device.
More works to move the suspend/resume and remove ops will be
(hopefully) done in later patches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cmedia.c')
-rw-r--r-- | sound/pci/hda/patch_cmedia.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index c895a8f21192..617d9012e78a 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
@@ -137,20 +137,8 @@ MODULE_ALIAS("snd-hda-codec-id:434d4980"); | |||
137 | MODULE_LICENSE("GPL"); | 137 | MODULE_LICENSE("GPL"); |
138 | MODULE_DESCRIPTION("C-Media HD-audio codec"); | 138 | MODULE_DESCRIPTION("C-Media HD-audio codec"); |
139 | 139 | ||
140 | static struct hda_codec_preset_list cmedia_list = { | 140 | static struct hda_codec_driver cmedia_driver = { |
141 | .preset = snd_hda_preset_cmedia, | 141 | .preset = snd_hda_preset_cmedia, |
142 | .owner = THIS_MODULE, | ||
143 | }; | 142 | }; |
144 | 143 | ||
145 | static int __init patch_cmedia_init(void) | 144 | module_hda_codec_driver(cmedia_driver); |
146 | { | ||
147 | return snd_hda_add_codec_preset(&cmedia_list); | ||
148 | } | ||
149 | |||
150 | static void __exit patch_cmedia_exit(void) | ||
151 | { | ||
152 | snd_hda_delete_codec_preset(&cmedia_list); | ||
153 | } | ||
154 | |||
155 | module_init(patch_cmedia_init) | ||
156 | module_exit(patch_cmedia_exit) | ||