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/patch_conexant.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/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index da67ea8645a6..5aa466a13e43 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -1018,20 +1018,8 @@ MODULE_ALIAS("snd-hda-codec-id:14f151d7"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Conexant HD-audio codec"); -static struct hda_codec_preset_list conexant_list = { +static struct hda_codec_driver conexant_driver = { .preset = snd_hda_preset_conexant, - .owner = THIS_MODULE, }; -static int __init patch_conexant_init(void) -{ - return snd_hda_add_codec_preset(&conexant_list); -} - -static void __exit patch_conexant_exit(void) -{ - snd_hda_delete_codec_preset(&conexant_list); -} - -module_init(patch_conexant_init) -module_exit(patch_conexant_exit) +module_hda_codec_driver(conexant_driver); |