From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F9DC4360C for ; Thu, 10 Oct 2019 15:43:41 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60716208C3 for ; Thu, 10 Oct 2019 15:43:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="JRFAp3W9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60716208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 77878166C; Thu, 10 Oct 2019 17:42:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 77878166C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1570722218; bh=9ZEvU9PDKEMHNWmvR/1QbyVjsWau3rqyxYX0HKYGw9A=; h=To:References:From:Date:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=JRFAp3W9cK/fAkE5jFQfbMXqmDjVX3T8AYfFUZ+SKMQlx9SR19qnURiyshAc2uvUX EzzAQi0m3ufI6Lwy7z8JXbF+BiSOVwBzzwfF/3zTkMCgte5+NYLemmM1wXLQS+5TTV VGXLBz8nsyjhrFGH0WFlVIUiQiLyBJ5QoflVjxks= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7DE7FF805FF; Thu, 10 Oct 2019 17:41:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D6E5FF80600; Thu, 10 Oct 2019 17:41:08 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EE2F3F8038F for ; Thu, 10 Oct 2019 17:41:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EE2F3F8038F X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Oct 2019 08:41:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,280,1566889200"; d="scan'208";a="369125064" Received: from aandraox-mobl1.amr.corp.intel.com (HELO [10.254.98.68]) ([10.254.98.68]) by orsmga005.jf.intel.com with ESMTP; 10 Oct 2019 08:41:01 -0700 To: Kuninori Morimoto , Mark Brown References: <87sgo2ilso.wl-kuninori.morimoto.gx@renesas.com> <871rvmilpo.wl-kuninori.morimoto.gx@renesas.com> From: Pierre-Louis Bossart Message-ID: <1ba82907-5f76-7992-366b-528a02a789e2@linux.intel.com> Date: Thu, 10 Oct 2019 10:34:07 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <871rvmilpo.wl-kuninori.morimoto.gx@renesas.com> Content-Language: en-US Cc: Linux-ALSA Subject: Re: [alsa-devel] [PATCH 19/21] ASoC: soc-core: call snd_soc_register_dai() from snd_soc_register_dais() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 10/8/19 11:31 PM, Kuninori Morimoto wrote: > From: Kuninori Morimoto > > ALSA SoC has 2 similar but diffarent implementation. > snd_soc_register_dai() is used from topology > snd_soc_register_dais() is used from snd_soc_add_component() > > Because of this kind of confusable naming, and duplicated > implementation, code is very unreadale. > We shouldn't have duplicated and confusable implementation. > This patch calls snd_soc_register_dai() from snd_soc_register_dais() > > Signed-off-by: Kuninori Morimoto > --- > sound/soc/soc-core.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c > index d4f80c8..bbcaac5 100644 > --- a/sound/soc/soc-core.c > +++ b/sound/soc/soc-core.c > @@ -2610,14 +2610,17 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, > struct snd_soc_dai_driver *dai_drv, > bool legacy_dai_naming) > { > + struct device *dev = component->dev; > struct snd_soc_dai *dai; > > - if (dai_drv->dobj.type != SND_SOC_DOBJ_PCM) { > - dev_err(component->dev, "Invalid dai type %d\n", > - dai_drv->dobj.type); > + if (dai_drv->dobj.type && > + dai_drv->dobj.type != SND_SOC_DOBJ_PCM) { > + dev_err(dev, "Invalid dai type %d\n", dai_drv->dobj.type); > return NULL; > } this block of code is removed in patch 20, so do we need the modification here? > > + dev_dbg(dev, "ASoC: dai register %s\n", dai_drv->name); > + > lockdep_assert_held(&client_mutex); > dai = soc_add_dai(component, dai_drv, legacy_dai_naming); > if (!dai) > @@ -2651,16 +2654,12 @@ static int snd_soc_register_dais(struct snd_soc_component *component, > struct snd_soc_dai_driver *dai_drv, > size_t count) > { > - struct device *dev = component->dev; > struct snd_soc_dai *dai; > unsigned int i; > int ret; > > - dev_dbg(dev, "ASoC: dai register %s #%zu\n", dev_name(dev), count); > - > for (i = 0; i < count; i++) { > - > - dai = soc_add_dai(component, dai_drv + i, count == 1 && > + dai = snd_soc_register_dai(component, dai_drv + i, count == 1 && > !component->driver->non_legacy_dai_naming); > if (dai == NULL) { > ret = -ENOMEM; > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel