summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 21:20:59 +0800
committerTakashi Iwai <tiwai@suse.de>2015-04-27 21:37:42 +0200
commit2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68 (patch)
treef6cac8ccd939ac190628dc9210d41f0ddca8419c /sound/core
parent4e3f0dc65883cac95807549b2f7a3ac183686bcb (diff)
downloadlinux-2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68.tar.gz
linux-2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68.tar.bz2
linux-2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68.zip
ALSA: hda - Update to use the new jack kctls method
Jack snd_kcontrols can now be created during snd_jack_new() or by later calling snd_jack_add_new_kctls(). This patch creates the jacks during the initialisation stage for both phantom and non phantom jacks. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/ctljack.c4
-rw-r--r--sound/core/jack.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index df7c6cd63c4a..6435e82cacf9 100644
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -61,11 +61,11 @@ static void jack_kctl_name_gen(char *name, const char *src_name, int size)
}
struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card)
+snd_kctl_jack_new(const char *name, struct snd_card *card)
{
struct snd_kcontrol *kctl;
- kctl = snd_ctl_new1(&jack_detect_kctl, private_data);
+ kctl = snd_ctl_new1(&jack_detect_kctl, NULL);
if (!kctl)
return NULL;
diff --git a/sound/core/jack.c b/sound/core/jack.c
index b34187b072ea..e8b51f52e7df 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -135,7 +135,7 @@ static struct snd_jack_kctl * snd_jack_kctl_new(struct snd_card *card, const cha
struct snd_jack_kctl *jack_kctl;
int err;
- kctl = snd_kctl_jack_new(name, card, card);
+ kctl = snd_kctl_jack_new(name, card);
if (!kctl)
return NULL;