Merge branch 'topic/jack' into for-next

1 files changed, 35 insertions, 6 deletions

diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index e4b38fbe51da..8f8d1033425c 100644
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -31,19 +31,49 @@ 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, 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;
-        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;
 }
-EXPORT_SYMBOL_GPL(snd_kctl_jack_new);
 
 void snd_kctl_jack_report(struct snd_card *card,
                           struct snd_kcontrol *kctl, bool status)
@@ -53,4 +83,3 @@ void snd_kctl_jack_report(struct snd_card *card,
         kctl->private_value = status;
         snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
 }
-EXPORT_SYMBOL_GPL(snd_kctl_jack_report);