From patchwork Sat Aug 26 08:29:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: anish kumar X-Patchwork-Id: 9923257 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 A1363602BD for ; Sat, 26 Aug 2017 08:30:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BC0C2856B for ; Sat, 26 Aug 2017 08:30:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80B1D285C5; Sat, 26 Aug 2017 08:30:19 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no 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 9173A2856B for ; Sat, 26 Aug 2017 08:30:18 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E64DD2678EE; Sat, 26 Aug 2017 10:30:10 +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 0B69B267428; Sat, 26 Aug 2017 10:30:06 +0200 (CEST) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by alsa0.perex.cz (Postfix) with ESMTP id DD3662678AF for ; Sat, 26 Aug 2017 10:29:54 +0200 (CEST) Received: by mail-pg0-f66.google.com with SMTP id 63so2432497pgc.1 for ; Sat, 26 Aug 2017 01:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=PE7lsXQ/VeK4+0gU/7vlqO8fKSPafbW77N8Jfe2KXH4=; b=F3dePXrwWEUxuOm6PSWEHS8nQMa86HkFuAGKd4xSvfQNfNplAivFg+C0/GbQU3i/T9 8A+wSB9X7eA6uSnAaFgQOcMI/NuxGYB0fYQGLLDiIItrIpA5v9Br67Kd8LeZM2uw13Bf qvgANqK4UVM2DL9Ho87xOa8y3b/Jh4leM3qPX8fWtvKoEIMsElK7h1mbuRPtrD/btvjH gSnARaqZAETxrG+UJR+fpUKDnJxLn/qR1StEB3P1Dpb9rA8t64HWNx13nl3ujsTqGNgs ovTs9phKNZPnkGuyGhIxt44f2NhJAiHygtN/8b7w8sAJLNWAClXxoETJPCVaPfoZe6Q+ QqSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PE7lsXQ/VeK4+0gU/7vlqO8fKSPafbW77N8Jfe2KXH4=; b=JwS/2FkdTdcr1lTI3N2nVd7ogNGriP9riNbr6/LG8M/ar+t15C6jTISxg5YEbO5vfs JhrkVR56ZDalBiKBubMFMQF34zNvZpxqJyB3uLwRRW7miPeSzcsqjJx0MdAj7SNtzKNM ifsEJxCx0wel1wHru54s9K/xKYZ9zO3K1mWB5RlYaI+U/x0w6kY2SbnrwlM4lJYdpUVU 3SxZnwGyZ6JdgLZBXP22rx117RPaAeCXmp/+AD3WDtkuPNZTbE2nZZBCpd4EAdvncRvG y0BlFCR44EOI9/v53pdxBk9GdxSgFFSnk351WBw6D6XtAx66CkxphKKJmfpdCtrMiOW7 bbLg== X-Gm-Message-State: AHYfb5jgdCUIDyJ0NilGGuVDpNLBJfpZDqylhLyCkeVDW5Z2wA7Ja7E+ 3YHF6tmJ0h6i9A== X-Received: by 10.84.131.74 with SMTP id 68mr1222212pld.83.1503736193500; Sat, 26 Aug 2017 01:29:53 -0700 (PDT) Received: from AIKUMA-MBP.hsd1.ca.comcast.net. ([24.6.106.169]) by smtp.googlemail.com with ESMTPSA id 66sm14212588pfq.20.2017.08.26.01.29.52 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 26 Aug 2017 01:29:52 -0700 (PDT) From: anish kumar To: broonie@kernel.org Date: Sat, 26 Aug 2017 01:29:50 -0700 Message-Id: <20170826082950.35560-1-yesanishhere@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) Cc: anish kumar , alsa-devel@alsa-project.org, tiwai@suse.com, lgirdwood@gmail.com Subject: [alsa-devel] [patch 3/4] ASoC: dapm: Avoid creating kcontrol for params 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 Currently in codec to codec dai link if there are multiple params defined then dapm can use created kcontrol to decide which param to apply at runtime. However, in case there is only single param configuration then there is no point in creating the kcontrol and also there is no point in allocating memory for kcontrol. In the snd_soc_dapm_new_pcm function, there is memory allocation happening for kcontrol which is later used or not used based on num_param. It is better to not allocate memory when there is only a single configuration. This change is to remedy that anomaly. Signed-off-by: anish kumar --- sound/soc/soc-dapm.c | 116 +++++++++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 49 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1687c8a..5d792dc 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3778,18 +3778,12 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, return 0; } -int snd_soc_dapm_new_pcm(struct snd_soc_card *card, - const struct snd_soc_pcm_stream *params, - unsigned int num_params, - struct snd_soc_dapm_widget *source, - struct snd_soc_dapm_widget *sink) +static struct snd_kcontrol_new * +snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card, + char *link_name, + const struct snd_soc_pcm_stream *params, + int num_params) { - struct snd_soc_dapm_widget template; - struct snd_soc_dapm_widget *w; - char *link_name; - int ret, count; - unsigned long private_value; - const char **w_param_text; struct soc_enum w_param_enum[] = { SOC_ENUM_SINGLE(0, 0, 0, NULL), }; @@ -3798,19 +3792,16 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, snd_soc_dapm_dai_link_get, snd_soc_dapm_dai_link_put), }; + struct snd_kcontrol_new *kcontrol_news; const struct snd_soc_pcm_stream *config = params; + const char **w_param_text; + unsigned long private_value; + int count; w_param_text = devm_kcalloc(card->dev, num_params, - sizeof(char *), GFP_KERNEL); + sizeof(char *), GFP_KERNEL); if (!w_param_text) - return -ENOMEM; - - link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s", - source->name, sink->name); - if (!link_name) { - ret = -ENOMEM; - goto outfree_w_param; - } + return NULL; for (count = 0 ; count < num_params; count++) { if (!config->stream_name) { @@ -3827,24 +3818,14 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, strlen(config->stream_name) + 1, GFP_KERNEL); } - if (!w_param_text[count]) { - ret = -ENOMEM; - goto outfree_link_name; - } + if (!w_param_text[count]) + goto outfree_w_param; config++; } + w_param_enum[0].items = num_params; w_param_enum[0].texts = w_param_text; - memset(&template, 0, sizeof(template)); - template.reg = SND_SOC_NOPM; - template.id = snd_soc_dapm_dai_link; - template.name = link_name; - template.event = snd_soc_dai_link_event; - template.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | - SND_SOC_DAPM_PRE_PMD; - template.num_kcontrols = 1; - /* duplicate w_param_enum on heap so that memory persists */ private_value = (unsigned long) devm_kmemdup(card->dev, (void *)(kcontrol_dai_link[0].private_value), @@ -3852,22 +3833,67 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, if (!private_value) { dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", link_name); - ret = -ENOMEM; - goto outfree_link_name; + goto outfree_w_param; } kcontrol_dai_link[0].private_value = private_value; /* duplicate kcontrol_dai_link on heap so that memory persists */ - template.kcontrol_news = - devm_kmemdup(card->dev, &kcontrol_dai_link[0], - sizeof(struct snd_kcontrol_new), - GFP_KERNEL); - if (!template.kcontrol_news) { + kcontrol_news = + devm_kmemdup(card->dev, &kcontrol_dai_link[0], + sizeof(struct snd_kcontrol_new), + GFP_KERNEL); + if (!kcontrol_news) { dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", link_name); - ret = -ENOMEM; goto outfree_private_value; } + return kcontrol_news; + +outfree_private_value: + devm_kfree(card->dev, (void *)private_value); +outfree_w_param: + for (count = 0 ; count < num_params; count++) + if (w_param_text[count] != NULL) + devm_kfree(card->dev, (void *)w_param_text[count]); + devm_kfree(card->dev, w_param_text); + return NULL; +} +int snd_soc_dapm_new_pcm(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params, + struct snd_soc_dapm_widget *source, + struct snd_soc_dapm_widget *sink) +{ + struct snd_soc_dapm_widget template; + struct snd_soc_dapm_widget *w; + char *link_name; + int ret; + + link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s", + source->name, sink->name); + if (!link_name) + return -ENOMEM; + + memset(&template, 0, sizeof(template)); + template.reg = SND_SOC_NOPM; + template.id = snd_soc_dapm_dai_link; + template.name = link_name; + template.event = snd_soc_dai_link_event; + template.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | + SND_SOC_DAPM_PRE_PMD; + template.kcontrol_news = NULL; + + /* allocate memory for control, only in case of multiple configs */ + if (num_params > 1) { + template.num_kcontrols = 1; + template.kcontrol_news = + snd_soc_dapm_alloc_kcontrol(card, + link_name, params, num_params); + if (!template.kcontrol_news) { + ret = -ENOMEM; + goto outfree_link_name; + } + } dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); @@ -3899,16 +3925,8 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, devm_kfree(card->dev, w); outfree_kcontrol_news: devm_kfree(card->dev, (void *)template.kcontrol_news); -outfree_private_value: - devm_kfree(card->dev, (void *)private_value); outfree_link_name: devm_kfree(card->dev, link_name); - for (count = 0 ; count < num_params; count++) - if (w_param_text[count]) - devm_kfree(card->dev, (void *)w_param_text[count]); -outfree_w_param: - devm_kfree(card->dev, w_param_text); - return ret; }