From patchwork Tue Jul 30 01:02:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 815354 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 99707C3DA61 for ; Tue, 30 Jul 2024 01:07:27 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 072BA839; Tue, 30 Jul 2024 03:07:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 072BA839 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1722301641; bh=YmGwjc52Pg/rg6c5XvUuJ1GiVFvUFEF1ILm+k0568ZI=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=BI9P3l58vC9FQipWdofXkzAdbsZpAHCbUF7GPOGJI/paXi1837CSLJbGY6/JoQuQS yS7uX66HYYnvt7HHwK03RlEOzdsnjWzw6UORTPdD0cqHzmgeD7cItuqAnbFGoTwcL0 amRW3FY+SgOpoqpjJkeEhJ30V75qMgenBCS+4r/M= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BBF6FF805E1; Tue, 30 Jul 2024 03:06:30 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8428CF805E4; Tue, 30 Jul 2024 03:06:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 749A4F802DB; Tue, 30 Jul 2024 03:02:59 +0200 (CEST) Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c405::1]) (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 CE5E6F800C9 for ; Tue, 30 Jul 2024 03:02:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CE5E6F800C9 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=F8rd/IaS ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yRJTzJanXep7DIO6q0wroWYtKFgKkMhQcbZZO2yURdJgl4uqzhMt/vH7TSAClAq/cFZA5GFD1F169oFYTRx8SYtBd4C2I0821udJw6hhcOkXKglbsBkQ6VvWUMWCmwwPmaVYKlLdKUz8DE8WTZED+l4/3CoPLWyDo0Jv9lP//P6R+wUDMXxL6ffl6ESqJg1NPPc3PwqTfBQ0eDd2IrG/S9pAiML8rykTI1TumQHDQj7irp1BPzLGCQm5xKXwohsPiOWFYA9DGax8y2z4IoEovx9Z/NUsvPzPAyXDORKRpjV1fF+jIZSZAPd0hkSLF34+h+/Xzw5628lrDwv3ddvJVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=G2RWZ1TbORupgUj5d7AzuSCLVdIxvvk3nLVYV31WKrE=; b=p+ceDcXN5e/jegWxdgUVWZFTUz479j1Sm0W+dgzEkmOkL1WU1Tij0zLuBFXTywn+sk3TlgTqYLFMBrmH0Q4DCKywVf0WTVOparLwYCD7w+qBi3bx91dBQ2PNI+8U+Z1GqcMgG46XLUxYn6qtPTqGFO7KE1hyUztBwrpxZIzNDjnyyQw81jWBKoDKN1rn1JAVw0CDZU0/r2C2I/Bz1UrmmE1jfISiGhFj+W/nSPjDsL1i7gXIGFse8RUkWdilC9fGR2VqM+VMJSYTX1H3E/8yIEiHA35FwTGKHdAJx14xBTkTdETnhBTV9Dwzjlqz0doy/UdQqN1l02PMKj78+i+fyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G2RWZ1TbORupgUj5d7AzuSCLVdIxvvk3nLVYV31WKrE=; b=F8rd/IaSdy27yXeZUJvpi/kiKlzoB4wwbVOyoaDyrcHQQBRFKczblVVo0HWpmbU9nXLF0mbhzFSLP0MiSe7qDvZhaI93Ijvmb5PdfsDY0TR/PGPkcxn7qPJRic5RzJzD90J3CISI5oABAWz1Axpm0I5tAOGf/0hQ/3Zz5hO2Krg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS9PR01MB12484.jpnprd01.prod.outlook.com (2603:1096:604:2f6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.27; Tue, 30 Jul 2024 01:02:48 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.7807.026; Tue, 30 Jul 2024 01:02:48 +0000 Message-ID: <87a5hzlmja.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v7 2/4] ASoC: remove snd_soc_dai_link_set_capabilities() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li Cc: alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87cymvlmki.wl-kuninori.morimoto.gx@renesas.com> References: <87cymvlmki.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 30 Jul 2024 01:02:41 +0000 X-ClientProxiedBy: TYWPR01CA0017.jpnprd01.prod.outlook.com (2603:1096:400:a9::22) To TY3PR01MB10906.jpnprd01.prod.outlook.com (2603:1096:400:3af::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS9PR01MB12484:EE_ X-MS-Office365-Filtering-Correlation-Id: f81f5d7b-3352-47da-36d0-08dcb0335068 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|7416014|1800799024|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: sGZFXNe8xS4alkQn1w+aK5PTncGYie3d7SpkuVi4FMMATs7rZ8vTf+SwIRc59DKgrUDuMeZJbEhgi+HP78oH8FNfBWyAtnLMGWQNrQxhcxgTCUbXR8m41SdcVtUbKx5cH19r+Owgz9F2y4tJg9Qv5OX3Rrh51QSjxtwmGUpwqSHq/N1N8/RC45ZTxxi0pzsnIAg4tzoG+yErUvcqFdGl2jKUXMFg1Y4cOnfCQ3E6vHGQuAJAmoseiSEjSIohPrC0qZy0HBnX/Xn3fkb2ApYGDcKKsUWCvJauFuCEklhNhfBr7IxQAxkiAmzK9MwFFWOczVJV27hc3Iz72VCI6/vNQGlvO2UP973rnoB/1M582T7DpZP4IWphmTBn/EBLHx0WAtSUGf1rYdiRMKpB1mlgtkCi0FoVWrWY3mmJjbJY4gk7FtZuiRl1L8WAHQMuU0UjAIPZrMDfXn+00dYc3KuZM/GLvo+z0aaW4fti+eZcXxJzt+qn6QEUaa9FnrhnlPDBLSqvBXFMeZVYq0vxEK3APJsndBIUF/ZVZxk9ESNfmFVPFI3+tfn9lJ7/BRz2qIAPYERJAIVdyt7+/WzL6HwG3FgLcvPw78emaIbaPoX1oYj4I+j8f4JEavNoX1YS8zabA0JRi3j4hRu8UH0QP5n5dDo1aR7CTPuJuTENIwl+xMFQ2EEAKXX5ba/UPpF2cWDEk+50kdM0reqirxm4I4rk+BZjrovw2DZC3D/ckwkQ9hYLICd1Rc9iiNmaEM9nwucUXU0QjZVPMjeIkckcozVobi7RQ1zcOGIPrkaH1RgjvJCAkFnbzmSwJWjE/ED+ZisuvpOg8cnZky57HSyRtESnqKAyK0ppTFWqvvUhQONfTUff8eRvFpRs7mAA0ZVmlK+PpxAw0Gv6B0WI6xbpCLsGMQQ4DsfezVwBYWBZzE3vvugLONLfBMU0CczhjSKvjqry5NhUKYrfJbgNmhXyPktRozT+Ja7s/hqBGPYjbZV0JoVucCd8BUqbUi+IAWSE1UPX9Y8NRNDMwr3Bl+rn4IVZqtl1+Z9S2CNF6Q7zehyEEQDlz27cN2qruy2lS0Ok6ZGfNFmn3UU7MOzbvWEAedHjHTCIEd10LKY3AIve5H8NVPMcPGrLeZEFA3TJ/+zeUx7lJyaL57zOuHyOHsPELEgbNpBJlAlSXJxlR+DWqYRVcQcljr/84MapvWkrXK8E4X3CGgG+p7ZOWPLRBg73gYJ5u7cHeElXuHo6hNXrBMH5qBZeCBb6rdMpI83u084KsAVaOxk382vLFkk+NDiKQNdJ+ce/ROfOflNKyEQX83TLbt8YdCgiSDrHZ6kCTEl0qj+njskBipOwpOUJz9nQqgvoqvjOiw+qLHk+GWBV3wv8ak6s1IBnInGFbEy29EZH2uW0bRkltD2xrFlzCLtM4TjiLpdFZqCCoIWUzQH9sAVYwWg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(7416014)(1800799024)(366016)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v7MMdfxz/vmqVP3kAbYjSGajsakdq83TeDSEXMUU2QwJJXxvLmYTkB8+T3KDziXBfSoSs9WAJtEJE5CcSy4Ku4og5euQ0DstpYMpqIwHEXdSDEuuCxb2YnY74d6co0IiErRJDCmR3C6dRWzy6DWr/JyXENis5W7MrRFgR3iQGIhKQVlARbTn7vpmXs3N5cDJG2ulKYuJ6wVpWF2wzR2zETbL4xJBODzCyeRQUoLUIu22vsl0Q65sk3rCyFHrki7AAP9TnlXF7PrAjVqPfhVr56TL7YkON/SadeAuw/cCgehT6Pc0FCynZtJGR0HVSIi9Cqc1edLMwkksVhbPvittJsgcWnaj1Pa8V41R3KZgj5I025QQ16TyfibuJVvpoGedT3Bts/9btBfwfb29CvINaHpYrw7jSNIF8VHWuVpl+37vlMnHq3G0NSFCHN9qMhTyDlvhwmnfUQfGZIqaiw0jBP6gvkTn0o5PHpnLh0pm8HQQq7u9kevjdMx/xyCbDGn0c9+SvlFVq81E8ZHCj8dMFHXm6cF5gFk+omW7PNkDir3nEa6RQs4NTgnDXseZDj3MRZOVaYaopNyienE2oSweR9xXac+f+ahMwrK5hZTfNG01nsWogjCw0eaZG/phA0zXubFV+Uj0cufrt7u/5Vk/dyb6zxvIraximX0AXEGvvzHMJQMd3XqeAfXOJCjWYRpcstQW7iGJLom1/F13YWzOPCsM3kYSQAut6g1sDYaX5ORSw4fL7i45Izkn4SH9OVIj+iDMw1fqGAr/j/+vXVnvKW4gSeGsdIRTdGCxaf2QiVqjxS9hiUh86T0I6OFSndYtmAmtSXyBl09ydgKbfD9tZc3excr9h3sjE3TexK78OkGaYxM3D9zvrJljbO3NA87re+ppHg0NRWP/Sf7VM8GsQrGbLkeOAlEpP/TdYCnEZSRAHKNad6CE7QUlyQucJu3WjIeimdwYBvzsFKhDfOrIEiLF85JdBsV9NBvpJATKDYniwin0gx3XYP5R3OWxGrhlY6ISA/deE+rSS96Sin1IuFtDWP0bZu6sqehLDBUllGe9E8vxb5OjjFRMXu6T6KN/bgUByacBgme4wXVazBEV2+P35Nr18G5GIGAhptNwe7XJt9npxC/8kfCFOOYMqpSBEN1HZJ746VZo+R4dKEoQzZTxF4qVhRIHTOwOAFk2gPkWv/E+W9mp7dWRIQNSGgSxQK7YHEoZzs3k49AS4okxKuxh3+YnCfRjHV6QfixtCY4U1cNmFIsbU/mfuMeGK1wE3DHsXUYcFxx2otPLNFGRMfokFot39C5pE+0f/eF94kiU1ZN4SPPCQ3mcMO3BH31hbPTLbCmD5X0V499oVQc2XQPnpZ/EaLWzrOH9mpd0OQ11uC9KZDDT0pc5IrsJE6g9SpzQig8QdtrdjsiMZtlgJwZTbEv0TY1FEkZ4q9glxjzTg7igbx3avjSADtfdMmtsU72EVl17sCeoOkHTI8loTpuoqxjWhmAxHe4ze0KBDTb1t9Ks/n8B1GnDqpo6C+2GMdxqgttXmh8NjnfgZe77tv/l1eRI09Ll4lvyOUTehhIC5ccqEeuwvLa7axIm9SNvZaKT7QbsRoUzH6FLCWGOA1yWoMOLNkKkAeTLEw+d8iY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f81f5d7b-3352-47da-36d0-08dcb0335068 X-MS-Exchange-CrossTenant-AuthSource: TY3PR01MB10906.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2024 01:02:43.9276 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G6dt0I0XPlyYYDRI3OdHVkCDQ9JFDZj5Bnme8OEHq7n4+Kj9P28/LTLcRLqZ6HdyCMD8oqgJqE9Eep3tp/ldOffFpHOXdO/SV0q29W0On+L9TD3iI/f4Nmsnw4iXA51k X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS9PR01MB12484 Message-ID-Hash: NMLFTIF2TF52VB7KRSQMILOAF73VHL2M X-Message-ID-Hash: NMLFTIF2TF52VB7KRSQMILOAF73VHL2M X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. We need to use xxx_only flags instead if needed, but snd_soc_dai_link_set_capabilities() user adds dpcm_xxx if playback/capture were available. Thus converting dpcm_xxx to xxx_only is not needed. Just remove it. Signed-off-by: Kuninori Morimoto Tested-by: Jerome Brunet --- include/sound/soc-dai.h | 1 - sound/soc/fsl/imx-card.c | 3 --- sound/soc/generic/audio-graph-card.c | 2 -- sound/soc/generic/audio-graph-card2.c | 2 -- sound/soc/generic/simple-card.c | 2 -- sound/soc/meson/axg-card.c | 1 - sound/soc/meson/gx-card.c | 1 - sound/soc/qcom/common.c | 1 - sound/soc/soc-dai.c | 38 --------------------------- 9 files changed, 51 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index bbb72ad4c9518..04f1d75e04b2b 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -219,7 +219,6 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai); int snd_soc_dai_compress_new(struct snd_soc_dai *dai, struct snd_soc_pcm_runtime *rtd, int num); bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int stream); -void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link); void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action); static inline void snd_soc_dai_activate(struct snd_soc_dai *dai, diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 0e18ccabe28c3..98b37dd2b9013 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -650,9 +650,6 @@ static int imx_card_parse_of(struct imx_card_data *data) link->ops = &imx_aif_ops; } - if (link->no_pcm || link->dynamic) - snd_soc_dai_link_set_capabilities(link); - /* Get dai fmt */ ret = simple_util_parse_daifmt(dev, np, codec, NULL, &link->dai_fmt); diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 3425fbbcbd7e9..1bdcfc4d4222e 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -279,8 +279,6 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv, graph_parse_convert(dev, ep, &dai_props->adata); - snd_soc_dai_link_set_capabilities(dai_link); - ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name); li->link++; diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 56f7f946882e8..051adb5673972 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -966,8 +966,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv, graph_parse_convert(ep, dai_props); /* at node of */ graph_parse_convert(rep, dai_props); /* at node of */ - snd_soc_dai_link_set_capabilities(dai_link); - graph_link_init(priv, lnk, cpu_port, codec_port, li, is_cpu); err: of_node_put(ep); diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index d2588f1ea54e5..42c60b92cca5c 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -291,8 +291,6 @@ static int simple_dai_link_of_dpcm(struct simple_util_priv *priv, simple_parse_convert(dev, np, &dai_props->adata); - snd_soc_dai_link_set_capabilities(dai_link); - ret = simple_link_init(priv, np, codec, li, prefix, dai_name); out_put_node: diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 8c5605c1e34e8..09aa36e94c85b 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -339,7 +339,6 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, dai_link->num_c2c_params = 1; } else { dai_link->no_pcm = 1; - snd_soc_dai_link_set_capabilities(dai_link); if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node)) ret = axg_card_parse_tdm(card, np, index); } diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c index f1539e542638d..7edca3e49c8f0 100644 --- a/sound/soc/meson/gx-card.c +++ b/sound/soc/meson/gx-card.c @@ -107,7 +107,6 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, dai_link->num_c2c_params = 1; } else { dai_link->no_pcm = 1; - snd_soc_dai_link_set_capabilities(dai_link); /* Check if the cpu is the i2s encoder and parse i2s data */ if (gx_card_cpu_identify(dai_link->cpus, "I2S Encoder")) ret = gx_card_parse_i2s(card, np, index); diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 56b4a3654aec3..928cf5cb59997 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -155,7 +155,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card) if (platform || !codec) { /* DPCM */ - snd_soc_dai_link_set_capabilities(link); link->ignore_suspend = 1; link->nonatomic = 1; } diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 9e47053419c16..d8b0e1f500460 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -479,44 +479,6 @@ bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int dir) return stream->channels_min; } -/* - * snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs - */ -void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) -{ - bool supported[SNDRV_PCM_STREAM_LAST + 1]; - int direction; - - for_each_pcm_streams(direction) { - struct snd_soc_dai_link_component *cpu; - struct snd_soc_dai_link_component *codec; - struct snd_soc_dai *dai; - bool supported_cpu = false; - bool supported_codec = false; - int i; - - for_each_link_cpus(dai_link, i, cpu) { - dai = snd_soc_find_dai_with_mutex(cpu); - if (dai && snd_soc_dai_stream_valid(dai, direction)) { - supported_cpu = true; - break; - } - } - for_each_link_codecs(dai_link, i, codec) { - dai = snd_soc_find_dai_with_mutex(codec); - if (dai && snd_soc_dai_stream_valid(dai, direction)) { - supported_codec = true; - break; - } - } - supported[direction] = supported_cpu && supported_codec; - } - - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE]; -} -EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities); - void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action) {