summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_generic.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-07 10:33:57 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-12 08:43:51 +0100
commitc2c803830a5d9897344cd3ffd82daddd7f9f3864 (patch)
tree07f486ef62415ee420fc424cf1ac8fb5d7dbe28b /sound/pci/hda/hda_generic.h
parentALSA: hda - Drop unneeded pin argument from set_output_and_unmute() (diff)
downloadlinux-c2c803830a5d9897344cd3ffd82daddd7f9f3864.tar.xz
linux-c2c803830a5d9897344cd3ffd82daddd7f9f3864.zip
ALSA: hda - Drop bind-volume workaround
The bind-volume workaround was introduced for simplifying the mixer abstraction in the case where one or more pins of multiple outputs lack of individual volume controls. This was essentially the case like Acer Aspire 5935, which has 5.1 speakers and 5.1 (multi-io) jacks although there are 5 DACs, so some of them must share a DAC. However, the recent code rewrite changed the DAC assignment policy to share with the same channel instead of binding to the front, thus binding the volumes for all channels makes little sense now, rather it's confusing. So in this patch, the ugly workaround is finally dropped and simply create the volume control corresponding to the parsed path position. For dual headphones or 2.1 speakers with a shared volume control, it's anyway bound to the same DAC if needed, so this change shouldn't bring any practical difference. And, as a good bonus, we can cut off the whole code handling the bind volume elements. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
-rw-r--r--sound/pci/hda/hda_generic.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index d4a8f6c4e7a9..4c0d9add6145 100644
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -186,9 +186,6 @@ struct hda_gen_spec {
int multi_ios;
struct hda_multi_io multi_io[4];
- /* bind volumes */
- struct snd_array bind_ctls;
-
/* hooks */
void (*init_hook)(struct hda_codec *codec);
void (*automute_hook)(struct hda_codec *codec);