From patchwork Sat Apr 26 11:02:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 4068001 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A75DA9F271 for ; Sat, 26 Apr 2014 11:02:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E212E20304 for ; Sat, 26 Apr 2014 11:02:55 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 19A11202AE for ; Sat, 26 Apr 2014 11:02:54 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D26C52610CE; Sat, 26 Apr 2014 13:02:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 53A24261092; Sat, 26 Apr 2014 13:02:41 +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 6F1982610A3; Sat, 26 Apr 2014 13:02:39 +0200 (CEST) Received: from smtp-out-171.synserver.de (smtp-out-139.synserver.de [212.40.185.139]) by alsa0.perex.cz (Postfix) with ESMTP id 516132608ED for ; Sat, 26 Apr 2014 13:02:31 +0200 (CEST) Received: (qmail 9379 invoked by uid 0); 26 Apr 2014 11:02:28 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 9289 Received: from ppp-93-104-14-107.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [93.104.14.107] by 217.119.54.77 with SMTP; 26 Apr 2014 11:02:28 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Sat, 26 Apr 2014 13:02:29 +0200 Message-Id: <1398510149-24032-1-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 Cc: Fabien Parent , Misael Lopez Cruz , Lars-Peter Clausen , alsa-devel@alsa-project.org, Benoit Cousson Subject: [alsa-devel] [PATCH] ASoC: Remove name_prefix unset during DAI link init hack again 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 This was initially removed in commit 6479f15ad ("ASoC: Remove name_prefix unset during DAI link init hack"), but was brought back in commit 503ae5e0 ("ASoC: core: Add helpers for dai link and aux dev init") by accident. This patch removes it again. Signed-off-by: Lars-Peter Clausen --- sound/soc/soc-core.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f18112a..94c1668 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1272,14 +1272,10 @@ static int soc_aux_dev_init(struct snd_soc_card *card, { struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num]; struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num]; - const char *temp; int ret; rtd->card = card; - temp = codec->name_prefix; - codec->name_prefix = NULL; - /* do machine specific initialization */ if (aux_dev->init) { ret = aux_dev->init(&codec->dapm); @@ -1287,8 +1283,6 @@ static int soc_aux_dev_init(struct snd_soc_card *card, return ret; } - codec->name_prefix = temp; - rtd->codec = codec; return 0; @@ -1300,15 +1294,10 @@ static int soc_dai_link_init(struct snd_soc_card *card, { struct snd_soc_dai_link *dai_link = &card->dai_link[num]; struct snd_soc_pcm_runtime *rtd = &card->rtd[num]; - const char *temp; int ret; rtd->card = card; - /* machine controls, routes and widgets are not prefixed */ - temp = codec->name_prefix; - codec->name_prefix = NULL; - /* do machine specific initialization */ if (dai_link->init) { ret = dai_link->init(rtd); @@ -1316,8 +1305,6 @@ static int soc_dai_link_init(struct snd_soc_card *card, return ret; } - codec->name_prefix = temp; - rtd->codec = codec; return 0;