ALSA: Jack: handle jack embedded kcontrol creating within ctljack

This patch adds a static method get_available_index() to
allocate the index of new jack kcontrols and also adds
jack_kctl_name_gen() which is used to ensure compatibility
with jack naming by removing " Jack" from some incorrectly
passed names.

Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/control.h b/include/sound/control.h
index 95aad6d3fd1a9b0765551d90719632baeea388b0..f50e2e918ceb717fec27217f0583d2179953832a 100644 (file)
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
  * Helper functions for jack-detection controls
  */
 struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, int idx, void *private_data);
+snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card);
 void snd_kctl_jack_report(struct snd_card *card,
                          struct snd_kcontrol *kctl, bool status);
 

diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index e4b38fbe51dacddf9c69651a0f9be0d636789f58..df7c6cd63c4a62dcc560d9ef319aca98ed0bca8d 100644 (file)
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -31,15 +31,46 @@ static struct snd_kcontrol_new jack_detect_kctl = {
        .get = jack_detect_kctl_get,
 };
 
+static int get_available_index(struct snd_card *card, const char *name)
+{
+       struct snd_ctl_elem_id sid;
+
+       memset(&sid, 0, sizeof(sid));
+
+       sid.index = 0;
+       sid.iface = SNDRV_CTL_ELEM_IFACE_CARD;
+       strlcpy(sid.name, name, sizeof(sid.name));
+
+       while (snd_ctl_find_id(card, &sid))
+               sid.index++;
+
+       return sid.index;
+}
+
+static void jack_kctl_name_gen(char *name, const char *src_name, int size)
+{
+       size_t count = strlen(src_name);
+       bool need_cat = true;
+
+       /* remove redundant " Jack" from src_name */
+       if (count >= 5)
+               need_cat = strncmp(&src_name[count - 5], " Jack", 5) ? true : false;
+
+       snprintf(name, size, need_cat ? "%s Jack" : "%s", src_name);
+
+}
+
 struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, int idx, void *private_data)
+snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card)
 {
        struct snd_kcontrol *kctl;
+
        kctl = snd_ctl_new1(&jack_detect_kctl, private_data);
        if (!kctl)
                return NULL;
-       snprintf(kctl->id.name, sizeof(kctl->id.name), "%s Jack", name);
-       kctl->id.index = idx;
+
+       jack_kctl_name_gen(kctl->id.name, name, sizeof(kctl->id.name));
+       kctl->id.index = get_available_index(card, name);
        kctl->private_value = 0;
        return kctl;
 }

diff --git a/sound/core/jack.c b/sound/core/jack.c
index db69ecc23651713f77f7aa63a761016db8c4d164..067d37d14e640c5313545b5b88be85b7fa5da12d 100644 (file)
--- 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, 0, card);
+       kctl = snd_kctl_jack_new(name, card, card);
        if (!kctl)
                return NULL;
 

diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index d7cfe7b8c32b10d1e3a64e9ddfc28f5bc1d0d775..05b49aa8af6c69c8409c2f2de8f10efbacaa96f9 100644 (file)
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -402,7 +402,7 @@ static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
                return 0;
        if (jack->kctl)
                return 0; /* already created */
-       kctl = snd_kctl_jack_new(name, idx, codec);
+       kctl = snd_kctl_jack_new(name, codec, codec->card);
        if (!kctl)
                return -ENOMEM;
        err = snd_hda_ctl_add(codec, nid, kctl);