ALSA: hda - Add snd_hda_check_power_state() helper function

... for small refactoring.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 2311114bf52c1dff08e6dc2a638cb6b4f3255b9c..f82a64da2f1b0eed2d6f407468f40365623dee70 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3779,18 +3779,13 @@ static void sync_power_up_states(struct hda_codec *codec)
 
        for (i = 0; i < codec->num_nodes; i++, nid++) {
                unsigned int wcaps = get_wcaps(codec, nid);
-               unsigned int state, target;
+               unsigned int target;
                if (!(wcaps & AC_WCAP_POWER))
                        continue;
                target = codec->power_filter(codec, nid, AC_PWRST_D0);
                if (target == AC_PWRST_D0)
                        continue;
-               state = snd_hda_codec_read(codec, nid, 0,
-                                          AC_VERB_GET_POWER_STATE, 0);
-               if (state & AC_PWRST_ERROR)
-                       continue;
-               state = (state >> 4) & 0x0f;
-               if (state != target)
+               if (!snd_hda_check_power_state(codec, nid, target))
                        snd_hda_codec_write(codec, nid, 0,
                                            AC_VERB_SET_POWER_STATE, target);
        }

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 2ff62dcf2fcb815406bc27b0ce634aed6cefffe6..05f1d594d17b5510aeda4a103c57ae445fa89ef1 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -657,6 +657,19 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec,
                                 struct hda_loopback_check *check,
                                 hda_nid_t nid);
 
+/* check whether the actual power state matches with the target state */
+static inline bool
+snd_hda_check_power_state(struct hda_codec *codec, hda_nid_t nid,
+                         unsigned int target_state)
+{
+       unsigned int state = snd_hda_codec_read(codec, nid, 0,
+                                               AC_VERB_GET_POWER_STATE, 0);
+       if (state & AC_PWRST_ERROR)
+               return true;
+       state = (state >> 4) & 0x0f;
+       return (state != target_state);
+}
+
 /*
  * AMP control callbacks
  */

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 5bd4b0c100030814d60aa0985478f06a08333abe..9641c0e487bbe38efe025767b0e8fc6be5a5db44 100644 (file)
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -240,10 +240,7 @@ static void set_widgets_power_state(struct hda_codec *codec)
 static void update_power_state(struct hda_codec *codec, hda_nid_t nid,
                               unsigned int parm)
 {
-       unsigned int state = snd_hda_codec_read(codec, nid, 0,
-                                               AC_VERB_GET_POWER_STATE, 0);
-       state = (state >> 4) & 0x0f;
-       if (state == parm)
+       if (snd_hda_check_power_state(codec, nid, parm))
                return;
        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
 }
@@ -253,10 +250,8 @@ static void update_conv_power_state(struct hda_codec *codec, hda_nid_t nid,
 {
        struct via_spec *spec = codec->spec;
        unsigned int format;
-       unsigned int state = snd_hda_codec_read(codec, nid, 0,
-                                               AC_VERB_GET_POWER_STATE, 0);
-       state = (state >> 4) & 0x0f;
-       if (state == parm)
+
+       if (snd_hda_check_power_state(codec, nid, parm))
                return;
        format = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);
        if (format && (spec->dac_stream_tag[index] != format))