[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230829142307.3916823-1-andriy.shevchenko@linux.intel.com>
Date: Tue, 29 Aug 2023 17:23:07 +0300
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: alsa-devel@...a-project.org, linux-kernel@...r.kernel.org
Cc: Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: [PATCH v2 1/1] ALSA: control: Use list_for_each_entry_safe()
Instead of reiterating the list, use list_for_each_entry_safe()
that allows to continue without starting over.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Reviewed-by: Jaroslav Kysela <perex@...ex.cz>
---
v2: fixed a typo (Jaroslav), added tag (Jaroslav)
sound/core/control_led.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/sound/core/control_led.c b/sound/core/control_led.c
index a78eb48927c7..43ea995c095a 100644
--- a/sound/core/control_led.c
+++ b/sound/core/control_led.c
@@ -297,16 +297,13 @@ static void snd_ctl_led_clean(struct snd_card *card)
{
unsigned int group;
struct snd_ctl_led *led;
- struct snd_ctl_led_ctl *lctl;
+ struct snd_ctl_led_ctl *lctl, _lctl;
for (group = 0; group < MAX_LED; group++) {
led = &snd_ctl_leds[group];
-repeat:
- list_for_each_entry(lctl, &led->controls, list)
- if (!card || lctl->card == card) {
+ list_for_each_entry_safe(lctl, _lctl, &led->controls, list)
+ if (!card || lctl->card == card)
snd_ctl_led_ctl_destroy(lctl);
- goto repeat;
- }
}
}
@@ -314,7 +311,7 @@ static int snd_ctl_led_reset(int card_number, unsigned int group)
{
struct snd_card *card;
struct snd_ctl_led *led;
- struct snd_ctl_led_ctl *lctl;
+ struct snd_ctl_led_ctl *lctl, _lctl;
struct snd_kcontrol_volatile *vd;
bool change = false;
@@ -329,14 +326,12 @@ static int snd_ctl_led_reset(int card_number, unsigned int group)
return -ENXIO;
}
led = &snd_ctl_leds[group];
-repeat:
- list_for_each_entry(lctl, &led->controls, list)
+ list_for_each_entry_safe(lctl, _lctl, &led->controls, list)
if (lctl->card == card) {
vd = &lctl->kctl->vd[lctl->index_offset];
vd->access &= ~group_to_access(group);
snd_ctl_led_ctl_destroy(lctl);
change = true;
- goto repeat;
}
mutex_unlock(&snd_ctl_led_mutex);
if (change)
--
2.40.0.1.gaa8946217a0b
Powered by blists - more mailing lists