Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index d3ea73171a3d..b9a6b66aeb0e 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -793,11 +793,11 @@ EXPORT_SYMBOL_GPL(snd_hda_add_verbs);
  */
 void snd_hda_apply_verbs(struct hda_codec *codec)
 {
+        const struct hda_verb **v;
         int i;
-        for (i = 0; i < codec->verbs.used; i++) {
-                struct hda_verb **v = snd_array_elem(&codec->verbs, i);
+
+        snd_array_for_each(&codec->verbs, i, v)
                 snd_hda_sequence_write(codec, *v);
-        }
 }
 EXPORT_SYMBOL_GPL(snd_hda_apply_verbs);
 
@@ -890,10 +890,10 @@ EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);
 static bool pin_config_match(struct hda_codec *codec,
                              const struct hda_pintbl *pins)
 {
+        const struct hda_pincfg *pin;
         int i;
 
-        for (i = 0; i < codec->init_pins.used; i++) {
-                struct hda_pincfg *pin = snd_array_elem(&codec->init_pins, i);
+        snd_array_for_each(&codec->init_pins, i, pin) {
                 hda_nid_t nid = pin->nid;
                 u32 cfg = pin->cfg;
                 const struct hda_pintbl *t_pins;