Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / sound / core / ctljack.c

diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index df7c6cd63c4a62dcc560d9ef319aca98ed0bca8d..9149a4aefa9548e5b09d8d15a4e28dd90cb5918a 100644 (file)
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -61,20 +61,19 @@ 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;
 
        jack_kctl_name_gen(kctl->id.name, name, sizeof(kctl->id.name));
-       kctl->id.index = get_available_index(card, name);
+       kctl->id.index = get_available_index(card, kctl->id.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)
@@ -84,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);