Merge branch 'for-linus' into for-next

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_sigmatel.c

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 6c66d7e164391b7e824e2c72b5fa2e5ae889f16d..dcc7fe91244c2dfada5c97fbb42df06dbd857bbf 100644 (file)
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4362,7 +4362,7 @@ static void stac_shutup(struct hda_codec *codec)
 
 #define stac_free      snd_hda_gen_free
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
 static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
                               struct hda_codec *codec, hda_nid_t nid)
 {
@@ -4442,6 +4442,7 @@ static int alloc_stac_spec(struct hda_codec *codec)
        codec->spec = spec;
        codec->no_trigger_sense = 1; /* seems common with STAC/IDT codecs */
        spec->gen.dac_min_mute = true;
+       codec->patch_ops = stac_patch_ops;
        return 0;
 }
 
@@ -4458,7 +4459,6 @@ static int patch_stac9200(struct hda_codec *codec)
        spec->linear_tone_beep = 1;
        spec->gen.own_eapd_ctl = 1;
 
-       codec->patch_ops = stac_patch_ops;
        codec->power_filter = snd_hda_codec_eapd_power_filter;
 
        snd_hda_add_verbs(codec, stac9200_eapd_init);
@@ -4491,8 +4491,6 @@ static int patch_stac925x(struct hda_codec *codec)
        spec->linear_tone_beep = 1;
        spec->gen.own_eapd_ctl = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_add_verbs(codec, stac925x_core_init);
 
        snd_hda_pick_fixup(codec, stac925x_models, stac925x_fixup_tbl,
@@ -4562,8 +4560,6 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
        spec->gen.own_eapd_ctl = 1;
        spec->gen.power_down_unused = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_pick_fixup(codec, stac92hd73xx_models, stac92hd73xx_fixup_tbl,
                           stac92hd73xx_fixups);
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -4639,8 +4635,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
        spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
        spec->default_polarity = -1; /* no default cfg */
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_add_verbs(codec, stac92hd83xxx_core_init);
 
        snd_hda_pick_fixup(codec, stac92hd83xxx_models, stac92hd83xxx_fixup_tbl,
@@ -4689,8 +4683,6 @@ static int patch_stac92hd95(struct hda_codec *codec)
        spec->num_pwrs = ARRAY_SIZE(stac92hd95_pwr_nids);
        spec->default_polarity = 0;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_pick_fixup(codec, stac92hd95_models, stac92hd95_fixup_tbl,
                           stac92hd95_fixups);
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -4729,8 +4721,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
        spec->gen.mixer_nid = 0x17;
        spec->have_spdif_mux = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        /* GPIO0 = EAPD */
        spec->gpio_mask = 0x01;
        spec->gpio_dir = 0x01;
@@ -4809,8 +4799,6 @@ static int patch_stac922x(struct hda_codec *codec)
        spec->linear_tone_beep = 1;
        spec->gen.own_eapd_ctl = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_add_verbs(codec, stac922x_core_init);
 
        /* Fix Mux capture level; max to 2 */
@@ -4866,8 +4854,6 @@ static int patch_stac927x(struct hda_codec *codec)
        spec->aloopback_shift = 0;
        spec->eapd_switch = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_pick_fixup(codec, stac927x_models, stac927x_fixup_tbl,
                           stac927x_fixups);
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -4929,8 +4915,6 @@ static int patch_stac9205(struct hda_codec *codec)
        /* Turn on/off EAPD per HP plugging */
        spec->eapd_switch = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_pick_fixup(codec, stac9205_models, stac9205_fixup_tbl,
                           stac9205_fixups);
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -5002,8 +4986,6 @@ static int patch_stac9872(struct hda_codec *codec)
        spec->linear_tone_beep = 1;
        spec->gen.own_eapd_ctl = 1;
 
-       codec->patch_ops = stac_patch_ops;
-
        snd_hda_add_verbs(codec, stac9872_core_init);
 
        snd_hda_pick_fixup(codec, stac9872_models, stac9872_fixup_tbl,