summaryrefslogtreecommitdiffstats
path: root/include/sound/jack.h
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 21:20:58 +0800
committerTakashi Iwai <tiwai@suse.de>2015-04-27 21:37:41 +0200
commit4e3f0dc65883cac95807549b2f7a3ac183686bcb (patch)
tree68b4c872e0a9167909730354af05cf54b061c02c /include/sound/jack.h
parentb8dd086674cfbfc246a5b9d7d7ff37f62350a878 (diff)
downloadlinux-stable-4e3f0dc65883cac95807549b2f7a3ac183686bcb.tar.gz
linux-stable-4e3f0dc65883cac95807549b2f7a3ac183686bcb.tar.bz2
linux-stable-4e3f0dc65883cac95807549b2f7a3ac183686bcb.zip
ALSA: jack: extend snd_jack_new to support phantom jack
Dont create input devices for phantom jacks. Here, we extend snd_jack_new() to support phantom jack creating: pass in a bool param for [non-]phantom flag, and a bool param initial_jack to indicate whether we need to create a kctl at this stage. We can also add a kctl to the jack after its created meaning we can now integrate the HDA and ASoC jacks. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/jack.h')
-rw-r--r--include/sound/jack.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 433b13b89125..23bede121c78 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -87,7 +87,7 @@ struct snd_jack {
#ifdef CONFIG_SND_JACK
int snd_jack_new(struct snd_card *card, const char *id, int type,
- struct snd_jack **jack);
+ struct snd_jack **jack, bool initial_kctl, bool phantom_jack);
int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);
void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);
int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
@@ -97,7 +97,7 @@ void snd_jack_report(struct snd_jack *jack, int status);
#else
static inline int snd_jack_new(struct snd_card *card, const char *id, int type,
- struct snd_jack **jack)
+ struct snd_jack **jack, bool initial_kctl, bool phantom_jack)
{
return 0;
}