Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / sound / pci / hda / patch_si3054.c

diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index 5104bebb228699f1a04e754429f57e31622a521a..ffda38c45509583dd9e43f5f119c5d835b23e05b 100644 (file)
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -289,41 +289,30 @@ static int patch_si3054(struct hda_codec *codec)
 /*
  * patch entries
  */
-static const struct hda_codec_preset snd_hda_preset_si3054[] = {
-       { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x11c13055, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x11c13155, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x10573055, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x10573057, .name = "Si3054", .patch = patch_si3054 },
-       { .id = 0x10573155, .name = "Si3054", .patch = patch_si3054 },
+static const struct hda_device_id snd_hda_id_si3054[] = {
+       HDA_CODEC_ENTRY(0x163c3055, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x163c3155, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x11c13026, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x11c13055, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x11c13155, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x10573055, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x10573057, "Si3054", patch_si3054),
+       HDA_CODEC_ENTRY(0x10573155, "Si3054", patch_si3054),
        /* VIA HDA on Clevo m540 */
-       { .id = 0x11063288, .name = "Si3054", .patch = patch_si3054 },
+       HDA_CODEC_ENTRY(0x11063288, "Si3054", patch_si3054),
        /* Asus A8J Modem (SM56) */
-       { .id = 0x15433155, .name = "Si3054", .patch = patch_si3054 },
+       HDA_CODEC_ENTRY(0x15433155, "Si3054", patch_si3054),
        /* LG LW20 modem */
-       { .id = 0x18540018, .name = "Si3054", .patch = patch_si3054 },
+       HDA_CODEC_ENTRY(0x18540018, "Si3054", patch_si3054),
        {}
 };
-
-MODULE_ALIAS("snd-hda-codec-id:163c3055");
-MODULE_ALIAS("snd-hda-codec-id:163c3155");
-MODULE_ALIAS("snd-hda-codec-id:11c13026");
-MODULE_ALIAS("snd-hda-codec-id:11c13055");
-MODULE_ALIAS("snd-hda-codec-id:11c13155");
-MODULE_ALIAS("snd-hda-codec-id:10573055");
-MODULE_ALIAS("snd-hda-codec-id:10573057");
-MODULE_ALIAS("snd-hda-codec-id:10573155");
-MODULE_ALIAS("snd-hda-codec-id:11063288");
-MODULE_ALIAS("snd-hda-codec-id:15433155");
-MODULE_ALIAS("snd-hda-codec-id:18540018");
+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_si3054);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Si3054 HD-audio modem codec");
 
 static struct hda_codec_driver si3054_driver = {
-       .preset = snd_hda_preset_si3054,
+       .id = snd_hda_id_si3054,
 };
 
 module_hda_codec_driver(si3054_driver);