ALSA: hda - Get rid of superfluous beep->mode field

It's no longer necessary since beep_mode=2 option was dropped.
It can be checked simply via codec->beep != NULL.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 336b4b3a80b91785fcb29ca099a38b71e407db60..e6cf2a22c4074dfb8436096f97e5fa430451d590 100644 (file)
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -184,6 +184,7 @@ EXPORT_SYMBOL_HDA(snd_hda_enable_beep_device);
 int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 {
        struct hda_beep *beep;
+       int err;
 
        if (!snd_hda_get_bool_hint(codec, "beep"))
                return 0; /* disabled explicitly by hints */
@@ -201,19 +202,16 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 
        beep->nid = nid;
        beep->codec = codec;
-       beep->mode = codec->beep_mode;
        codec->beep = beep;
 
        INIT_WORK(&beep->beep_work, &snd_hda_generate_beep);
        mutex_init(&beep->mutex);
 
-       if (beep->mode) {
-               int err = snd_hda_do_attach(beep);
-               if (err < 0) {
-                       kfree(beep);
-                       codec->beep = NULL;
-                       return err;
-               }
+       err = snd_hda_do_attach(beep);
+       if (err < 0) {
+               kfree(beep);
+               codec->beep = NULL;
+               return err;
        }
 
        return 0;

diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 30e79d16f9f82da7d406126bfac98db3180743a7..4dc6933bc655bf2e1572d35bb958ad7c76f7482f 100644 (file)
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -31,7 +31,6 @@
 struct hda_beep {
        struct input_dev *dev;
        struct hda_codec *codec;
-       unsigned int mode;
        char phys[32];
        int tone;
        hda_nid_t nid;