Commit 257dfb41 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 0401e854

sound/pci/hda/hda_beep.c

+6 −8
Original line number Diff line number Diff line
@@ -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,20 +202,17 @@ 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);

	err = snd_hda_do_attach(beep);

	if (err < 0) {

		kfree(beep);

		codec->beep = NULL;

		return err;

	}

	}



	return 0;

}

sound/pci/hda/hda_beep.h

+0 −1
Original line number Diff line number Diff line
@@ -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;