6 files changed, 72 insertions, 128 deletions

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index aae6b1023d69..d7fa1ee8302c 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -34,6 +34,7 @@
 #include "hda_local.h"
 #include "hda_auto_parser.h"
 #include "hda_jack.h"
+#include "hda_beep.h"
 #include "hda_generic.h"
 
 
@@ -4238,6 +4239,12 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
         if (spec->power_down_unused)
                 codec->power_filter = snd_hda_gen_path_power_filter;
 
+        if (!spec->no_analog && spec->beep_nid) {
+                err = snd_hda_attach_beep_device(codec, spec->beep_nid);
+                if (err < 0)
+                        return err;
+        }
+
         return 1;
 }
 EXPORT_SYMBOL_HDA(snd_hda_gen_parse_auto_config);
@@ -5063,6 +5070,7 @@ EXPORT_SYMBOL_HDA(snd_hda_gen_init);
  */
 void snd_hda_gen_free(struct hda_codec *codec)
 {
+        snd_hda_detach_beep_device(codec);
         snd_hda_gen_spec_free(codec->spec);
         kfree(codec->spec);
         codec->spec = NULL;
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 094e6af7a107..39d83943f25d 100644
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -226,6 +226,9 @@ struct hda_gen_spec {
         /* loopback mixing mode */
         bool aamix_mode;
 
+        /* digital beep */
+        hda_nid_t beep_nid;
+
         /* for virtual master */
         hda_nid_t vmaster_nid;
         unsigned int vmaster_tlv[4];
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index df8014b27596..977b0d878dae 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -43,7 +43,6 @@ struct ad198x_spec {
         hda_nid_t eapd_nid;
 
         unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
-        hda_nid_t beep_dev_nid;
 
 #ifdef ENABLE_AD_STATIC_QUIRKS
         const struct snd_kcontrol_new *mixers[6];
@@ -609,7 +608,7 @@ static const struct hda_codec_ops ad198x_auto_patch_ops = {
         .build_controls = ad198x_auto_build_controls,
         .build_pcms = snd_hda_gen_build_pcms,
         .init = snd_hda_gen_init,
-        .free = ad198x_free,
+        .free = snd_hda_gen_free,
         .unsol_event = snd_hda_jack_unsol_event,
 #ifdef CONFIG_PM
         .check_power_status = snd_hda_gen_check_power_status,
@@ -638,12 +637,6 @@ static int ad198x_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        if (spec->beep_dev_nid) {
-                err = snd_hda_attach_beep_device(codec, spec->beep_dev_nid);
-                if (err < 0)
-                        return err;
-        }
-
         codec->patch_ops = ad198x_auto_patch_ops;
 
         return 0;
@@ -1240,7 +1233,7 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec)
         codec->inv_eapd = 1;
 
         spec->gen.mixer_nid = 0x07;
-        spec->beep_dev_nid = 0x19;
+        spec->gen.beep_nid = 0x19;
         set_beep_amp(spec, 0x18, 0, HDA_OUTPUT);
 
         /* AD1986A has a hardware problem that it can't share a stream
@@ -1256,7 +1249,7 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec)
 
         err = ad198x_parse_auto_config(codec);
         if (err < 0) {
-                ad198x_free(codec);
+                snd_hda_gen_free(codec);
                 return err;
         }
 
@@ -1673,7 +1666,7 @@ static int ad1983_parse_auto_config(struct hda_codec *codec)
                 return err;
         spec = codec->spec;
 
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
         err = ad198x_parse_auto_config(codec);
         if (err < 0)
@@ -1684,7 +1677,7 @@ static int ad1983_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -2187,7 +2180,7 @@ static int ad1981_parse_auto_config(struct hda_codec *codec)
         spec = codec->spec;
 
         spec->gen.mixer_nid = 0x0e;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT);
 
         snd_hda_pick_fixup(codec, NULL, ad1981_fixup_tbl, ad1981_fixups);
@@ -2205,7 +2198,7 @@ static int ad1981_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -3236,7 +3229,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
 
         spec->gen.mixer_nid = 0x20;
         spec->gen.mixer_merge_nid = 0x21;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
         err = ad198x_parse_auto_config(codec);
         if (err < 0)
@@ -3247,7 +3240,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -3653,7 +3646,7 @@ static int ad1884_parse_auto_config(struct hda_codec *codec)
         spec = codec->spec;
 
         spec->gen.mixer_nid = 0x20;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
 
         snd_hda_pick_fixup(codec, NULL, ad1884_fixup_tbl, ad1884_fixups);
@@ -3671,7 +3664,7 @@ static int ad1884_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -5155,7 +5148,7 @@ static int ad1882_parse_auto_config(struct hda_codec *codec)
 
         spec->gen.mixer_nid = 0x20;
         spec->gen.mixer_merge_nid = 0x21;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
         err = ad198x_parse_auto_config(codec);
         if (err < 0)
@@ -5166,7 +5159,7 @@ static int ad1882_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index d0100a85e189..549964395770 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -139,8 +139,12 @@ struct conexant_spec {
 
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
-#define set_beep_amp(spec, nid, idx, dir) \
-        ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir))
+static inline void set_beep_amp(struct conexant_spec *spec, hda_nid_t nid,
+                                int idx, int dir)
+{
+        spec->gen.beep_nid = nid;
+        spec->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
+}
 /* additional beep mixers; the actual parameters are overwritten at build */
 static const struct snd_kcontrol_new cxt_beep_mixer[] = {
         HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),
@@ -3191,17 +3195,11 @@ static int cx_auto_build_controls(struct hda_codec *codec)
         return 0;
 }
 
-static void cx_auto_free(struct hda_codec *codec)
-{
-        snd_hda_detach_beep_device(codec);
-        snd_hda_gen_free(codec);
-}
-
 static const struct hda_codec_ops cx_auto_patch_ops = {
         .build_controls = cx_auto_build_controls,
         .build_pcms = snd_hda_gen_build_pcms,
         .init = snd_hda_gen_init,
-        .free = cx_auto_free,
+        .free = snd_hda_gen_free,
         .unsol_event = snd_hda_jack_unsol_event,
 #ifdef CONFIG_PM
         .check_power_status = snd_hda_gen_check_power_status,
@@ -3395,8 +3393,6 @@ static int patch_conexant_auto(struct hda_codec *codec)
                 goto error;
 
         codec->patch_ops = cx_auto_patch_ops;
-        if (spec->beep_amp)
-                snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));
 
         /* Some laptops with Conexant chips show stalls in S3 resume,
          * which falls into the single-cmd mode.
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c0bf15554507..e7b59d3eaba8 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -34,7 +34,6 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_auto_parser.h"
-#include "hda_beep.h"
 #include "hda_jack.h"
 #include "hda_generic.h"
 
@@ -805,17 +804,7 @@ static inline void alc_shutup(struct hda_codec *codec)
         snd_hda_shutup_pins(codec);
 }
 
-static void alc_free(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-
-        if (!spec)
-                return;
-
-        snd_hda_gen_spec_free(&spec->gen);
-        snd_hda_detach_beep_device(codec);
-        kfree(spec);
-}
+#define alc_free        snd_hda_gen_free
 
 #ifdef CONFIG_PM
 static void alc_power_eapd(struct hda_codec *codec)
@@ -1401,6 +1390,7 @@ static int patch_alc880(struct hda_codec *codec)
 
         spec = codec->spec;
         spec->gen.need_dac_fix = 1;
+        spec->gen.beep_nid = 0x01;
 
         snd_hda_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
                        alc880_fixups);
@@ -1411,12 +1401,8 @@ static int patch_alc880(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
         codec->patch_ops.unsol_event = alc880_unsol_event;
@@ -1637,6 +1623,7 @@ static int patch_alc260(struct hda_codec *codec)
          * it's almost harmless.
          */
         spec->gen.prefer_hp_amp = 1;
+        spec->gen.beep_nid = 0x01;
 
         snd_hda_pick_fixup(codec, alc260_fixup_models, alc260_fixup_tbl,
                            alc260_fixups);
@@ -1647,12 +1634,8 @@ static int patch_alc260(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
         spec->shutup = alc_eapd_shutup;
@@ -2151,17 +2134,16 @@ static int patch_alc882(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         /* automatic parse from the BIOS config */
         err = alc882_parse_auto_config(codec);
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 
@@ -2314,17 +2296,16 @@ static int patch_alc262(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         /* automatic parse from the BIOS config */
         err = alc262_parse_auto_config(codec);
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
         spec->shutup = alc_eapd_shutup;
@@ -2405,16 +2386,7 @@ static const struct snd_pci_quirk alc268_fixup_tbl[] = {
 static int alc268_parse_auto_config(struct hda_codec *codec)
 {
         static const hda_nid_t alc268_ssids[] = { 0x15, 0x1b, 0x14, 0 };
-        struct alc_spec *spec = codec->spec;
-        int err = alc_parse_auto_config(codec, NULL, alc268_ssids);
-        if (err > 0) {
-                if (!spec->gen.no_analog &&
-                    spec->gen.autocfg.speaker_pins[0] != 0x1d) {
-                        add_mixer(spec, alc268_beep_mixer);
-                        snd_hda_add_verbs(codec, alc268_beep_init_verbs);
-                }
-        }
-        return err;
+        return alc_parse_auto_config(codec, NULL, alc268_ssids);
 }
 
 /*
@@ -2422,7 +2394,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
 static int patch_alc268(struct hda_codec *codec)
 {
         struct alc_spec *spec;
-        int i, has_beep, err;
+        int err;
 
         /* ALC268 has no aa-loopback mixer */
         err = alc_alloc_spec(codec, 0);
@@ -2430,6 +2402,7 @@ static int patch_alc268(struct hda_codec *codec)
                 return err;
 
         spec = codec->spec;
+        spec->gen.beep_nid = 0x01;
 
         snd_hda_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -2439,18 +2412,10 @@ static int patch_alc268(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        has_beep = 0;
-        for (i = 0; i < spec->num_mixers; i++) {
-                if (spec->mixers[i] == alc268_beep_mixer) {
-                        has_beep = 1;
-                        break;
-                }
-        }
-
-        if (has_beep) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (err > 0 && !spec->gen.no_analog &&
+            spec->gen.autocfg.speaker_pins[0] != 0x1d) {
+                add_mixer(spec, alc268_beep_mixer);
+                snd_hda_add_verbs(codec, alc268_beep_init_verbs);
                 if (!query_amp_caps(codec, 0x1d, HDA_INPUT))
                         /* override the amp caps for beep generator */
                         snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,
@@ -3150,6 +3115,9 @@ static int patch_alc269(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         switch (codec->vendor_id) {
         case 0x10ec0269:
                 spec->codec_variant = ALC269_TYPE_ALC269VA;
@@ -3198,12 +3166,8 @@ static int patch_alc269(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid)
                 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 #ifdef CONFIG_PM
@@ -3311,6 +3275,7 @@ static int patch_alc861(struct hda_codec *codec)
                 return err;
 
         spec = codec->spec;
+        spec->gen.beep_nid = 0x23;
 
         snd_hda_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -3320,12 +3285,8 @@ static int patch_alc861(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x23);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 #ifdef CONFIG_PM
@@ -3406,6 +3367,7 @@ static int patch_alc861vd(struct hda_codec *codec)
                 return err;
 
         spec = codec->spec;
+        spec->gen.beep_nid = 0x23;
 
         snd_hda_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -3415,12 +3377,8 @@ static int patch_alc861vd(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x23);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 
@@ -3802,6 +3760,9 @@ static int patch_alc662(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         if ((alc_get_coef0(codec) & (1 << 14)) &&
             codec->bus->pci->subsystem_vendor == 0x1025 &&
             spec->cdefine.platform_type == 1) {
@@ -3814,10 +3775,7 @@ static int patch_alc662(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid) {
                 switch (codec->vendor_id) {
                 case 0x10ec0662:
                         set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 356673106788..3be877bd8a92 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -211,7 +211,6 @@ struct sigmatel_spec {
 
         /* beep widgets */
         hda_nid_t anabeep_nid;
-        hda_nid_t digbeep_nid;
 
         /* SPDIF-out mux */
         const char * const *spdif_labels;
@@ -3560,16 +3559,13 @@ static int stac_parse_auto_config(struct hda_codec *codec)
 
         /* setup digital beep controls and input device */
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
-        if (spec->digbeep_nid > 0) {
-                hda_nid_t nid = spec->digbeep_nid;
+        if (spec->gen.beep_nid) {
+                hda_nid_t nid = spec->gen.beep_nid;
                 unsigned int caps;
 
                 err = stac_auto_create_beep_ctls(codec, nid);
                 if (err < 0)
                         return err;
-                err = snd_hda_attach_beep_device(codec, nid);
-                if (err < 0)
-                        return err;
                 if (codec->beep) {
                         /* IDT/STAC codecs have linear beep tone parameter */
                         codec->beep->linear_tone = spec->linear_tone_beep;
@@ -3657,17 +3653,7 @@ static void stac_shutup(struct hda_codec *codec)
                                 ~spec->eapd_mask);
 }
 
-static void stac_free(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-
-        if (!spec)
-                return;
-
-        snd_hda_gen_spec_free(&spec->gen);
-        kfree(spec);
-        snd_hda_detach_beep_device(codec);
-}
+#define stac_free       snd_hda_gen_free
 
 #ifdef CONFIG_PROC_FS
 static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
@@ -3885,7 +3871,7 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
         spec->aloopback_mask = 0x01;
         spec->aloopback_shift = 8;
 
-        spec->digbeep_nid = 0x1c;
+        spec->gen.beep_nid = 0x1c; /* digital beep */
 
         /* GPIO0 High = Enable EAPD */
         spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1;
@@ -3969,7 +3955,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         spec->gen.power_down_unused = 1;
         spec->gen.mixer_nid = 0x1b;
 
-        spec->digbeep_nid = 0x21;
+        spec->gen.beep_nid = 0x21; /* digital beep */
         spec->pwr_nids = stac92hd83xxx_pwr_nids;
         spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
         spec->default_polarity = -1; /* no default cfg */
@@ -4017,7 +4003,7 @@ static int patch_stac92hd95(struct hda_codec *codec)
         spec->gen.own_eapd_ctl = 1;
         spec->gen.power_down_unused = 1;
 
-        spec->digbeep_nid = 0x19;
+        spec->gen.beep_nid = 0x19; /* digital beep */
         spec->pwr_nids = stac92hd95_pwr_nids;
         spec->num_pwrs = ARRAY_SIZE(stac92hd95_pwr_nids);
         spec->default_polarity = -1; /* no default cfg */
@@ -4092,7 +4078,7 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
         spec->aloopback_shift = 0;
 
         spec->powerdown_adcs = 1;
-        spec->digbeep_nid = 0x26;
+        spec->gen.beep_nid = 0x26; /* digital beep */
         spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);
         spec->pwr_nids = stac92hd71bxx_pwr_nids;
 
@@ -4174,7 +4160,7 @@ static int patch_stac927x(struct hda_codec *codec)
         spec->have_spdif_mux = 1;
         spec->spdif_labels = stac927x_spdif_labels;
 
-        spec->digbeep_nid = 0x23;
+        spec->gen.beep_nid = 0x23; /* digital beep */
 
         /* GPIO0 High = Enable EAPD */
         spec->eapd_mask = spec->gpio_mask = 0x01;
@@ -4233,7 +4219,7 @@ static int patch_stac9205(struct hda_codec *codec)
         spec->gen.own_eapd_ctl = 1;
         spec->have_spdif_mux = 1;
 
-        spec->digbeep_nid = 0x23;
+        spec->gen.beep_nid = 0x23; /* digital beep */
 
         snd_hda_add_verbs(codec, stac9205_core_init);
         spec->aloopback_ctl = &stac9205_loopback;