From patchwork Wed Feb 14 13:29:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128336 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp610948ljc; Wed, 14 Feb 2018 05:30:56 -0800 (PST) X-Google-Smtp-Source: AH8x225Cv5nZ0sJreTpilVYFbWQCjL0cXeckQpuiXHZ6xjb8HHgQgXWjsNLU3xicyTt5GzigFM2K X-Received: by 10.28.222.5 with SMTP id v5mr4199180wmg.161.1518615056534; Wed, 14 Feb 2018 05:30:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518615056; cv=none; d=google.com; s=arc-20160816; b=VUmvcMqA9X431ARwS6VcI4SR4Esglno4JiCR8zaiLb/gKO45aXm+QeD7HlJR+v92Jy 1dKI3o+7hH4B6JKMMAVVvGvSS3dXpZswiImdDWy0Ifz4I2hoD9ppimdK2B0lecF2/nl5 c2JARA12M59kBdLEzCPQ+mNQwdcy8jCf7sTpLpUceb/+6gP5XziX/aYjLZkruXrsLxKE 3mdsz23qcq3G224FO5MnyzfisFjsD2myJmaFfBIV5NYRo7C561EjUdDYTpMPgdXJJs/a oMdm+shtBoR6xWYaRazfmdR1mn//OXslvddLf29dHHvY4mX0JjiGr/yMl56TmrLeUFCO dqOw== 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:arc-authentication-results; bh=tm2UjKQlfkFplNvifuZl0wQkMVaUDr1mKXDWE+2ILZk=; b=azepBgnubFOD8djTqY1lZcT+HlIz9MEEBkyU6KhpWApVlAdWYNL+EjxVot2rcrA2kp MjjHk85GNYKx1e/MwaNLiEP4LRj5G/elChOf2u6ADlR4IPus0pp4Oz5HMO9d12k+wyL9 7j4GCc7WqLivS5pksbVcAHAwhFfL9P4OlJOCQJvO/z1CCYENkAG+Bg5wk49Zq4dPmPY7 cp+6TZ/dSastf7lXx6Uso5MTQF78jB7FvgCR63ytBsDGOnoZXg0fYHtmMHvDlwJbpJXl iqXEc51NueN2hiBOR73P8RVKOVJYgFfmGz8Lv6XCe+bFfBeVEUMqqm1tWrq025153MDF /t9w== 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=U9QwYJqz; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id q18si1439768wmd.54.2018.02.14.05.30.56; Wed, 14 Feb 2018 05:30:56 -0800 (PST) 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=U9QwYJqz; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5903E267B8C; Wed, 14 Feb 2018 14:30:14 +0100 (CET) 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 C81B1267B81; Wed, 14 Feb 2018 14:30:12 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 380C1267B0C for ; Wed, 14 Feb 2018 14:29:29 +0100 (CET) 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=+XwKjytcG/wKczHsz/Kkub7iWfs42AdUQgl/guC2vwM=; b=U9QwYJqzdOVe PuNjdKaZ5GdXRGZAwLhZ9o1pFUvDIxMvCdVjrosRZ5CV2099v3XTSYQIeGHvEY1zEgJlG6McqIiIu DBUMbj7nBar7ySevqzR0ElGbla5BjWrOsc6NU0Bj8xLUQA+dHNtnjkJzd+xRgUG3NXLnev5zw6bX6 zz1QI=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1elx7m-0004px-Dr; Wed, 14 Feb 2018 13:29:26 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1elx7l-000732-Vs; Wed, 14 Feb 2018 13:29:25 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87tvukb7ra.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 14 Feb 2018 13:29:25 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()" 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: remove legacy_dai_naming from snd_soc_register_dais() 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 a8768c52c511e92d9c9816cecaec4bca77da8a89 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 14 Feb 2018 02:56:36 +0000 Subject: [PATCH] ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais() We can get legacy dai name flag from component driver. Thus, there is no need to have its parameter on snd_soc_register_dais(). Let's remove unneeded parameter Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.16.1 _______________________________________________ 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 574048a73b1c..b928c59ea775 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3150,8 +3150,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, * parent's name. */ static int snd_soc_register_dais(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv, size_t count, - bool legacy_dai_naming) + struct snd_soc_dai_driver *dai_drv, size_t count) { struct device *dev = component->dev; struct snd_soc_dai *dai; @@ -3163,7 +3162,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component, for (i = 0; i < count; i++) { dai = soc_add_dai(component, dai_drv + i, - count == 1 && legacy_dai_naming); + count == 1 && !component->driver->non_legacy_dai_naming); if (dai == NULL) { ret = -ENOMEM; goto err; @@ -3444,8 +3443,7 @@ int snd_soc_add_component(struct device *dev, } } - ret = snd_soc_register_dais(component, dai_drv, num_dai, - !component_driver->non_legacy_dai_naming); + ret = snd_soc_register_dais(component, dai_drv, num_dai); if (ret < 0) { dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); goto err_cleanup;