From 43ac77e900b2b89547cb83825d48686b43787329 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Fri, 15 Jul 2016 09:23:29 +0900 Subject: mixer: remove alloca() from set_enum_item_ops() Both of alloca() and automatic variables keep storages on stack, while the former generates more instructions than the latter. It's better to use the latter if the size of storage is computable at pre-compile or compile time; i.e. just for structures. This commit obsolete usages of alloca() with automatic variables. Signed-off-by: Takashi Sakamoto Signed-off-by: Takashi Iwai --- src/mixer/simple_none.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 3362f826..3ee1168f 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -1363,7 +1363,7 @@ static int set_enum_item_ops(snd_mixer_elem_t *elem, unsigned int item) { selem_none_t *s = snd_mixer_elem_get_private(elem); - snd_ctl_elem_value_t *ctl; + snd_ctl_elem_value_t ctl = {0}; snd_hctl_elem_t *helem; int err; int type; @@ -1385,13 +1385,12 @@ static int set_enum_item_ops(snd_mixer_elem_t *elem, if (item >= (unsigned int)s->ctls[type].max) { return -EINVAL; } - snd_ctl_elem_value_alloca(&ctl); - err = snd_hctl_elem_read(helem, ctl); + err = snd_hctl_elem_read(helem, &ctl); if (err < 0) { return err; } - snd_ctl_elem_value_set_enumerated(ctl, channel, item); - return snd_hctl_elem_write(helem, ctl); + snd_ctl_elem_value_set_enumerated(&ctl, channel, item); + return snd_hctl_elem_write(helem, &ctl); } static struct sm_elem_ops simple_none_ops = { -- cgit v1.2.1