These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / pci / hda / patch_ca0110.c

diff --git a/kernel/sound/pci/hda/patch_ca0110.c b/kernel/sound/pci/hda/patch_ca0110.c
index 4473026..c2d9ee9 100644 (file)
--- a/kernel/sound/pci/hda/patch_ca0110.c
+++ b/kernel/sound/pci/hda/patch_ca0110.c
@@ -63,6 +63,7 @@ static int patch_ca0110(struct hda_codec *codec)
                return -ENOMEM;
        snd_hda_gen_spec_init(spec);
        codec->spec = spec;
+       codec->patch_ops = ca0110_patch_ops;
 
        spec->multi_cap_vol = 1;
        codec->bus->needs_damn_long_delay = 1;
@@ -71,8 +72,6 @@ static int patch_ca0110(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       codec->patch_ops = ca0110_patch_ops;
-
        return 0;
 
  error:
@@ -84,22 +83,19 @@ static int patch_ca0110(struct hda_codec *codec)
 /*
  * patch entries
  */
-static const struct hda_codec_preset snd_hda_preset_ca0110[] = {
-       { .id = 0x1102000a, .name = "CA0110-IBG", .patch = patch_ca0110 },
-       { .id = 0x1102000b, .name = "CA0110-IBG", .patch = patch_ca0110 },
-       { .id = 0x1102000d, .name = "SB0880 X-Fi", .patch = patch_ca0110 },
+static const struct hda_device_id snd_hda_id_ca0110[] = {
+       HDA_CODEC_ENTRY(0x1102000a, "CA0110-IBG", patch_ca0110),
+       HDA_CODEC_ENTRY(0x1102000b, "CA0110-IBG", patch_ca0110),
+       HDA_CODEC_ENTRY(0x1102000d, "SB0880 X-Fi", patch_ca0110),
        {} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:1102000a");
-MODULE_ALIAS("snd-hda-codec-id:1102000b");
-MODULE_ALIAS("snd-hda-codec-id:1102000d");
+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_ca0110);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Creative CA0110-IBG HD-audio codec");
 
 static struct hda_codec_driver ca0110_driver = {
-       .preset = snd_hda_preset_ca0110,
+       .id = snd_hda_id_ca0110,
 };
 
 module_hda_codec_driver(ca0110_driver);