diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-12-01 17:41:36 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-01 17:47:54 +0100 |
| commit | 31ef22579302ac42054bebecb528710f46580925 (patch) | |
| tree | 8f521b4920f0a1ebbb1e6f9105948a5f38f24404 /sound/pci/hda/hda_local.h | |
| parent | ALSA: hda - Don't add channel suffix for headphone pin labels (diff) | |
| download | linux-dev-31ef22579302ac42054bebecb528710f46580925.tar.xz linux-dev-31ef22579302ac42054bebecb528710f46580925.zip | |
ALSA: hda - Integrate input-jack stuff into kctl-jack
Instead of managing input-jack stuff separately, call all stuff inside
the kctl-jack creation, deletion and report. The caller no longer needs
to care about input-jack.
The better integration between input-jack and kctl-jack should be done
in the upper layer in near future, but for now, it's implemented locally
for more tests.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index ef09716aeb6f..e1abc07f7436 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -674,24 +674,4 @@ static inline void snd_hda_eld_proc_free(struct hda_codec *codec, #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80 void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen); -/* - * Input-jack notification support - */ -#ifdef CONFIG_SND_HDA_INPUT_JACK -int snd_hda_input_jack_add(struct hda_codec *codec, hda_nid_t nid, int type, - const char *name); -void snd_hda_input_jack_report(struct hda_codec *codec, hda_nid_t nid); -#else /* CONFIG_SND_HDA_INPUT_JACK */ -static inline int snd_hda_input_jack_add(struct hda_codec *codec, - hda_nid_t nid, int type, - const char *name) -{ - return 0; -} -static inline void snd_hda_input_jack_report(struct hda_codec *codec, - hda_nid_t nid) -{ -} -#endif /* CONFIG_SND_HDA_INPUT_JACK */ - #endif /* __SOUND_HDA_LOCAL_H */ |