github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: vmaster: Use automatic cleanup of kfree()

Browse Source 
There are common patterns where a temporary buffer is allocated and
freed at the exit, and those can be simplified with the recent cleanup
mechanism via __free(kfree).

No functional changes, only code refactoring.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240222111509.28390-6-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2024-02-22 12:15:05 +01:00
parent ed96f6394e
commit fb9e197f3f
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/core/vmaster.c
View File

@ -56,7 +56,7 @@ struct link_follower {
static int follower_update(struct link_follower *follower) static int follower_update(struct link_follower *follower)
{ {
struct snd_ctl_elem_value *uctl; struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
int err, ch; int err, ch;
uctl = kzalloc(sizeof(*uctl), GFP_KERNEL); uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
@ -65,18 +65,16 @@ static int follower_update(struct link_follower *follower)
uctl->id = follower->follower.id; uctl->id = follower->follower.id;
err = follower->follower.get(&follower->follower, uctl); err = follower->follower.get(&follower->follower, uctl);
if (err < 0) if (err < 0)
goto error; return err;
for (ch = 0; ch < follower->info.count; ch++) for (ch = 0; ch < follower->info.count; ch++)
follower->vals[ch] = uctl->value.integer.value[ch]; follower->vals[ch] = uctl->value.integer.value[ch];
error: return 0;
kfree(uctl);
return err < 0 ? err : 0;
} }
/* get the follower ctl info and save the initial values */ /* get the follower ctl info and save the initial values */
static int follower_init(struct link_follower *follower) static int follower_init(struct link_follower *follower)
{ {
struct snd_ctl_elem_info *uinfo; struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
int err; int err;
if (follower->info.count) { if (follower->info.count) {
@ -91,22 +89,18 @@ static int follower_init(struct link_follower *follower)
return -ENOMEM; return -ENOMEM;
uinfo->id = follower->follower.id; uinfo->id = follower->follower.id;
err = follower->follower.info(&follower->follower, uinfo); err = follower->follower.info(&follower->follower, uinfo);
if (err < 0) { if (err < 0)
kfree(uinfo);
return err; return err;
}
follower->info.type = uinfo->type; follower->info.type = uinfo->type;
follower->info.count = uinfo->count; follower->info.count = uinfo->count;
if (follower->info.count > 2 || if (follower->info.count > 2 ||
(follower->info.type != SNDRV_CTL_ELEM_TYPE_INTEGER && (follower->info.type != SNDRV_CTL_ELEM_TYPE_INTEGER &&
follower->info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) { follower->info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) {
pr_err("ALSA: vmaster: invalid follower element\n"); pr_err("ALSA: vmaster: invalid follower element\n");
kfree(uinfo);
return -EINVAL; return -EINVAL;
} }
follower->info.min_val = uinfo->value.integer.min; follower->info.min_val = uinfo->value.integer.min;
follower->info.max_val = uinfo->value.integer.max; follower->info.max_val = uinfo->value.integer.max;
kfree(uinfo);
return follower_update(follower); return follower_update(follower);
} }
@ -341,7 +335,7 @@ static int master_get(struct snd_kcontrol *kcontrol,
static int sync_followers(struct link_master *master, int old_val, int new_val) static int sync_followers(struct link_master *master, int old_val, int new_val)
{ {
struct link_follower *follower; struct link_follower *follower;
struct snd_ctl_elem_value *uval; struct snd_ctl_elem_value *uval __free(kfree) = NULL;
uval = kmalloc(sizeof(*uval), GFP_KERNEL); uval = kmalloc(sizeof(*uval), GFP_KERNEL);
if (!uval) if (!uval)
@ -353,7 +347,6 @@ static int sync_followers(struct link_master *master, int old_val, int new_val)
master->val = new_val; master->val = new_val;
follower_put_val(follower, uval); follower_put_val(follower, uval);
} }
kfree(uval);
return 0; return 0;
} }