diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-03 16:58:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-03 18:31:20 +0200 |
| commit | 0920c9b4c4d896025a560e4510d473dfd41c3dcd (patch) | |
| tree | 64c4ba13540f15d686e1175fba09ffc699382a71 /sound/pci/hda/hda_beep.h | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-0920c9b4c4d896025a560e4510d473dfd41c3dcd.tar.xz linux-0920c9b4c4d896025a560e4510d473dfd41c3dcd.zip | |
ALSA: hda - Remove beep_mode=2
The beep_mode=2 option was introduced to make the beep mixer
controlling the beep input allocation/deallocation dynamically, so
that a user can switch between HD-audio codec digital beep and the
system beep only via mixer API. This was necessary because the
keyboard driver took only the first input beep instance at that time.
However, the recent keyboard driver already processes the multiple
input instances, thus there is no point to keep this mode.
Let's remove it.
Acked-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_beep.h')
| -rw-r--r-- | sound/pci/hda/hda_beep.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index 55f0647458c7..30e79d16f9f8 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h @@ -26,7 +26,6 @@ #define HDA_BEEP_MODE_OFF 0 #define HDA_BEEP_MODE_ON 1 -#define HDA_BEEP_MODE_SWREG 2 /* beep information */ struct hda_beep { @@ -37,10 +36,7 @@ struct hda_beep { int tone; hda_nid_t nid; unsigned int enabled:1; - unsigned int request_enable:1; unsigned int linear_tone:1; /* linear tone for IDT/STAC codec */ - struct work_struct register_work; /* registration work */ - struct delayed_work unregister_work; /* unregistration work */ struct work_struct beep_work; /* scheduled task for beep event */ struct mutex mutex; }; |