Commit 80b917a8 authored by Nikhil Mahale's avatar Nikhil Mahale Committed by Takashi Iwai

ALSA: hda - Rename snd_hda_pin_sense to snd_hda_jack_pin_sense

s/snd_hda_pin_sense/snd_hda_jack_pin_sense/g

This aligns the snd_hda_pin_sense function name with the names of
other functions in hda_jack.h.
Signed-off-by: default avatarNikhil Mahale <nmahale@nvidia.com>
Reviewed-by: default avatarAaron Plattner <aplattner@nvidia.com>
Link: https://lore.kernel.org/r/20191119084710.29267-2-nmahale@nvidia.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ee906c6b
...@@ -191,14 +191,14 @@ void snd_hda_jack_set_dirty_all(struct hda_codec *codec) ...@@ -191,14 +191,14 @@ void snd_hda_jack_set_dirty_all(struct hda_codec *codec)
EXPORT_SYMBOL_GPL(snd_hda_jack_set_dirty_all); EXPORT_SYMBOL_GPL(snd_hda_jack_set_dirty_all);
/** /**
* snd_hda_pin_sense - execute pin sense measurement * snd_hda_jack_pin_sense - execute pin sense measurement
* @codec: the CODEC to sense * @codec: the CODEC to sense
* @nid: the pin NID to sense * @nid: the pin NID to sense
* *
* Execute necessary pin sense measurement and return its Presence Detect, * Execute necessary pin sense measurement and return its Presence Detect,
* Impedance, ELD Valid etc. status bits. * Impedance, ELD Valid etc. status bits.
*/ */
u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid) u32 snd_hda_jack_pin_sense(struct hda_codec *codec, hda_nid_t nid)
{ {
struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid); struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
if (jack) { if (jack) {
...@@ -207,7 +207,7 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid) ...@@ -207,7 +207,7 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
} }
return read_pin_sense(codec, nid); return read_pin_sense(codec, nid);
} }
EXPORT_SYMBOL_GPL(snd_hda_pin_sense); EXPORT_SYMBOL_GPL(snd_hda_jack_pin_sense);
/** /**
* snd_hda_jack_detect_state - query pin Presence Detect status * snd_hda_jack_detect_state - query pin Presence Detect status
...@@ -222,7 +222,7 @@ int snd_hda_jack_detect_state(struct hda_codec *codec, hda_nid_t nid) ...@@ -222,7 +222,7 @@ int snd_hda_jack_detect_state(struct hda_codec *codec, hda_nid_t nid)
struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid); struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
if (jack && jack->phantom_jack) if (jack && jack->phantom_jack)
return HDA_JACK_PHANTOM; return HDA_JACK_PHANTOM;
else if (snd_hda_pin_sense(codec, nid) & AC_PINSENSE_PRESENCE) else if (snd_hda_jack_pin_sense(codec, nid) & AC_PINSENSE_PRESENCE)
return HDA_JACK_PRESENT; return HDA_JACK_PRESENT;
else else
return HDA_JACK_NOT_PRESENT; return HDA_JACK_NOT_PRESENT;
......
...@@ -65,7 +65,7 @@ snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, ...@@ -65,7 +65,7 @@ snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid,
int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid, int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid,
hda_nid_t gating_nid); hda_nid_t gating_nid);
u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid); u32 snd_hda_jack_pin_sense(struct hda_codec *codec, hda_nid_t nid);
/* the jack state returned from snd_hda_jack_detect_state() */ /* the jack state returned from snd_hda_jack_detect_state() */
enum { enum {
......
...@@ -1505,7 +1505,7 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, ...@@ -1505,7 +1505,7 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin,
bool ret; bool ret;
bool do_repoll = false; bool do_repoll = false;
present = snd_hda_pin_sense(codec, pin_nid); present = snd_hda_jack_pin_sense(codec, pin_nid);
mutex_lock(&per_pin->lock); mutex_lock(&per_pin->lock);
eld->monitor_present = !!(present & AC_PINSENSE_PRESENCE); eld->monitor_present = !!(present & AC_PINSENSE_PRESENCE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment