diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 17:22:30 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 17:22:30 (GMT) |
| commit | dbf117cbb9c89991727d42e3161e68b868a1b6ae (patch) | |
| tree | b3c0c07534952b493d2bdc9f73c54c6065b1691f /sound/pci/hda/hda_jack.h | |
| parent | 25dc16f69892182192b1234594fd3cf342ad4195 (diff) | |
| parent | 350eba43fca735733a51185f26bdc30899c64a20 (diff) | |
| download | linux-fsl-qoriq-dbf117cbb9c89991727d42e3161e68b868a1b6ae.tar.xz | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_jack.h')
| -rw-r--r-- | sound/pci/hda/hda_jack.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h index f8f97c7..c66655c 100644 --- a/sound/pci/hda/hda_jack.h +++ b/sound/pci/hda/hda_jack.h @@ -62,18 +62,7 @@ int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid, u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid); int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid); -static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) -{ - if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT)) - return false; - if (!codec->ignore_misc_bit && - (get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid)) & - AC_DEFCFG_MISC_NO_PRESENCE)) - return false; - if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP)) - return false; - return true; -} +bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid); int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, const char *name, int idx); |