2024-04-24 14:50:32

by Andy Shevchenko

Subject: [PATCH v3 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 <[email protected]>
Reviewed-by: Jaroslav Kysela <[email protected]>
---
v3: Update snd_ctl_led_reset() in the same way (Takashi)
v2: 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 061a8ea23340..804805a95e2f 100644
--- a/sound/core/control_led.c
+++ b/sound/core/control_led.c
@@ -289,25 +289,22 @@ static void snd_ctl_led_ctl_destroy(struct snd_ctl_led_ctl *lctl)
static void snd_ctl_led_clean(struct snd_card *card)
{
unsigned int group;
+ struct snd_ctl_led_ctl *lctl, *_lctl;
struct snd_ctl_led *led;
- struct snd_ctl_led_ctl *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;
- }
}
}

static int snd_ctl_led_reset(int card_number, unsigned int group)
{
struct snd_card *card __free(snd_card_unref) = NULL;
+ struct snd_ctl_led_ctl *lctl, *_lctl;
struct snd_ctl_led *led;
- struct snd_ctl_led_ctl *lctl;
struct snd_kcontrol_volatile *vd;
bool change = false;

@@ -319,14 +316,12 @@ static int snd_ctl_led_reset(int card_number, unsigned int group)
if (!snd_ctl_led_card_valid[card_number])
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;
}
}
if (change)
--
2.43.0.rc1.1336.g36b5255a03ac

2024-04-24 15:16:18

by Takashi Iwai

Subject: Re: [PATCH v3 1/1] ALSA: control: Use list_for_each_entry_safe()

On Wed, 24 Apr 2024 16:49:41 +0200,
Andy Shevchenko wrote:
>
> Instead of reiterating the list, use list_for_each_entry_safe()
> that allows to continue without starting over.
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> Reviewed-by: Jaroslav Kysela <[email protected]>
> ---
> v3: Update snd_ctl_led_reset() in the same way (Takashi)
> v2: added tag (Jaroslav)

Thanks, applied now.


Takashi