mixer: remove alloca() from get_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 <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2016-07-15 09:23:28 +09:00 committed by Takashi Iwai
parent ed49382fda
commit 3fa73d7558

View file

@ -1342,7 +1342,7 @@ static int get_enum_item_ops(snd_mixer_elem_t *elem,
unsigned int *itemp) unsigned int *itemp)
{ {
selem_none_t *s = snd_mixer_elem_get_private(elem); 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; snd_hctl_elem_t *helem;
int err; int err;
@ -1352,10 +1352,9 @@ static int get_enum_item_ops(snd_mixer_elem_t *elem,
if (!helem) helem = s->ctls[CTL_PLAYBACK_ENUM].elem; if (!helem) helem = s->ctls[CTL_PLAYBACK_ENUM].elem;
if (!helem) helem = s->ctls[CTL_CAPTURE_ENUM].elem; if (!helem) helem = s->ctls[CTL_CAPTURE_ENUM].elem;
assert(helem); assert(helem);
snd_ctl_elem_value_alloca(&ctl); err = snd_hctl_elem_read(helem, &ctl);
err = snd_hctl_elem_read(helem, ctl);
if (! err) if (! err)
*itemp = snd_ctl_elem_value_get_enumerated(ctl, channel); *itemp = snd_ctl_elem_value_get_enumerated(&ctl, channel);
return err; return err;
} }