diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:16 +0100 |
| commit | 8f88f0256f2e8afd83177b3554992009acb98996 (patch) | |
| tree | 2cfbc07c64edda0db4afa67b5ed2d6c9a6c78537 /sound/pci/hda/hda_generic.c | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| parent | ALSA: hda - Clear pcm pointer assigned to hda_pcm at device removal (diff) | |
| download | linux-8f88f0256f2e8afd83177b3554992009acb98996.tar.xz linux-8f88f0256f2e8afd83177b3554992009acb98996.zip | |
Merge branch 'topic/hda-bus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 8ec5289f8e05..43ad51c672d6 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -5524,13 +5524,11 @@ static const struct hda_codec_ops generic_patch_ops = { #endif }; -/** +/* * snd_hda_parse_generic_codec - Generic codec parser * @codec: the HDA codec - * - * This should be called from the HDA codec core. */ -int snd_hda_parse_generic_codec(struct hda_codec *codec) +static int snd_hda_parse_generic_codec(struct hda_codec *codec) { struct hda_gen_spec *spec; int err; @@ -5556,7 +5554,17 @@ error: snd_hda_gen_free(codec); return err; } -EXPORT_SYMBOL_GPL(snd_hda_parse_generic_codec); + +static const struct hda_codec_preset snd_hda_preset_generic[] = { + { .id = HDA_CODEC_ID_GENERIC, .patch = snd_hda_parse_generic_codec }, + {} /* terminator */ +}; + +static struct hda_codec_driver generic_driver = { + .preset = snd_hda_preset_generic, +}; + +module_hda_codec_driver(generic_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Generic HD-audio codec parser"); |