From patchwork Mon Sep 17 21:21:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146864 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4245362ljw; Mon, 17 Sep 2018 14:21:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYkEuk9RaMG235iYdBbbCqtoGH0MPtsgq55dKVyFFCLgAw/+/o4+xw7/LfbcsfNxD0CojHc X-Received: by 2002:adf:b7c9:: with SMTP id t9-v6mr19744428wre.274.1537219282565; Mon, 17 Sep 2018 14:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537219282; cv=none; d=google.com; s=arc-20160816; b=qro5eK89b21J7Os7gXaXcPiQmiOhIHAm51Xco5DckEVUOz0KPm11F6+prVqHe8rvva uw/lLtN0wDL4kfZ7hhYN9OgbueCp4t1lNY+XgzSpg8Y5sz6AhrUgKMUNAc+JXKE2RQUk ciPWqk+arz+LkqSgX1YC+5eoGcRpJmuMdys6/I2Gkt7DuspF1Tj0ZPGD7B/N++YTO+Jq iJgwZGMFNxR8zXuq5XvACahTF76C94qXY6hvhslDSwXijGT74xsdiJLVyuWXurk4A+ph DMF55DZ+TrRo/EiDguMQ1M/xkj64O5C8LiCjN6N9VBZWCWLMbEVOI8QnA/ElVrVN5lWb 6LSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=uzd29zOgvtvFCGjc/8im/UW17zA2qBOUtcGKZOU/Ekc=; b=PXGWwNZXqlBpAWKhAjNP7KYQST84ysoOBNasgR3G8cnLngwKi/cK9zMnTm/q7HGrON hjPNOcpLr2zQyGFxecDDufdwUYH9R638xSZaHpkX2BKelI1S6Ka15G1Tr/aNC8DGCrs0 TDwZUXcMq2nl4Zx0j3FH9X0x6gg8zntZrtcjmKolIb3ZGYMXKV5PG6AWPQVmaAr/ntsq HxePX/wm3Rahgzsd1a5wihKQzj0ibftoMP5PxRQBfhB/7TWPeHiO0MTJDbaPojQrZ44D c4qypD6DW6yHIZZuVv2RzKO1q9FKDUBlIwCUMcwux0eLdY35/Hcc0oM3t1OkIQOjYrcw RMIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=OKyhkSzT; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id y2-v6si14942286wrv.61.2018.09.17.14.21.22; Mon, 17 Sep 2018 14:21:22 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=OKyhkSzT; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2EAF32678AB; Mon, 17 Sep 2018 23:21:16 +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 295302678AB; Mon, 17 Sep 2018 23:21:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 569752678A6 for ; Mon, 17 Sep 2018 23:21:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=91637beGuScST9w9jLrCbZo0ICxLG4dDC/Hh3oZDUg8=; b=OKyhkSzTcWPu Qho8PAUGygAG6Mm10MAv/RH3bwmdXNnkTPCY/VfnLmhqfD9t5p2n6vo7VdaPDQ3MkgkuZAoj6G8Rd /skoAVfKvm8owB8HN9N/pX0h4FpGQ6Fcqx4iPKMalS0AXQV95W5H6UrxRyNRF9ms8aIw1t3w4ZLor EUd2s=; Received: from [209.121.128.187] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g20xD-0000kE-Ru; Mon, 17 Sep 2018 21:21:12 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id F2FDC440078; Mon, 17 Sep 2018 22:21:09 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <871sa05ya3.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20180917212109.F2FDC440078@finisterre.ee.mobilebroadband> Date: Mon, 17 Sep 2018 22:21:09 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-core: manage platform name under snd_soc_init_platform()" to the asoc tree 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 The patch ASoC: soc-core: manage platform name under snd_soc_init_platform() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 4a9ed39477bd1635cf23b49e10f9e364329bbe46 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 11 Sep 2018 06:51:14 +0000 Subject: [PATCH] ASoC: soc-core: manage platform name under snd_soc_init_platform() Now "platform" is controlled by snd_soc_dai_link_component, thus its "name" can be initialized in snd_soc_init_platform(), instead of soc_bind_dai_link() local. This patch do it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) -- 2.19.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 325dc1964850..d856b08f5f99 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -845,7 +845,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card, struct snd_soc_component *component; struct snd_soc_dai **codec_dais; struct device_node *platform_of_node; - const char *platform_name; int i; if (dai_link->ignore) @@ -892,11 +891,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card, /* Single codec links expect codec and codec_dai in runtime data */ rtd->codec_dai = codec_dais[0]; - /* if there's no platform we match on the empty platform */ - platform_name = dai_link->platform->name; - if (!platform_name && !dai_link->platform->of_node) - platform_name = "snd-soc-dummy"; - /* find one from the set of registered platforms */ list_for_each_entry(component, &component_list, list) { platform_of_node = component->dev->of_node; @@ -907,7 +901,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, if (platform_of_node != dai_link->platform->of_node) continue; } else { - if (strcmp(component->name, platform_name)) + if (strcmp(component->name, dai_link->platform->name)) continue; } @@ -1020,24 +1014,31 @@ static void soc_remove_dai_links(struct snd_soc_card *card) static int snd_soc_init_platform(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { + struct snd_soc_dai_link_component *platform = dai_link->platform; + /* * FIXME * * this function should be removed in the future */ /* convert Legacy platform link */ - if (dai_link->platform) - return 0; - - dai_link->platform = devm_kzalloc(card->dev, + if (!platform) { + platform = devm_kzalloc(card->dev, sizeof(struct snd_soc_dai_link_component), GFP_KERNEL); - if (!dai_link->platform) - return -ENOMEM; + if (!platform) + return -ENOMEM; - dai_link->platform->name = dai_link->platform_name; - dai_link->platform->of_node = dai_link->platform_of_node; - dai_link->platform->dai_name = NULL; + dai_link->platform = platform; + platform->name = dai_link->platform_name; + platform->of_node = dai_link->platform_of_node; + platform->dai_name = NULL; + } + + /* if there's no platform we match on the empty platform */ + if (!platform->name && + !platform->of_node) + platform->name = "snd-soc-dummy"; return 0; }