ALSA: hda - Integrate input-jack stuff into kctl-jack
authorTakashi Iwai <tiwai@suse.de>
Thu, 1 Dec 2011 16:41:36 +0000 (17:41 +0100)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 2 Apr 2012 20:18:24 +0000 (13:18 -0700)
commitd5d01a35b21fd55fe73c50b494982ed473e7573d
tree7abf60bf84a77c404b2631b4ad0797db71922dd0
parent0384b34e104f4bb083a901d21afa112f27eae3fc
ALSA: hda - Integrate input-jack stuff into kctl-jack

Instead of managing input-jack stuff separately, call all stuff inside
the kctl-jack creation, deletion and report.  The caller no longer needs
to care about input-jack.

The better integration between input-jack and kctl-jack should be done
in the upper layer in near future, but for now, it's implemented locally
for more tests.

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

(backported from commit 31ef22579302ac42054bebecb528710f46580925,
Conflicts:
sound/pci/hda/patch_hdmi.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
sound/pci/hda/hda_jack.c
sound/pci/hda/hda_local.h
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c