From patchwork Wed Oct 9 04:31:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 11180491 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BFF2912 for ; Wed, 9 Oct 2019 04:44:25 +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 0F9AA21835 for ; Wed, 9 Oct 2019 04:44:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="Bof1csS6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F9AA21835 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.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 4D0871688; Wed, 9 Oct 2019 06:43:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4D0871688 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1570596263; bh=s52F35tHd0J9pEVR0EuQ2Ua5jze1nZnVTnVzkC6pflg=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Bof1csS66WvOqOx+VNRTqnJSLRuZEMf4vATrlRqBLsEwwB4EXdkOvdRLN3Fxt1oYX y8JvOMeYo33ZP9ytMA0sY9jZ2l3znzryT+sNpmLC7lQBihOHma6ijwfm/cE9keH/pD j12FMn9BxanP9IVswlENNZL4bHbSq+ZeItxLfu3E= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A1F70F804CC; Wed, 9 Oct 2019 06:31:27 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 83201F804CC; Wed, 9 Oct 2019 06:31:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa1.perex.cz (Postfix) with ESMTP id D7943F8076C for ; Wed, 9 Oct 2019 06:31:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D7943F8076C Date: 09 Oct 2019 13:31:19 +0900 X-IronPort-AV: E=Sophos;i="5.67,273,1566831600"; d="scan'208";a="28427732" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 09 Oct 2019 13:31:19 +0900 Received: from morimoto-PC.renesas.com (unknown [10.166.18.140]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 9A8724002643; Wed, 9 Oct 2019 13:31:19 +0900 (JST) Message-ID: <87zhiah754.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown In-Reply-To: <87sgo2ilso.wl-kuninori.morimoto.gx@renesas.com> References: <87sgo2ilso.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Cc: Linux-ALSA , Pierre-Louis Bossart Subject: [alsa-devel] [PATCH 20/21] ASoC: soc-core: remove topology specific operation 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto soc-core has some API which is used from topology, but it is doing topology specific operation at soc-core. soc-core should care about core things, and topology should care about topology things, otherwise, it is very confusable. For example topology type is not related to soc-core, it is topology side issue. This patch removes meaningless check from soc-core, and moves topology specific operation to soc-topology. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 32 -------------------------------- sound/soc/soc-topology.c | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bbcaac5..7904e839 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1439,20 +1439,7 @@ int snd_soc_add_dai_link(struct snd_soc_card *card, { int ret; - if (dai_link->dobj.type - && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { - dev_err(card->dev, "Invalid dai link type %d\n", - dai_link->dobj.type); - return -EINVAL; - } - lockdep_assert_held(&client_mutex); - /* - * Notify the machine driver for extra initialization - * on the link created by topology. - */ - if (dai_link->dobj.type && card->add_dai_link) - card->add_dai_link(card, dai_link); ret = soc_bind_dai_link(card, dai_link); if (ret < 0) @@ -1478,20 +1465,7 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_link); void snd_soc_remove_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { - if (dai_link->dobj.type - && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) { - dev_err(card->dev, "Invalid dai link type %d\n", - dai_link->dobj.type); - return; - } - lockdep_assert_held(&client_mutex); - /* - * Notify the machine driver for extra destruction - * on the link created by topology. - */ - if (dai_link->dobj.type && card->remove_dai_link) - card->remove_dai_link(card, dai_link); list_del(&dai_link->list); @@ -2613,12 +2587,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, struct device *dev = component->dev; struct snd_soc_dai *dai; - 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; - } - dev_dbg(dev, "ASoC: dai register %s\n", dai_drv->name); lockdep_assert_held(&client_mutex); diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 81d2af0..92ada84 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -541,6 +541,7 @@ static void remove_link(struct snd_soc_component *comp, { struct snd_soc_dai_link *link = container_of(dobj, struct snd_soc_dai_link, dobj); + struct snd_soc_card *card = comp->card; if (pass != SOC_TPLG_PASS_PCM_DAI) return; @@ -553,7 +554,12 @@ static void remove_link(struct snd_soc_component *comp, kfree(link->cpus->dai_name); list_del(&dobj->list); - snd_soc_remove_dai_link(comp->card, link); + + /* Notify the machine driver */ + if (card->remove_dai_link) + card->remove_dai_link(card, link); + + snd_soc_remove_dai_link(card, link); kfree(link); } @@ -1889,6 +1895,7 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, { struct snd_soc_dai_link *link; struct snd_soc_dai_link_component *dlc; + struct snd_soc_card *card = tplg->comp->card; int ret; /* link + cpu + codec + platform */ @@ -1945,7 +1952,11 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, link->dobj.type = SND_SOC_DOBJ_DAI_LINK; list_add(&link->dobj.list, &tplg->comp->dobj_list); - snd_soc_add_dai_link(tplg->comp->card, link); + /* Notify the machine driver */ + if (card->add_dai_link) + card->add_dai_link(card, link); + + snd_soc_add_dai_link(card, link); return 0; }