[v1,3/4] ALSA: hda - Change return type of update_eld() to void

Commit Message

Nikhil Mahale Feb. 4, 2020, 7:20 a.m. UTC

snd_jack_report() does nothing is old and new status are same.

Signed-off-by: Nikhil Mahale <[e-mail]>
---
 sound/pci/hda/patch_hdmi.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Takashi Iwai Feb. 4, 2020, 8:07 a.m. UTC | #1

On Tue, 04 Feb 2020 08:20:16 +0100,
Nikhil Mahale wrote:
> 
> snd_jack_report() does nothing is old and new status are same.

Actually it does but partially.  The jack infrastructure provides two
interfaces, the kctl element and the input device.  The former reports
only when the state is really changed while the latter reports always
when snd_jack_report() is called.


thanks,

Takashi

Patch

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index de45f5e5c724..1cf0604020bc 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1485,7 +1485,7 @@  static void hdmi_pcm_reset_pin(struct hdmi_spec *spec,
 /* update per_pin ELD from the given new ELD;
  * setup info frame and notification accordingly
  */
-static bool update_eld(struct hda_codec *codec,
+static void update_eld(struct hda_codec *codec,
 		       struct hdmi_spec_per_pin *per_pin,
 		       struct hdmi_eld *eld)
 {
@@ -1549,7 +1549,6 @@  static bool update_eld(struct hda_codec *codec,
 			       SNDRV_CTL_EVENT_MASK_VALUE |
 			       SNDRV_CTL_EVENT_MASK_INFO,
 			       &get_hdmi_pcm(spec, pcm_idx)->eld_ctl->id);
-	return eld_changed;
 }
 
 /* update ELD and jack state via HD-audio verbs */
@@ -1654,7 +1653,6 @@  static void sync_eld_via_acomp(struct hda_codec *codec,
 	struct hdmi_spec *spec = codec->spec;
 	struct hdmi_eld *eld = &spec->temp_eld;
 	struct snd_jack *jack = NULL;
-	bool changed;
 	int size;
 
 	mutex_lock(&per_pin->lock);
@@ -1681,10 +1679,10 @@  static void sync_eld_via_acomp(struct hda_codec *codec,
 	 * disconnected event. Jack must be fetched before update_eld()
 	 */
 	jack = pin_idx_to_jack(codec, per_pin);
-	changed = update_eld(codec, per_pin, eld);
+	update_eld(codec, per_pin, eld);
 	if (jack == NULL)
 		jack = pin_idx_to_jack(codec, per_pin);
-	if (changed && jack)
+	if (jack)
 		snd_jack_report(jack,
 				(eld->monitor_present && eld->eld_valid) ?
 				SND_JACK_AVOUT : 0);