From patchwork Thu Jul 14 14:07:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Sakamoto X-Patchwork-Id: 9229919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4535B6075D for ; Thu, 14 Jul 2016 14:21:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3332527F94 for ; Thu, 14 Jul 2016 14:21:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2621D281A7; Thu, 14 Jul 2016 14:21:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C7A327F94 for ; Thu, 14 Jul 2016 14:21:11 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 71CC9266D79; Thu, 14 Jul 2016 16:21:10 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9064A266858; Thu, 14 Jul 2016 16:08:42 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 10681265A73; Thu, 14 Jul 2016 16:08:37 +0200 (CEST) Received: from smtp-proxy003.phy.lolipop.jp (smtp-proxy003.phy.lolipop.jp [157.7.104.44]) by alsa0.perex.cz (Postfix) with ESMTP id AB0C8265A73 for ; Thu, 14 Jul 2016 16:08:09 +0200 (CEST) Received: from smtp-proxy003.phy.lolipop.lan (HELO smtp-proxy003.phy.lolipop.jp) (172.19.44.44) (smtp-auth username m12129643-o-takashi, mechanism plain) by smtp-proxy003.phy.lolipop.jp (qpsmtpd/0.82) with ESMTPA; Thu, 14 Jul 2016 23:08:05 +0900 Received: from 127.0.0.1 (127.0.0.1) by smtp-proxy003.phy.lolipop.jp (LOLIPOP-Fsecure); Thu, 14 Jul 2016 23:07:52 +0900 (JST) X-Virus-Status: clean(LOLIPOP-Fsecure) From: Takashi Sakamoto To: tiwai@suse.de Date: Thu, 14 Jul 2016 23:07:32 +0900 Message-Id: <1468505271-5769-16-git-send-email-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468505271-5769-1-git-send-email-o-takashi@sakamocchi.jp> References: <1468505271-5769-1-git-send-email-o-takashi@sakamocchi.jp> Cc: alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH 15/34] pcm: remove alloca() from snd_pcm_hw_get_chmap() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Both of alloca() and automatic variables keeps 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 --- src/pcm/pcm_hw.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index e7a2393..20c233b 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -1206,8 +1206,8 @@ static snd_pcm_chmap_t *snd_pcm_hw_get_chmap(snd_pcm_t *pcm) snd_pcm_hw_t *hw = pcm->private_data; snd_pcm_chmap_t *map; snd_ctl_t *ctl; - snd_ctl_elem_id_t *id; - snd_ctl_elem_value_t *val; + snd_ctl_elem_id_t id = {0}; + snd_ctl_elem_value_t val = {0}; unsigned int i; int ret; @@ -1241,11 +1241,9 @@ static snd_pcm_chmap_t *snd_pcm_hw_get_chmap(snd_pcm_t *pcm) chmap_caps_set_error(hw, CHMAP_CTL_GET); return NULL; } - snd_ctl_elem_value_alloca(&val); - snd_ctl_elem_id_alloca(&id); - fill_chmap_ctl_id(pcm, id); - snd_ctl_elem_value_set_id(val, id); - ret = snd_ctl_elem_read(ctl, val); + fill_chmap_ctl_id(pcm, &id); + snd_ctl_elem_value_set_id(&val, &id); + ret = snd_ctl_elem_read(ctl, &val); snd_ctl_close(ctl); if (ret < 0) { free(map); @@ -1254,7 +1252,7 @@ static snd_pcm_chmap_t *snd_pcm_hw_get_chmap(snd_pcm_t *pcm) return NULL; } for (i = 0; i < pcm->channels; i++) - map->pos[i] = snd_ctl_elem_value_get_integer(val, i); + map->pos[i] = snd_ctl_elem_value_get_integer(&val, i); chmap_caps_set_ok(hw, CHMAP_CTL_GET); return map; }