From patchwork Mon Sep 17 21:21:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146863 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4245230ljw; Mon, 17 Sep 2018 14:21:12 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbN5T1zZ8pYVN58VQ1TxR5l0lfLbPxm8yDcu1q2tUSTM76g0hNf7Mc6HX8pJrgpnYJiCAHg X-Received: by 2002:a1c:d785:: with SMTP id o127-v6mr12207291wmg.67.1537219272749; Mon, 17 Sep 2018 14:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537219272; cv=none; d=google.com; s=arc-20160816; b=MUtQP/Q12jPStQ3wA8huwpIJmsD8kMo3KJXU+KXfgO6hGUxUu8QFH92AfqBRLxk+hp FGO4V9RCMrilOBSr1eZPKDQC3v9wUH1rNGawVcv7QDIl04yIfM9vIMDBSVCVnoe3NLL6 bAdpSRcBhcTQcDsgHzjEZueepFGUrpg/edHAfknnHXjvwNWGOgwJvvB1qoMaF8nS/eJH Dg5kR/UnDqgXODoZEO9YRwvBibSIilZduLFGapLd/hvV3+JqrrGldiWTu7ORmiw4Nq1I plLK+eaeScGsJYFzCURd9txcYri4gTE6qGulDWPXO1OHCkgpT04UAWyX7MZSQKtX7nfj KFXg== 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=IdyUNnViCV9EctrtA7fo4RzlklGJ7WAgSRsnHtG51ME=; b=mdu6cINyKHFDKj5oJfRl046+e4c5sqCJFkqWUlekNq37FOSdyn5OVfvIp0JTNalQH0 9YM/+iIuNA+eq+Ll/QxtL2MtQirwcU01zhGtn9wILXgr41KsOGnPMIS+4mOD6tw0TjDW fM1+tPtn2aMMzXsy8NoWARaiWMQQkj44Lv2ToXp6ks5f9eRg7XoR0M0r9MAFrijoSCoJ C/SEuzx0JLvRmn/xueGnQZfGSFZEGzgF8SWcQbh2MTroXvXOoB913Tx6QhJ9t7+SszR/ Ld/C3mKafCeD2EuqkDuTnLpHsL2m85tkK0ombqjeHeJMFnhoK4YbVOrwmejZ5vlxHJ6U ijXg== 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=Hk8tMSwt; 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 v3-v6si17003962wrd.213.2018.09.17.14.21.12; Mon, 17 Sep 2018 14:21:12 -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=Hk8tMSwt; 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 9264F267892; Mon, 17 Sep 2018 23:21:11 +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 2ED5D267889; Mon, 17 Sep 2018 23:21:09 +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 8E1CF267892 for ; Mon, 17 Sep 2018 23:21:06 +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=grHaA8JHJI+iESbvKAmphQC6Hs/L15o9ZQvc3EN7xZc=; b=Hk8tMSwts0fZ iRN1XzAKu2lvVQBOOo0CtaxSbRvU57KR+H/nGFKYh5FqiHMNn9x7F3sz6Mf0rMQmLNxzQjy0nYLyn sDrfY5ShsAxsiSRI4NJEDCbNGcf5MnvKgNgz5HwBCmYJ+Y+WWDIY+AsXxJC4RNabYzOd0Uc/vIGZi kcpfA=; 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 1g20x6-0000k7-Pi; Mon, 17 Sep 2018 21:21:04 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id C6B3A440078; Mon, 17 Sep 2018 22:21:02 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87zhwo4jov.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20180917212102.C6B3A440078@finisterre.ee.mobilebroadband> Date: Mon, 17 Sep 2018 22:21:02 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-core: add snd_soc_is_matching_component()" 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: add snd_soc_is_matching_component() 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 be6ac0a9ced99403c435b2b2fe9ac4bd55749823 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 11 Sep 2018 06:51:45 +0000 Subject: [PATCH] ASoC: soc-core: add snd_soc_is_matching_component() To find (CPU/)Codec/Platform, we need to find component first (= on CPU/Codec/Platform), and find DAI from it (= CPU/Codec). These are similar operation but difficult to be simple, and has many duplicate code to finding component. This patch adds new snd_soc_is_matching_component(), and reduce duplicate codes. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 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 d856b08f5f99..da2b2a758b6d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -737,6 +737,24 @@ static struct snd_soc_component *soc_find_component( return NULL; } +static int snd_soc_is_matching_component( + const struct snd_soc_dai_link_component *dlc, + struct snd_soc_component *component) +{ + struct device_node *component_of_node; + + component_of_node = component->dev->of_node; + if (!component_of_node && component->dev->parent) + component_of_node = component->dev->parent->of_node; + + if (dlc->of_node && component_of_node != dlc->of_node) + return 0; + if (dlc->name && strcmp(component->name, dlc->name)) + return 0; + + return 1; +} + /** * snd_soc_find_dai - Find a registered DAI * @@ -753,19 +771,12 @@ struct snd_soc_dai *snd_soc_find_dai( { struct snd_soc_component *component; struct snd_soc_dai *dai; - struct device_node *component_of_node; lockdep_assert_held(&client_mutex); /* Find CPU DAI from registered DAIs*/ list_for_each_entry(component, &component_list, list) { - component_of_node = component->dev->of_node; - if (!component_of_node && component->dev->parent) - component_of_node = component->dev->parent->of_node; - - if (dlc->of_node && component_of_node != dlc->of_node) - continue; - if (dlc->name && strcmp(component->name, dlc->name)) + if (!snd_soc_is_matching_component(dlc, component)) continue; list_for_each_entry(dai, &component->dai_list, list) { if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) @@ -844,7 +855,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link_component cpu_dai_component; struct snd_soc_component *component; struct snd_soc_dai **codec_dais; - struct device_node *platform_of_node; int i; if (dai_link->ignore) @@ -893,17 +903,9 @@ static int soc_bind_dai_link(struct snd_soc_card *card, /* find one from the set of registered platforms */ list_for_each_entry(component, &component_list, list) { - platform_of_node = component->dev->of_node; - if (!platform_of_node && component->dev->parent->of_node) - platform_of_node = component->dev->parent->of_node; - - if (dai_link->platform->of_node) { - if (platform_of_node != dai_link->platform->of_node) - continue; - } else { - if (strcmp(component->name, dai_link->platform->name)) - continue; - } + if (!snd_soc_is_matching_component(dai_link->platform, + component)) + continue; snd_soc_rtdcom_add(rtd, component); }