diff options
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 f8f97c71c9c1..c66655cf413a 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, | |||
62 | u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid); | 62 | u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid); |
63 | int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid); | 63 | int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid); |
64 | 64 | ||
65 | static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) | 65 | bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid); |
66 | { | ||
67 | if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT)) | ||
68 | return false; | ||
69 | if (!codec->ignore_misc_bit && | ||
70 | (get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid)) & | ||
71 | AC_DEFCFG_MISC_NO_PRESENCE)) | ||
72 | return false; | ||
73 | if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP)) | ||
74 | return false; | ||
75 | return true; | ||
76 | } | ||
77 | 66 | ||
78 | int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, | 67 | int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, |
79 | const char *name, int idx); | 68 | const char *name, int idx); |