diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-20 10:19:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-20 10:19:40 +0200 |
| commit | c80a1daa7eb6470b84868ed135a26f414b02bf2e (patch) | |
| tree | c587c1fa6ad7e6d40d61c21b7daf03e75ac867be /sound/pci/hda/patch_cirrus.c | |
| parent | 9a30ae2df29c27eca58581862928ee2c7bbdfa76 (diff) | |
| parent | b6e84c99b121fcba34166842987be96956148bb8 (diff) | |
| download | blackbird-op-linux-c80a1daa7eb6470b84868ed135a26f414b02bf2e.tar.gz blackbird-op-linux-c80a1daa7eb6470b84868ed135a26f414b02bf2e.zip | |
Merge branch 'topic/hda-modalias' into for-next
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 01c464a468f6..a12ae8ac0914 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -1201,26 +1201,21 @@ static int patch_cs4213(struct hda_codec *codec) /* * patch entries */ -static const struct hda_codec_preset snd_hda_preset_cirrus[] = { - { .id = 0x10134206, .name = "CS4206", .patch = patch_cs420x }, - { .id = 0x10134207, .name = "CS4207", .patch = patch_cs420x }, - { .id = 0x10134208, .name = "CS4208", .patch = patch_cs4208 }, - { .id = 0x10134210, .name = "CS4210", .patch = patch_cs4210 }, - { .id = 0x10134213, .name = "CS4213", .patch = patch_cs4213 }, +static const struct hda_device_id snd_hda_id_cirrus[] = { + HDA_CODEC_ENTRY(0x10134206, "CS4206", patch_cs420x), + HDA_CODEC_ENTRY(0x10134207, "CS4207", patch_cs420x), + HDA_CODEC_ENTRY(0x10134208, "CS4208", patch_cs4208), + HDA_CODEC_ENTRY(0x10134210, "CS4210", patch_cs4210), + HDA_CODEC_ENTRY(0x10134213, "CS4213", patch_cs4213), {} /* terminator */ }; - -MODULE_ALIAS("snd-hda-codec-id:10134206"); -MODULE_ALIAS("snd-hda-codec-id:10134207"); -MODULE_ALIAS("snd-hda-codec-id:10134208"); -MODULE_ALIAS("snd-hda-codec-id:10134210"); -MODULE_ALIAS("snd-hda-codec-id:10134213"); +MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_cirrus); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cirrus Logic HD-audio codec"); static struct hda_codec_driver cirrus_driver = { - .preset = snd_hda_preset_cirrus, + .id = snd_hda_id_cirrus, }; module_hda_codec_driver(cirrus_driver); |
