From patchwork Sun Apr 2 22:41:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 669814 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 66E3AC7619A for ; Sun, 2 Apr 2023 22:52:02 +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 87D35206; Mon, 3 Apr 2023 00:51:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 87D35206 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680475919; bh=0+WZVoVIpK2i0wqRgbBM4Gq4aNjiyo+VEIa5yQeK444=; h=From:Subject:To:In-Reply-To:References:Date:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rYzZd6VpKrpr8gEXjG5aVFJRFpfqdST0I4I8mBQ3GHCHz7wZp1UU/h0+GTAgHk7Ot 04ORZ7AYbdds9Ih7kvPb70HD63Yz1fxGB7cd6V+s2IU/PuDIwSKlnAboFGjsgfn+ov j1FNnnFeXY+0jU9D7Kjor+NWEkqw8p0thWdh6K4g= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1020DF80423; Mon, 3 Apr 2023 00:50:25 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 816D4F80495; Mon, 3 Apr 2023 00:45:27 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20707.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::707]) (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 E84A5F80171 for ; Mon, 3 Apr 2023 00:41:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E84A5F80171 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=jIeF4TXn ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U9fx0s8VYHLpYq4G/X+mt5zzMeXr3A5yWEO68BB5DgmzPxJHx/24bsK+Ok/5afGEIiZlYlCYJeYNNqoe43KoLGpdZlU2fcHB7dXOcyDQzTCPMZX8tgndp6EJIseg7RwM1bczb0RVtZj9SMTud7QCkh2fhFniG3j7RjkUsLaso4QFBzUe7Kz50n1QlHWyzukefPFFLOJyiIl5JDJ41iGGup1dxa1HSbAJyb3rCk3krpO2jND68i2VGpe9Aa4wk7jbM9omT4sdYcqeCqDmpILk/ltAVDTYFg9fHXFryEQSZBu0p3LMZosrDGFnuJbAy1HScyESYc+iwrvP33LTCyf9Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=dwBg/zOqtcmYF3TsCfY/mNktSUPO4DqpciFfU4x69xs=; b=h6AezMtTFkbesoFDA19JqiIUs82i+cD94ZIstecfJGa8P+cM6LclU7yP223Ga4dEtTD+syXOlugadVBAjYnONJ/Luquv7QC7fX1//+sao6hpGyUrURkFm6cLsJOL0ab0T7DuvSK1QEGWUvDaKwtBdXko7H26Y4J1nRL8VQL551DY3th8PL9UiiZNWs0mqd3ePsktX6Ide19/W13b6EaYvPQTDjgIfK7jhAqMcFlldDLRu5JbzWKSaefPunyjKXy5rlqJfGaYQ/dHxq19lnpfvgY43v0Nhh0+Hup9qAypkSQ/vCHxL2c/cTkc0/UOObwkwltY8szsbmTAtSE/5oVJ+w== 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=dwBg/zOqtcmYF3TsCfY/mNktSUPO4DqpciFfU4x69xs=; b=jIeF4TXnn4tlm1iSPiO+takGi6SczKkiO0BmVjc5wllnx8D232dLzcFc2gDKaJA4Ca4nHqc1Z5BCUaGtCk03P46OssgU9pT2sjyykCM2ZB0IE9hzNOdgn7wvKvGAPh8sDsOBLE9jd9Y38zg2/BuXYj4kh85rqDlKyzpoF7ozryE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TY3PR01MB11431.jpnprd01.prod.outlook.com (2603:1096:400:377::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Sun, 2 Apr 2023 22:41:45 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%4]) with mapi id 15.20.6254.033; Sun, 2 Apr 2023 22:41:45 +0000 Message-ID: <87y1n9c3fb.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 1/5] ASoC: soc.h: clarify Codec2Codec params User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 To: Mark Brown In-Reply-To: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> References: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:41:44 +0000 X-ClientProxiedBy: TYAPR01CA0201.jpnprd01.prod.outlook.com (2603:1096:404:29::21) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11431:EE_ X-MS-Office365-Filtering-Correlation-Id: d6242f66-90ba-42b3-fdea-08db33cb6fbe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d4OAQdHC7zCq8fgeC5IiiB3p4I3GEtA3anTPrNifZmpyw5iPVCndS9pzW0ZjZ1W6CyodDv4twIY/szRx6bW9XldAj30t1+YZ/TuJg/vEYJla3gkW69kjUUagf7UE1P9vq0J7P1bBlBtI4K/bZ0AoLKNZCmlauE76ORlddtiDt+8gu7h72Ic5d0/dpuvIaOysBYBkut5ro9PeBo9vZTcLb/mNUlEJ4k+VwaePpT6juR2IkgNZ6UwhuhQvbrUuqX7yAzMuOVoK8FhhJIP8pABcZaVGWKgv1kpbQgZBtaAtMZPfDK61lfEhKDCejlon5sjRa10qzbp0Kv5ms9hSGajZ+Mzdu2OdW1U2OVDr4XTYldl0OAcbOQbNhLFq6Gk8WbcoiRmM1Ya7Lhe+TsNGz2V4Y6LXrM5sSgChG9PZf/b72aiJRk5y5MJlvlZ7/hfl36yZDjrNFbUR9OwtYpbJP5T0Q5AgwMSTK6GIxp6rcItjEM1iRBNmjI9nhEz3vTmG/8CGiUG7Y5/nAWT39+MiEyO3y1js5wNRKMEm4BfL5g0AkEPCljJ39mteCVN74qN4phBe+Jt7MOT1CIxgDg5RRLbfayhZCp3/X238oR/wjJFHSMGogXCs/vZBBEzpB6YVET0T X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(39860400002)(376002)(346002)(451199021)(4326008)(6916009)(8676002)(66556008)(66476007)(66946007)(478600001)(316002)(8936002)(5660300002)(41300700001)(38100700002)(38350700002)(186003)(83380400001)(2616005)(52116002)(6486002)(6512007)(6506007)(26005)(86362001)(36756003)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: obr9jkl5gNuRxQb/9cgeBjaTToniaRFR3tf/E+U9jHxCRNmfRi5XNyhzBY09JTegOwSBeprCELrJsVSAGogn54zrBq4vGH0FftGTgpce1y10hcx7Zml1Rr7ukNk6aAjhJSjDDhEBqJ9Uxh7iHG8qDoWQv1WBZG1FJqLFcHzV3LTwLqFhFyv1EwWQDmQlmakpkgstwc8s/bZjD3NdeI8KtQ2H/EQep7qRGLI/M4vhQrDJAD1ci2oWDsSo5NGKTQBHOB/K99Khl25EIPnPzdtYqSray2h8wb7gmObCPH7ppwvCGJKM6T0xhH2TSjyqGLytqo4/LxHYQaCCHvOAGHeXQCTxZQEw+ustC85FVVgQ/jJs0VU4VZ1ielPnrdFZGvruc1VGgV/7qWRI52JT/4bJHyYMk6cZFzkQXMJxkYSr+YMnC1qJWrWRU/7DmzurIrHa/m0PxM+TmuH5ZV2iWyxscwnkOSb1jhm/nQPxyLCLHdnUcMvS/phSwbo2sKQhNH7goS8NsMlNvs/63k9d1OchoKpdLYMD819IKQ40/GZSSqo2LjAeQnHjtE+Bkv99LGcESd+ukzJMCreQy4G+y7F5ZtRDwGUBhL5AqCbhO5TH5Z1k7WW5v9/2SG0W0wInDCL/s3ed/dX5sZkpJ8A7ett8ssNYXU6GUhp3c+cGu8JO6c+iCG16ccNZsXnVbLgzGB8P5ZE43SGdxYaVz9WQDHRP96EcBEUw5yDXK1Qb6P96asG338lfeqW+zmv+1XDhjn1n+uzlyD9hUrhDKYxaTllZAxD+BDaQ35SctNpBQ0pVRdl5mY2BxGZbyXy16G/sy7uMR9epFjJmCCYZM9Nn3hGY7vQtcBAKD9aXAAo/ZKkvS+9wL53wbnVCqvvsJ/yv5WdA3hfA2usFaS5EWnc2FEWhTziGW9uU5XX2Wfd0zthgSe4xmMo/e+pbjNnQWRMm5FP43lyyyw7BxmOuY6f84HYLsVg9HG/797RZ/XPRmp29LNJpbf4oNy2Mx9yiD7B8RZeX8s5WUMPoBJIiLEY2p0lmcgVkWDSIvAS7pPfEE3A6hinxherXGQBTSmiY2FekHO9whZRHc4kVcHBfHy67CihNv/Ousz2l7IjTL44IoWyYeZC0aZmfYAjjjdT+5Jjb885wPftmbk9afOWmQ3nmCPQeRoFIurW66/IKC4gu7hwziFJ0XGf7WuSKSukrYv8y/5q1BHcdwHBz8cA81GgGAlH3J+LSs6LHims0chsrIO/MxvgPIkwADaBRAiV5jdGZbXEGulJptDQhXF7RCZX+V3CmS10OIabzC0WVxX8uvzM59LwjzfG7K2ZMvpik3QitmB0AVrxnUg8nr2CgR9cq8+lPA3c66T//lYK2BA14DOgzk16qfkfMRokWxgYkrJU08ZGXdlz4yk/J+Oup+x4srvrwB0RCccyRt5+XLjc2rsxfaeGJYpIYhZLxoFopBhaI4cmgX3J4hPZ65LPqMdLubxaRtJCxOYX8fYZ4UtwPiC7nWyoK9pES70xJy5WUBCrHqcz6sHiwbby5LJKzOo8bVKI/akgn8rzPwanornNfnzjvXJHL5DQDU2BS+0Ystkz+GZYr95Jg+4wZrmTDLWjW6iIqQCHciZr8zr975hjaJQBhFzQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6242f66-90ba-42b3-fdea-08db33cb6fbe X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 22:41:45.0143 (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: Ke+E5hfOYpHjgdpjVpkBQ9qECOyzkLUu1SsdtFinK0mHSHKrixGRLjgt2I7bOjpbtaIVKbXZURe+EsLbVRheKbvuiRkuYJ7qqrp+13HX9AXQhmvFbkx+x3yk9dDQ/Wk5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11431 Message-ID-Hash: 63F6A5XEOFWVUHA5HQV5DWK2WWOIGFS7 X-Message-ID-Hash: 63F6A5XEOFWVUHA5HQV5DWK2WWOIGFS7 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 CC: Linux-ALSA X-Mailman-Version: 3.3.8 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: From: Kuninori Morimoto snd_soc_dai_link has params/num_params, but it is unclear that params for what. This patch clarify it is params for Codec2Codec. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 12 +++++++++--- sound/soc/soc-core.c | 11 +++++++++++ sound/soc/soc-dapm.c | 44 ++++++++++++++++++++++---------------------- sound/soc/soc-pcm.c | 10 +++++----- 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 57c5786a625b..276afdb1f445 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -684,8 +684,14 @@ struct snd_soc_dai_link { int id; /* optional ID for machine driver link identification */ - const struct snd_soc_pcm_stream *params; - unsigned int num_params; + /* + * for Codec2Codec + */ + const struct snd_soc_pcm_stream *c2c_params; + unsigned int num_c2c_params; + + const struct snd_soc_pcm_stream *params; /* REMOVE ME */ + unsigned int num_params; /* REMOVE ME */ unsigned int dai_fmt; /* format to set on init */ @@ -1065,7 +1071,7 @@ struct snd_soc_pcm_runtime { struct snd_soc_dai_link *dai_link; struct snd_pcm_ops ops; - unsigned int params_select; /* currently selected param for dai link */ + unsigned int c2c_params_select; /* currently selected c2c_param for dai link */ /* Dynamic PCM BE runtime data */ struct snd_soc_dpcm_runtime dpcm[SNDRV_PCM_STREAM_LAST + 1]; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9bbcff492c1e..04f1bc8a3128 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2294,6 +2294,9 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls); */ int snd_soc_register_card(struct snd_soc_card *card) { + struct snd_soc_dai_link *dai_link; + int i; + if (!card->name || !card->dev) return -EINVAL; @@ -2314,6 +2317,14 @@ int snd_soc_register_card(struct snd_soc_card *card) mutex_init(&card->dapm_mutex); mutex_init(&card->pcm_mutex); + /* REMOVE ME */ + for_each_card_prelinks(card, i, dai_link) { + if (!dai_link->c2c_params) { + dai_link->c2c_params = dai_link->params; + dai_link->num_c2c_params = dai_link->num_params; + } + } + return snd_soc_bind_card(card); } EXPORT_SYMBOL_GPL(snd_soc_register_card); diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 34fdcb7ee079..e7a0c28e0cb1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1075,7 +1075,7 @@ static int dapm_new_dai_link(struct snd_soc_dapm_widget *w) struct snd_soc_pcm_runtime *rtd = w->priv; /* create control for links with > 1 config */ - if (rtd->dai_link->num_params <= 1) + if (rtd->dai_link->num_c2c_params <= 1) return 0; /* add kcontrol */ @@ -3864,7 +3864,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, * either party on the link to alter the configuration if * necessary */ - config = rtd->dai_link->params + rtd->params_select; + config = rtd->dai_link->c2c_params + rtd->c2c_params_select; if (!config) { dev_err(w->dapm->dev, "ASoC: link config missing\n"); ret = -EINVAL; @@ -4010,7 +4010,7 @@ static int snd_soc_dapm_dai_link_get(struct snd_kcontrol *kcontrol, struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol); struct snd_soc_pcm_runtime *rtd = w->priv; - ucontrol->value.enumerated.item[0] = rtd->params_select; + ucontrol->value.enumerated.item[0] = rtd->c2c_params_select; return 0; } @@ -4025,13 +4025,13 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, if (w->power) return -EBUSY; - if (ucontrol->value.enumerated.item[0] == rtd->params_select) + if (ucontrol->value.enumerated.item[0] == rtd->c2c_params_select) return 0; - if (ucontrol->value.enumerated.item[0] >= rtd->dai_link->num_params) + if (ucontrol->value.enumerated.item[0] >= rtd->dai_link->num_c2c_params) return -EINVAL; - rtd->params_select = ucontrol->value.enumerated.item[0]; + rtd->c2c_params_select = ucontrol->value.enumerated.item[0]; return 1; } @@ -4039,7 +4039,7 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, static void snd_soc_dapm_free_kcontrol(struct snd_soc_card *card, unsigned long *private_value, - int num_params, + int num_c2c_params, const char **w_param_text) { int count; @@ -4049,7 +4049,7 @@ snd_soc_dapm_free_kcontrol(struct snd_soc_card *card, if (!w_param_text) return; - for (count = 0 ; count < num_params; count++) + for (count = 0 ; count < num_c2c_params; count++) devm_kfree(card->dev, (void *)w_param_text[count]); devm_kfree(card->dev, w_param_text); } @@ -4057,8 +4057,8 @@ snd_soc_dapm_free_kcontrol(struct snd_soc_card *card, static struct snd_kcontrol_new * snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card, char *link_name, - const struct snd_soc_pcm_stream *params, - int num_params, const char **w_param_text, + const struct snd_soc_pcm_stream *c2c_params, + int num_c2c_params, const char **w_param_text, unsigned long *private_value) { struct soc_enum w_param_enum[] = { @@ -4070,10 +4070,10 @@ snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card, snd_soc_dapm_dai_link_put), }; struct snd_kcontrol_new *kcontrol_news; - const struct snd_soc_pcm_stream *config = params; + const struct snd_soc_pcm_stream *config = c2c_params; int count; - for (count = 0 ; count < num_params; count++) { + for (count = 0 ; count < num_c2c_params; count++) { if (!config->stream_name) { dev_warn(card->dapm.dev, "ASoC: anonymous config %d for dai link %s\n", @@ -4093,7 +4093,7 @@ snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card, config++; } - w_param_enum[0].items = num_params; + w_param_enum[0].items = num_c2c_params; w_param_enum[0].texts = w_param_text; *private_value = @@ -4118,7 +4118,7 @@ snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card, return kcontrol_news; outfree_w_param: - snd_soc_dapm_free_kcontrol(card, private_value, num_params, w_param_text); + snd_soc_dapm_free_kcontrol(card, private_value, num_c2c_params, w_param_text); return NULL; } @@ -4146,17 +4146,17 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, w_param_text = NULL; kcontrol_news = NULL; num_kcontrols = 0; - if (rtd->dai_link->num_params > 1) { + if (rtd->dai_link->num_c2c_params > 1) { w_param_text = devm_kcalloc(card->dev, - rtd->dai_link->num_params, + rtd->dai_link->num_c2c_params, sizeof(char *), GFP_KERNEL); if (!w_param_text) goto param_fail; num_kcontrols = 1; kcontrol_news = snd_soc_dapm_alloc_kcontrol(card, link_name, - rtd->dai_link->params, - rtd->dai_link->num_params, + rtd->dai_link->c2c_params, + rtd->dai_link->num_c2c_params, w_param_text, &private_value); if (!kcontrol_news) goto param_fail; @@ -4187,7 +4187,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, outfree_kcontrol_news: devm_kfree(card->dev, (void *)template.kcontrol_news); snd_soc_dapm_free_kcontrol(card, &private_value, - rtd->dai_link->num_params, w_param_text); + rtd->dai_link->num_c2c_params, w_param_text); param_fail: devm_kfree(card->dev, link_name); name_fail: @@ -4336,7 +4336,7 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card, struct snd_pcm_str *streams = rtd->pcm->streams; int stream; - if (dai_link->params) { + if (dai_link->c2c_params) { playback_cpu = snd_soc_dai_get_widget_capture(cpu_dai); capture_cpu = snd_soc_dai_get_widget_playback(cpu_dai); } else { @@ -4349,7 +4349,7 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card, codec = snd_soc_dai_get_widget(codec_dai, stream); if (playback_cpu && codec) { - if (dai_link->params && !rtd->c2c_widget[stream]) { + if (dai_link->c2c_params && !rtd->c2c_widget[stream]) { substream = streams[stream].substream; dai = snd_soc_dapm_new_dai(card, substream, "playback"); if (IS_ERR(dai)) @@ -4368,7 +4368,7 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card, codec = snd_soc_dai_get_widget(codec_dai, stream); if (codec && capture_cpu) { - if (dai_link->params && !rtd->c2c_widget[stream]) { + if (dai_link->c2c_params && !rtd->c2c_widget[stream]) { substream = streams[stream].substream; dai = snd_soc_dapm_new_dai(card, substream, "capture"); if (IS_ERR(dai)) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index b830a53ceacb..913a7d98e742 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2793,9 +2793,9 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *codec_dai; /* Adapt stream for codec2codec links */ - int cpu_capture = rtd->dai_link->params ? + int cpu_capture = rtd->dai_link->c2c_params ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; - int cpu_playback = rtd->dai_link->params ? + int cpu_playback = rtd->dai_link->c2c_params ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; for_each_rtd_codec_dais(rtd, i, codec_dai) { @@ -2839,7 +2839,7 @@ static int soc_create_pcm(struct snd_pcm **pcm, int ret; /* create the PCM */ - if (rtd->dai_link->params) { + if (rtd->dai_link->c2c_params) { snprintf(new_name, sizeof(new_name), "codec2codec(%s)", rtd->dai_link->stream_name); @@ -2896,7 +2896,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) * don't interface with the outside world or application layer * we don't have to do any special handling on close. */ - if (!rtd->dai_link->params) + if (!rtd->dai_link->c2c_params) rtd->close_delayed_work_func = snd_soc_close_delayed_work; rtd->pcm = pcm; @@ -2904,7 +2904,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) pcm->private_data = rtd; pcm->no_device_suspend = true; - if (rtd->dai_link->no_pcm || rtd->dai_link->params) { + if (rtd->dai_link->no_pcm || rtd->dai_link->c2c_params) { if (playback) pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd; if (capture) From patchwork Sun Apr 2 22:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 669620 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 CAE83C7619A for ; Sun, 2 Apr 2023 22:55:38 +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 8348C1FE; Mon, 3 Apr 2023 00:54:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8348C1FE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476135; bh=sz4iDCXT7PTAagtpGIPuVXTbUYqkkdcrBXrS3KwaCaQ=; h=From:Subject:To:In-Reply-To:References:Date:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dG9J7624vVk9o/hJqpEgCABfcn2CRg694otIl2CIiAf1P80IDvqB7N9PaK7C4Nfs5 SeJkt6zy+nIie6TNr0aGlUQ4O26DmPqoD2NTGNA/sK8tpbAT0mxnxzJfgEPdGFX6b0 di8l6u/bDPCI6jYXBWc27kSpnqo90ycqwf0F65oQ= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 84EFAF8024C; Mon, 3 Apr 2023 00:54:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 465ACF80482; Mon, 3 Apr 2023 00:45:30 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20707.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::707]) (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 C3511F8024C for ; Mon, 3 Apr 2023 00:41:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C3511F8024C 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=gbrB4IOM ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pr3p4Eo1qGBziaiFBDw8VbTTY73IMApF7iwZW6sgwJsych400wwWPYqsvfr7RwV1WPfF61M/7sKdcwx0O4zhxyj1of0P/UhHwRGgoguGfCD+BwZu9U6lYfhP9vMu/7dPRgzOW6BB4I6gMOnJGC3aVojEFOWYYkMBh0b7BIwEXH2MkoOuDuz2bItzAKYPE69ATJ6cP0AOdBhp9ZPp3zkb7nVlcvkYS9ignslVpQBNkLKRVOE/mtvu2xj5XQ9ABf03nysFT1Mgo01xZCHwMU8dt9G/mshHNLX44rN4Jsnq5jO4+b6J2xOpsCEjrwwQcYNqRD/Km8ZuJYA2fDOws1IPSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Re20iW0tU6v5wpjprpsqbONIhGHGeYlys1G/xOzAsII=; b=mgJbsiCOPDNVWs3q4F0XZymvB8uqxMiICH2oCSUb8vaoWidXhVA7asrP9imCQClPDWQGeQz6kqcLkIoBXTIUzUUjdjwZICWPUXU26+nzmqiqI/GmSUtI2VnEy6lsga6z2rmH/83uNrF6qUcLXLlpMDju2KBkbr45kgVE3cDVjOCAc+f+ZO7Me2fi9P0lTpqbCVK+0yRzBVRJ8PKxmqUYFebwB+HxkkYTmtVdvh27rDF/zlnZM09EnsFTp4cvxM1f3cXiEI7Qt0cyctZWMOuf98bzhTlv0Ffp1uBia6EA5Ttyg/nD29SVXSMmxkeYYdyvDPf6jfM+nyc+bEzYih+a1g== 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=Re20iW0tU6v5wpjprpsqbONIhGHGeYlys1G/xOzAsII=; b=gbrB4IOMv7/1pfba2v9Qlsw4tck6dYpeGHntH4r3Xh/bNsH/DDhOwz2FO/ejzLdtGZiUhZlOUVo2epJN0B0dZXRDE5n5UL+T2iHv5gVD/ZISw79OO+tUr8RqcEnmyp4YNBFGmKZrsSFUml4Aa0hSLZjgq8VesBLutveZhhJBN3M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TY3PR01MB11431.jpnprd01.prod.outlook.com (2603:1096:400:377::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Sun, 2 Apr 2023 22:41:49 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%4]) with mapi id 15.20.6254.033; Sun, 2 Apr 2023 22:41:49 +0000 Message-ID: <87wn2tc3f6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 2/5] ASoC: audio-graph-card2: switch to use c2c_params User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 To: Mark Brown In-Reply-To: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> References: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:41:49 +0000 X-ClientProxiedBy: TYCP286CA0083.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::11) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11431:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f125fa5-cdf1-42a2-e862-08db33cb729a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2UHuFS/OC7kl11UylRBJm1XVnwu0biNg5IR7TOs79B/OjeTFwXvCOu9ajA3kVHfSOA7qI2mn1dmPKZvp3o6AhN+/Bvj4OqQ7FCZxEaeDP5VedVARQJWNAJJVi9ZhsOFLIVoXfuUWjY+lghxQY2OZ8N+SxNMD8O7EqqlTwOQxN494LN+bOIXwblzV1uje1mUHGkXwK6liLcT+auFUyG9MZ5lLVI5BIEowlv67DJuVg2YYb89vA6QUZbE5ZMvVUCDuN4sNs/lHlemfF2l/iqZDO8qfHg5VRic7XCcZT/bpIkrW5dRUFwMZ5EShc6XxDiQOghRLC00cJy0y3vkvmlUDiPwGGH7+XSVjXpTIDGP3TMy+ZRnoZvfZZrouVTy2aUCZ/UieBBV5Yfq5VbQ7TmvUnJ+q6xmUklokm6ifTD5pIzRjA+1u9xXXnrDYpGelwflRM+verSNiCzK6saRBMNU8teZOm65b9o9ztwqYAmgvmkIKlE2yCKe1kfRO7zBGHsEDa2eDGuJj1Mw/Y/TqMtC3EIV5I5DE5LElpVAN2we7P/D0zFSKmigN97Dr/HnvWfSvvb5CSireGp/3DWenTywmuc+FZQbV4/wXtwzpScLxnmaaanEoxHSorwbDACLcluhc X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(39860400002)(376002)(346002)(451199021)(4326008)(6916009)(8676002)(66556008)(66476007)(66946007)(478600001)(316002)(8936002)(5660300002)(41300700001)(38100700002)(38350700002)(186003)(83380400001)(2616005)(52116002)(6486002)(6512007)(6506007)(26005)(86362001)(36756003)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YSit5/BWBxUiLO3OlMndIeJkuaMfbNuH3tH3jbYMoNm4NDCua8HYKUcQgoWDwHFZe5SduCLJxHwxhvjNEVGO03meM7SPL/PqpEhLZS1u+7f8V2tEGjphYMn8HP6OQjdrfidCxEiAR6Pfv9xaWGV3HzZlwuK2bEfav+5/mOQejJaRfwIafmNzRKuJx710ENEcpxlQMl0XUzBV3vUGoY3ce6QBpXw5hjQctyQS+rKn19B6JEDX4Yg6OefHc2Zs+ygAUsrZUeUExWF6+Zmw9TaDPu4DGmkVQgqcZMlf33BRWf0b1+Kln4xtqKoWC4L7GAM/8YUHwUr0vuCHlxxEIgEVLF+eTIHoKdyMi3iEdPCjdEDQ9nniafI3C0TrmMFaoMe8qjbWieQcgqX8JAzbpCJLeklYT0NZPKTfBHr1vqlmZsgPzRXxmSOBKfuSHJD5gvLup+hrQ0SdTK2a2rnXxRl1TSnniNVat/bk7zFrafoPhoMdB2OW3pvTmNApO1RjgwEUKgoc7obUyZUvR8c+QUwNoxyp/HX7fqOrUrwnIds4zE+37MU3whZUdV64WUXCL6sHFs8x+J5d3I8ItGTSos+/Po9yC6PlOAcxgwRyXjz2ygQpb+I7aI3nyli5U9Rbx+YXLNqgIyE8OYQ+uoYQWBjtwWGktHzfamapnKrFeYv5O6GRvOlE/RpAP6H1acRW6WS+P32oem7BNZky2R4SjcpgFEL8NWfOMIpjM46Z5+7pL3VW2YEzFcUV7BcFxR08wAV88jf5b73CxVUNW4ZqJhWlV5nFy0OjRWqLQZiCN+p2CCHykBdSRZCckAYZ2bJsNfcXhnduWkJMWsf7eJ+iJNcQjHQ192LvQ1vjSPFjiWg2zKdFiDxoD2RSLOBVCHtDOSp14fcjuAuZkzg/uW59qzEmuw2r6rrabDNyBxKMAOhDbYtTx8V9eHeIYW+6ggOOiWq5ZsUR91mDB7sIJGebywm8nNpPht5A2uKAgke1YVErYJIkxNNhgkq2wdzrhlz/2TpeZl25MfHzY1HdWvanIh8ZAioNfEJs/4QBtoL6yjuAayIyIK9CBmb5vganXs0wQDRJ6hx7HO3727j7Gtcp4NlPQqUnG9syx69CgmWKgcDRUj2chwOATJJJcWQQi73bQC0i9oTzhvlUKu7u69Nc4i2ECslReud2AikRmlbhmPk1pFLY1V6Cv3Dua1d5QJVWbaoUReIObo883bkusRxwsDRVk3VtgWuH2k20eGtIBP89GEkWB4DF0asO+bk0BsPkNYVFI1WI+JoLycnvVTVKgL02RyXXfr8Jl95GqOlsM9CCWlCcU+91tPk/4MX45of3lA7WHWU6QikhrMzaIeBtkSW6sEJsUnNmVXGxpW5WpSSbFH8TmbNeSUSS02yQV/4jsjRLiv4exC12aCRammiT/4KEvgrUndKcra9zCqeifCx0sU9HLNYEwbHwNRI/wCTqKxOGd5lV/BUFK1/qyeHg0KyJgOgSNpDG6LNVHzzhcPfjtNm4MXb5aV09HqSBRJDQNvrXAC8HOw1J5ab4dgU11+D0k8E30GMxmmFWEjBgDPfehDUKLnRlI9yhDgLlXtr3+hUk1Ew9CSVZFyZaRP3I6+MzfDwOtNcnhoirlsbHGpqnxN8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f125fa5-cdf1-42a2-e862-08db33cb729a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 22:41:49.7972 (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: lYXMVqmyvZnM8GEjvjzT/REBImRNBlY85g0RN73bsrjqdxUwOMgfFx8Uz7A6JIsgkST9ChkhMM/naiPQeHUlQOzX3D2JveUSOlr8kFlaIZBlBnHZ/g7qB25/30+rgNEu X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11431 Message-ID-Hash: JBECPYVX3DINERMFMGYIVS4LC4TTE43R X-Message-ID-Hash: JBECPYVX3DINERMFMGYIVS4LC4TTE43R 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 CC: Linux-ALSA X-Mailman-Version: 3.3.8 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: From: Kuninori Morimoto instead of params ASoC is now using c2c_params instead of params. This patch replace it. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/audio-graph-card2.c | 4 ++-- sound/soc/generic/simple-card-utils.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index d145b74d41e4..25aa79dd55b3 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -920,8 +920,8 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, c2c_conf->channels_min = c2c_conf->channels_max = 2; /* update ME */ - dai_link->params = c2c_conf; - dai_link->num_params = 1; + dai_link->c2c_params = c2c_conf; + dai_link->num_c2c_params = 1; } ep0 = port_to_endpoint(port0); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 34a9b91e676f..467edd96eae5 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -562,12 +562,12 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_component *component; - struct snd_soc_pcm_stream *params; + struct snd_soc_pcm_stream *c2c_params; struct snd_pcm_hardware hw; int i, ret, stream; /* Do nothing if it already has Codec2Codec settings */ - if (dai_link->params) + if (dai_link->c2c_params) return 0; /* Do nothing if it was DPCM :: BE */ @@ -592,19 +592,19 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, return ret; } - params = devm_kzalloc(rtd->dev, sizeof(*params), GFP_KERNEL); - if (!params) + c2c_params = devm_kzalloc(rtd->dev, sizeof(*c2c_params), GFP_KERNEL); + if (!c2c_params) return -ENOMEM; - params->formats = hw.formats; - params->rates = hw.rates; - params->rate_min = hw.rate_min; - params->rate_max = hw.rate_max; - params->channels_min = hw.channels_min; - params->channels_max = hw.channels_max; + c2c_params->formats = hw.formats; + c2c_params->rates = hw.rates; + c2c_params->rate_min = hw.rate_min; + c2c_params->rate_max = hw.rate_max; + c2c_params->channels_min = hw.channels_min; + c2c_params->channels_max = hw.channels_max; - dai_link->params = params; - dai_link->num_params = 1; + dai_link->c2c_params = c2c_params; + dai_link->num_c2c_params = 1; return 0; } From patchwork Sun Apr 2 22:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 669813 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 3363EC7619A for ; Sun, 2 Apr 2023 22:58:15 +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 ECE2F1FC; Mon, 3 Apr 2023 00:57:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz ECE2F1FC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476293; bh=UxjY8x1VQkyB2j1UhIYp8Uzt8E5PSd09pYpIMizstso=; h=From:Subject:To:In-Reply-To:References:Date:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=t0+w+RjlwasDJiliNZwGstb9rl1pZ9mkD0wy6403lygAOFEAL7E64bOTs7deB6WEy iGWFS0yolVjdScH4dZavWP7y/Zz6+LQVJNWShm36Lx1zu2dYw0uVPl/U7XE+yLSL/V t2xjr4tzB7WU7/OmiUsUTpECXRoLqx5dpgqKDBNk= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 22890F8024C; Mon, 3 Apr 2023 00:57:00 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 69CFAF80423; Mon, 3 Apr 2023 00:45:34 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20709.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::709]) (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 8969DF8026D for ; Mon, 3 Apr 2023 00:41:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8969DF8026D 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=MhfdNYcm ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IxjXzHZnVPKThUK+fE0wpU3j8PteUy4sBmom3rW9AIOqMfirJK1GTFTLya1XCYXXyGgXSpV4lnBqhr0Wf9UQm5h55mWlBSxu3/dliMHHsWvRCrnZaK+RV2W9VLBG3w5d+EPGJZfoK0uiHGNqnn+uThQIQ5KU9ZLmhbUS5X6tDXpmJhoFyP+KMFte7DsGgxKksR2JHuhSBR1BcbtBsRvdVzeXevQ5U4r2XukMI3addclB2JqdlCsiEecPqWQG+KGvQpAdKom3jqJ+TWtJSUYBllyp26BOtLV7mPgfS/PAKn3BUFUbx4WcA36J2uwL4zbKmPuGmjGkPQ9LzTBfpW1r7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Kn1ZUuw5kuLdSEvuEhdy1io1AmGNL1peCympUMtKXOA=; b=CMbheDGDqqLPs1/nUTRQeczZmKHrCcRMig64rD2xDcq2Z9cHY27K8P3TrFp+kftbr3JxCeGICLFkjK+jX0HPLp8vkR4qj0oAkgdbE8tfg/awVRYGNv85CtgvsgmXdD50AkFFnkh3JiFx7GkcbnCMSS94o3tIz4JqC/sDPCXeyVMvRfgGqho7sZJypDdv+1dxLld3mrX1cRmLh9NSXudzulp9K+LMdVftdY6+ZN0uGJM1C3iNh5nNMfTMKInXqW0wxZmeMLyStlzmkYGB0dkf/QXz6sDDrhvVy/VbrdFNLy9PJAi+1hYt52d6kCmhMHkqb31Ap5HcYx76UDWudgfUMA== 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=Kn1ZUuw5kuLdSEvuEhdy1io1AmGNL1peCympUMtKXOA=; b=MhfdNYcmhbDx84ZBcchI25MQ+NfEeiBPvFQkNa/SkVSco5QsW3H4zhI+dvOyweVU+A/mMx7Xrr39neMqD5ZKLya+WSadrWVmJ30nQxPEYknW5BLiJTXrXum3nFwtlzLEsao6/t/D7X559vu2L7+cN3wb0wLVsDvDEJ6+nNpC5sg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TY3PR01MB11431.jpnprd01.prod.outlook.com (2603:1096:400:377::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Sun, 2 Apr 2023 22:41:54 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%4]) with mapi id 15.20.6254.033; Sun, 2 Apr 2023 22:41:54 +0000 Message-ID: <87v8idc3f1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 3/5] ASoC: meson: switch to use c2c_params instead of User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 To: Mark Brown In-Reply-To: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> References: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:41:54 +0000 X-ClientProxiedBy: TYCP286CA0263.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::11) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11431:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f3f46c2-af33-4da4-baf0-08db33cb7587 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3yNjcjrOXOV8Lf+kHxze5SpZXtN9yxX51AxaNDeye1qEMV/CZcnLb/VQqJt9UPAIzBlLY7u4xZejT+Bg6s/HaWAjJ8qZwPu//MyjqsZyvZJrH5NC36fIOzAx4q6buldbCfvovQ3XUVMlnc1TgOouzXB2iamdQDIjTL9RuaU3FP10b/PWW9F5uWQ8mE3jBfcekNI/bjApretr4mZcGOe9vHihIrXqSSXiOFF3ANX72xub1kUj0SkX64/pPjvgEQCZWJWQt28yC+XVvPtUW/Z8WRpUjS5SID/wA79gHhTz6v79Y3I941g3ON+9px6aKowbpbPC6jbTgw0YpqkY0VPjUMArzyuqqvcGvjkVlVfWcwZWJg46qhfSL4YKtEI6jdQlrIKpkYsaqfLOa4z5ngn9zGLoHuFYR05aseXZokXxqSdwn+LBeNGanERCgwh7TmYBy/1KVrpuEKi6emsX3Fi48KuUOrR3x/AWuCjqtwxQgFwu2C6L64zfYdq2VU9hFlORJhIqsE969kaGb4JtdkqjVti54uvtNwFz4ZTzR5HbWtCmsG7U+UeEpW8y9t1PiGjc497eCu5kL+r2rgDQlVccoktvXyhO0CLUW4XrXw3pZoEWHsETYo2eVXbD977XK+kO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(39860400002)(376002)(346002)(451199021)(4326008)(6916009)(8676002)(66556008)(66476007)(66946007)(478600001)(316002)(8936002)(5660300002)(41300700001)(38100700002)(38350700002)(186003)(83380400001)(2616005)(52116002)(6486002)(6512007)(6506007)(26005)(86362001)(36756003)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I+5WxmtJwUWUjN9S8wlkFF4IfZjxxUDTBSV06z5uLsgd7bbwmy2BgOysBLM8v42INPn20+ybGc3F6Y6lpE6MVPaLQbhGjXKwWVgQNGsLrP70P4KdNTfzPzO0Xfj72uu+/9LZo1WCuk3UQQfnAjiMQFk96VTWfdXGKqBvU18xD7zlFFVQ+/nO3edbJK3gglwYwcqzleGE/Vm/GB+cS6s0N7hYXrtt+1cMWQggo9s920tXYzkSXBypdU/qi995i5mWkxFPr51EK3xO5JSR/mwwdpWVgebJbwokp0CuE+gkIYCRiHnF9zth8cPWE5iwY65mnoliBLz5GSKca5fZ8B0dgjGKAUzn0MNDANvApNnVq6K3DZc5yq3ig4JWHlXiN0Q2LMGP4LHB/eICdETlmDyfXrWo/Ul8K+FPo0SjAgyI04qQxReKBnK0XjkI/I0zI0f4Mb75IfVgHLeJWEeusOyQhy1cH2JNoBacFFQUrG1ePW6qFkAOX9BY0pTnoNFkUvfz+z94nkmv9NIazsuNSA3Fr1IgW11xxGWQ0O+2Rg5+ait+CS6HAY11SBYXD7DzuJbG2zQxh8TP0E9/VszVzRgqaZEtMRKdQEPC/2pYRbEvDVEsix7PZJSUooCi11oRlub1nbc9phC5CApwoikTiOa/WBwQmtN0em/NaJAyV8Q+pSXNh4nwY7KG1ixsOXw21XQWRntQbtQReRQEGlVSh37t7phHwW2xF0cUoLwnmAvsn6U83o6E2ggxSm2dwSJxq1UOs+PV71WnXAVLyWxBzADeMVCgmdprdXs/vXILuXRY+spG/TsoHxwsBszS4Kaid7CzzSZ0nKBuyD9Nl9dwA1FheZrcMApR1kfHEbRirVBwspN9Py48Ef0wkbBLL+ehXILiWYzyYkhwCihDO0Gf4MGooXmg25na5owOkkacmiSrGiVm+iRF+YAOlwIHD/9Kd1GuWOb6MES4SJ7GD4eLllBaIuUMkZiSDGPjvUwOL2G+MBBkbGRA1/T9L3dlTB2hrYLQpdXyaBaWWlXKzfUyL0nZ9lv9d6jnKG6GZwqj12EkDUOvj9HFdfr/WL3jIcvO2lLyeyTwMOlof3mMihriJ54aTu9YS9ge60x+b0einfge4BiTH2tKdIU4QQWY6qVGkx6/zcW9WeR2HkEp0mrT+Pr3ACajskU1iXm1RmeqN9fYAXMh1+EaIL0pa5onD4cl+D9xKH+JVXhzwk4uow7ejLJ97OKMYFy65DfeJHLsFlgQ1O7/ij7SozWCN/pqHmZcO1cuiPThl15U9o7l45hUbleVfc7Q3d8E503x7oDc4BxeAFGiY3Y9uRdLzT3HGCTUt4gu74UqntYZ8LimwzMcfL75iOJKWiS7oBjLF/p3g4zHYy6dL7t129Gml6t9n0hhTrJ0NvCtQ++Xuo9w8fiI2Y5tySmfxzN3m4JhfIOQlkrCR583Za+GSDSf7JiSoNu6CzoVkvfnqGb4ohlYiir29iK514rf/zM7+vbcEKF6iMy1znAINe5PHgVEsY0LiyNW8TcZ3TQmk3bcS1V/mLeMkCGjHb46xdi+VXHR3TJ7aGVyrCtUnZzjasX4RjDyHwG3z0+E4riljAwPKXftIgSOh4q9e/ucQNF0OKfxI0A4Njga2t0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f3f46c2-af33-4da4-baf0-08db33cb7587 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 22:41:54.7088 (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: rft5tQCZTRFWeFqK91wPsEssKVZ9uTpAy3gMWuMmM9BRII37WgJx93rSEa4qGWqV7OXFECcP6EPm5kY3kF9VlOcans4ls1BYVrFfinHC4QurE/bSHsv8qCdD+7hyL3aw X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11431 Message-ID-Hash: OMLQL4G2VOA7SCMTOWKYQPO2FEOMKQXN X-Message-ID-Hash: OMLQL4G2VOA7SCMTOWKYQPO2FEOMKQXN 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 CC: Linux-ALSA X-Mailman-Version: 3.3.8 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: From: Kuninori Morimoto params ASoC is now using c2c_params instead of params. This patch replace it. num_c2c_params (was num_params) was not mandatory before, but let's set it by this patch. Signed-off-by: Kuninori Morimoto --- sound/soc/meson/axg-card.c | 3 ++- sound/soc/meson/gx-card.c | 3 ++- sound/soc/meson/meson-codec-glue.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 2b77010c2c5c..a25c397c66c5 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -337,7 +337,8 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, return ret; if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) { - dai_link->params = &codec_params; + dai_link->c2c_params = &codec_params; + dai_link->num_c2c_params = 1; } else { dai_link->no_pcm = 1; snd_soc_dai_link_set_capabilities(dai_link); diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c index 5119434a81c4..58c411d3c489 100644 --- a/sound/soc/meson/gx-card.c +++ b/sound/soc/meson/gx-card.c @@ -104,7 +104,8 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, /* Or apply codec to codec params if necessary */ if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) { - dai_link->params = &codec_params; + dai_link->c2c_params = &codec_params; + dai_link->num_c2c_params = 1; } else { dai_link->no_pcm = 1; snd_soc_dai_link_set_capabilities(dai_link); diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c index 5913486c43ab..e702d408ee96 100644 --- a/sound/soc/meson/meson-codec-glue.c +++ b/sound/soc/meson/meson-codec-glue.c @@ -105,13 +105,14 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream, if (!in_data) return -ENODEV; - if (WARN_ON(!rtd->dai_link->params)) { + if (WARN_ON(!rtd->dai_link->c2c_params)) { dev_warn(dai->dev, "codec2codec link expected\n"); return -EINVAL; } /* Replace link params with the input params */ - rtd->dai_link->params = &in_data->params; + rtd->dai_link->c2c_params = &in_data->params; + rtd->dai_link->num_c2c_params = 1; return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt); } From patchwork Sun Apr 2 22:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 669619 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 27640C76196 for ; Sun, 2 Apr 2023 22:58:44 +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 78E13207; Mon, 3 Apr 2023 00:57:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 78E13207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476321; bh=h49XKkK4HhW3JC1zCA/N42qwdChGkAh+dJA1kDZERsM=; h=From:Subject:To:In-Reply-To:References:Date:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=n7/t4WLmIiWx6mGCS+oofyACBC30Ib44k4xnW/EGgY6UM4BfwNv8Bb8wWZNY49SlW ADViT2lkCLtcYid1MLOhvDQtJDugwjvHqE3CV0+kyIh36veCobXouRn0C9tNIup7iv PEjY0rd62VHtDp86kb9sach2OJ7IGJKxHQ9fn99o= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 11577F80482; Mon, 3 Apr 2023 00:57:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E748BF8026D; Mon, 3 Apr 2023 00:45:42 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::703]) (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 8CE51F80249 for ; Mon, 3 Apr 2023 00:42:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8CE51F80249 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=d7IrFp6l ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YEhYkXmLRsPaqlGoosFhuiGS6/c0fhkEA3AglGLrV8p25OxTLhkvB5z/4QYmWsX1VqO28leGEmg7wWWsDLXO349Lc07FtDrWciHvs9JWxLgSzlXeE7/XSKNP6wsT8Kl4sytJk0fTK/kQvoMkds0yiv6Ud3Pk9i0MIB/Yw+pLBKtFLZB9YYdmAlHN+gJygnS9XXOB7iYCYBrp8aAlj3Smyu6xcQCL4zeaw3AyhbwHBS3HRXYT1ZXQVZandAHcMeTGGzV2fGp3dwOiioApbSw3w2z4Lxis9YdG8ODd5t8qkN2MEpGYYZg47FlKLLYNU3yXzg8VwRJ9PSni8WGUmLfSTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=yeAYrZmDv8gjQQ7vHqPD+/JLzzb+H+jA2HGrrU5tp6A=; b=R3XpXkiJa1tm4Go7RtxV2YZYY8aeYILeG1nYYDRky6YMoRktX2nf8u7xjYEzgN8fCbTWo36csvkykvbGQwt7gllqGWq8pcuRwTHAHAn50UZZsNwld4qiYd/g23jcQuXGY1xrZ6gZ4mEGOTI5MHzzl+iOOdDGp3vo9Q0KSZg5kfyPWj5RYMGLVxtu27hI93xCaToBtVXp2njbvW8fyXho6jr5Hp2z/wNEeFUBsXDQVyLEMGysuUTnfPB/in8dPOvr1c2w9aC/S/ChzvSiqXzScc51BKhu1cFMXXhV5RVW426gYGR9WIETfxGVGZHjclhHvdvVpC2IhYrqa2fnB69Gbg== 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=yeAYrZmDv8gjQQ7vHqPD+/JLzzb+H+jA2HGrrU5tp6A=; b=d7IrFp6lP45Z2tHgjeo4/NI1+0gp62pVOAWWlIm1aBcLuwMb9CMepBjS3uaDVn9BqFXLP5KWDy/NwQno0lld0XrKk/xOFdDptrglIMMu69xxlHNnkZ7dpGAM+rnI2urwISr0L6125a7QbRa6cZG8ZxgSk44YDBZG+2W2P9gPxMs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TY3PR01MB11431.jpnprd01.prod.outlook.com (2603:1096:400:377::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Sun, 2 Apr 2023 22:42:15 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%4]) with mapi id 15.20.6254.033; Sun, 2 Apr 2023 22:42:14 +0000 Message-ID: <87ttxxc3eh.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 4/5] ASoC: samsung: switch to use c2c_params instead of params User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 To: Mark Brown In-Reply-To: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> References: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:42:14 +0000 X-ClientProxiedBy: TYCPR01CA0131.jpnprd01.prod.outlook.com (2603:1096:400:26d::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11431:EE_ X-MS-Office365-Filtering-Correlation-Id: 10f0d0a6-9b29-483a-48a9-08db33cb8198 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LtmCdwNqc/J+DA42O+E6v9NIE++RzedjT3bGqqa/sF5XUZRwFizJilrknWeLku4mKHSgpf78E7yid+QZdHHPSlPqjsxQJ/v4n7wRsDD4MSmVXnWHYrdWyDKBu/HBi0fZIEOUzcBmJnEypm6utkicTE834OpEE3F2Rn8Yy9ynqLXTHcWbyMH5pCkoK+55Rb/++axFCX9Pz2aS4wEZWYk1ajWnjHuT/vRKCsi791c6fqQdsdUmkDyy35+3coU22VBPPwU+zaTS60Frm8Oa9ljNCPNckTQ8u7IbmPx3yACgNXS47+mHe4XHCMHWF3qmp2oC6ecmWqmuMWr9Mtav12nRmWsleOzLj9oOwYS0n+rZDwEUxEea01FtWmo6N/qxnmN/bS7PH6zgbCgtNg/eLF7zV9eZu1Taz88kCDXuAnaRk/br/pnD1fhpj8yYhQG4/hUILqH3BA63xXtsiUAFjpgen9QGULaeoJA2B+j3d4rU1P+Q+Ro/5Wt5/4bul4fdqZmnmD9WixuHaDe0BoTVWKjOyUEG8VK+P1iis17BLthL/ldQ87iS/Ucl5lCWl1tY6HLEDQLzYkwZsbTJBw/t5k6k3LtM7kyzyBoydYYWkXBiLAO37M2IxE6OKd5U5IzgrYzv X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(39860400002)(376002)(346002)(451199021)(4326008)(6916009)(8676002)(66556008)(66476007)(66946007)(478600001)(316002)(8936002)(5660300002)(41300700001)(38100700002)(38350700002)(186003)(83380400001)(2616005)(52116002)(6486002)(6512007)(6506007)(26005)(86362001)(36756003)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lfFtz8xfEXVmCGOBsWxm2kVuOhvvR9vgxnhZeEP+iGrytHxZyrYZwpxrM5qfNUDVM1Ua9uXt1qCyTDDJLbQ4iRdLSfuNDht923f7Vh6JHw4i4gJeM7Mhf32FHSgCES/5f3EdO3BgV/G0s44dTZ8Pjc3baQTxa7Sut+bCa9/yx05U/1wIIN5TK1VHq1I1UOyHV6gH23fx7YtSOqPA41Q2WhpWqufZKUDoG0RNrjVwYcRa8AipgsaqQ3sQMNxlRLJIv0b5jhBT2/mOibQjsvpiYmsNwne9NMjbohb8W1x/mD0XybYG1FOdq0A8HL7ZRq4uU+rF1cPo9gs/423qztz2n4fJN0n948kXd1ngZkUbqnDbZXkPaRNkvpjgyaLEfIiDmmEToRFB+/53gvtmWgzkFBE2SvoNB6xH78cIf27B2uW2e25XUl7UaN4797uJeYv9jeRQDexqEALtJ1C9M8Vh3gphvKD+MiQYcervvLSY+r3ZSnheHHdSItSotG2q08LQczPLqG6UuY34o9ep8CNnyhQ+DIO9IIWbJQcde79nE+dCs0vyQILrSnMbB3Af2EH7FbLYZkYn8QIsVv/N7QVdE/tmvoylIxgezvjJq4wOQFxyTR2wfrptl81B3BgH0z4tABABY/obgWo93YVBLzfHXKRdfe5wFp/U4ST2v51B+ft/VNIHE607HEnhkBv6L8st0TaC9IETBkz93U+m1id+c39vpmYmBx6g1qBjOZvyB2sVLPalDTi8C03fSNJ8HpkRhzusMYyiiTZKi0ijs4DCBZ2Mz9AniBzYD1mSc19zWVCm9IGZ/kjq5uqV0ElmNkipFmuBhWXs0xQfTpYRLt/gmSqdy6rm3Gwxfs4/cypCXKnhpQVC2qFyV0XhraW0vnHXdTrDovPwit2fEqtFMnQDEfIstXGXM5Dgv3uESfHSx8FpWplzK9FO3vr69eZZz7YbBeWfh+FXAuSAl4kvF7pyxvZaiaWlaUfWMdm5j+9Q85b+Wz4NjFxUoPXt6NQh2XRnX+ATRQBrZPakF1Y0NMZ5FCEeh1EWmYsD7BNe5yPpaB/cveXNPJbkPv9b+nPBtBxZRhbVuEAJEBmKbztELUpn64jMP1LbBqPKxZWX/p4y04/zMf/EAUXcbv0VVWVw3sWhE52Ot/27uJW9dK5yPtAPBN4PzK6ua8+bd1D8/wbocqcNUalxwQLgy4LRLc0XjcErd+6fcOvHaBpreKdySOlvM8aXCtYBqnohWEWzQdKiB4Cst83aeMvtbot1FE6G88Ck+LCa+irCxKLnzLIdkoXxqlyJrNbnhx1y2wEdo6hN3Fyi2nInS4FywFB25NSXLXFcMLPyiy2ITf9bTFQ+F8y0WCz8ZcWv8+ztJ4RHCCn1oP6hsluHKyZt8Nzhfx2yA9rdG9OGP6rdhE54bDYY2/zszQoSLbJNZyGE1DEAwG285i/OS/hUcV6EzpGCcoes0w/g+vN84GGSICc1mRioXvahKb3Wxne6dpCe9pPOL+4xqc6Qm9B9nW69YEcz52by+0DXUp4Vn7XKBEEZt42VyotGJISUAIMb3XvNSVggOb9SReXsMaTeE0MP4OesHRJIvNic2vI9iyiljYlabSmOS7jSiX8kXlEhQz36IV1gVtChpuM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10f0d0a6-9b29-483a-48a9-08db33cb8198 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 22:42:14.9368 (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: KJHrLil5yM7NmGOmjXoJ/g2EvwBEOJAyh12GIpLT8zvdj9PlhT31OPWrJaFeiSFoOinUF37WnXfSyJMyy884E99EddjA1ks4Q76KKzisBtGdbqLQhLPEyoKKQlsYUIWD X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11431 Message-ID-Hash: SIJG4AXCU534UXTEJG6UKAUBZZ2UOQLF X-Message-ID-Hash: SIJG4AXCU534UXTEJG6UKAUBZZ2UOQLF 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 CC: Linux-ALSA X-Mailman-Version: 3.3.8 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: From: Kuninori Morimoto ASoC is now using c2c_params instead of params. This patch replace it. num_c2c_params (was num_params) was not mandatory before, but let's set it by this patch. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/aries_wm8994.c | 6 ++++-- sound/soc/samsung/bells.c | 21 ++++++++++++++------- sound/soc/samsung/littlemill.c | 3 ++- sound/soc/samsung/lowland.c | 3 ++- sound/soc/samsung/speyside.c | 3 ++- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index 0fbbf3b02c09..7492bb41456c 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -483,14 +483,16 @@ static struct snd_soc_dai_link aries_dai[] = { .name = "WM8994 AIF2", .stream_name = "Baseband", .init = &aries_baseband_init, - .params = &baseband_params, + .c2c_params = &baseband_params, + .num_c2c_params = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(baseband), }, { .name = "WM8994 AIF3", .stream_name = "Bluetooth", - .params = &bluetooth_params, + .c2c_params = &bluetooth_params, + .num_c2c_params = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(bluetooth), }, diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 76998a4a4cad..70b63d4faa99 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -264,7 +264,8 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = { .stream_name = "DSP-CODEC", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, - .params = &sub_params, + .c2c_params = &sub_params, + .num_c2c_params = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(wm2200_dsp_codec), }, @@ -300,7 +301,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { .stream_name = "DSP-CODEC", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, - .params = &sub_params, + .c2c_params = &sub_params, + .num_c2c_params = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(wm5102_dsp_codec), }, @@ -310,7 +312,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ignore_suspend = 1, - .params = &baseband_params, + .c2c_params = &baseband_params, + .num_c2c_params = 1, SND_SOC_DAILINK_REG(wm5102_baseband), }, { @@ -319,7 +322,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ignore_suspend = 1, - .params = &sub_params, + .c2c_params = &sub_params, + .num_c2c_params = 1, SND_SOC_DAILINK_REG(wm5102_sub), }, }; @@ -355,7 +359,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { .stream_name = "DSP-CODEC", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, - .params = &sub_params, + .c2c_params = &sub_params, + .num_c2c_params = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(wm5110_dsp_codec), }, @@ -365,7 +370,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ignore_suspend = 1, - .params = &baseband_params, + .c2c_params = &baseband_params, + .num_c2c_params = 1, SND_SOC_DAILINK_REG(wm5110_baseband), }, { @@ -374,7 +380,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ignore_suspend = 1, - .params = &sub_params, + .c2c_params = &sub_params, + .num_c2c_params = 1, SND_SOC_DAILINK_REG(wm5110_sub), }, }; diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 411e25cec591..5d8118e69359 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c @@ -167,7 +167,8 @@ static struct snd_soc_dai_link littlemill_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ignore_suspend = 1, - .params = &baseband_params, + .c2c_params = &baseband_params, + .num_c2c_params = 1, SND_SOC_DAILINK_REG(baseband), }, }; diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index b44f5e92224f..106770be6fc5 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -119,7 +119,8 @@ static struct snd_soc_dai_link lowland_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ignore_suspend = 1, - .params = &sub_params, + .c2c_params = &sub_params, + .num_c2c_params = 1, .init = lowland_wm9081_init, SND_SOC_DAILINK_REG(speaker), }, diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 69d7b0115b38..22e2ad63d64d 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -219,7 +219,8 @@ static struct snd_soc_dai_link speyside_dai[] = { .init = speyside_wm8996_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, - .params = &dsp_codec_params, + .c2c_params = &dsp_codec_params, + .num_c2c_params = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(dsp_codec), }, From patchwork Sun Apr 2 22:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 669812 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 03E57C76196 for ; Sun, 2 Apr 2023 22:58:52 +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 748311FB; Mon, 3 Apr 2023 00:58:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 748311FB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476330; bh=gIJBrBsj4SkhSPTs7KLVLAvBn2xodbIPNRabvgsRqPk=; h=From:Subject:To:In-Reply-To:References:Date:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=t0Vfg6r56TooYQDKTk7D3SQ7bB1p+ttXR+X8SAIkozmWYDmU7lmvaGcr6mXiWX56I VaFkjKPrlep9BiLcw1VePyyDmNi8FD2Un628Csg90mngXkRgC67Qhw2ZQvYxXdcXaV x6JQmQpv+b2u+gticiIFJFSZbS7CeacWyc9R0aC4= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 9D4C5F8052E; Mon, 3 Apr 2023 00:57:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 681D4F8024C; Mon, 3 Apr 2023 00:45:44 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70f]) (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 1E7C8F8028B for ; Mon, 3 Apr 2023 00:42:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1E7C8F8028B 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=D62Iq3UN ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HOrRi15quMtiB8/m3nsViUl1nx9m3i0RxnliKuxp+V7s8PQu4QMJZCOm6bIoWn8f2O/++enOzo38s7ayisaMqgUQviDeTO7YQsEr4vUNj87Iq6e+5iBzXH2xsBecwKi2c9Nx8phrWe6ziXV4unTtMX8iMoi/POYKRct/3bvygrYQdAX0JKdyK5/y9p5fGsQhw05dZ4yKcpRm5gazVQBZWdC/iYlqmvpk+LTwAnNNJoaTvesRKj0oDNqEUuLNnkypOU101kApdEA/eWzL9ifXG9jTRp/3kM7Fn4dPVyIvf+uQ7G0cxFi6Tng95keEQBC27G3KwUuPj0BOqgOBdqojIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=H4OYbDy3Ad8KUXlgALT5b6fJAYFWjU4kJibigqFUmoI=; b=ToUCzlXTJ8czm0DYMkJa4tH6ARkSF3hzhGHjgPwGZ1STAaqSAtBYtMpHrfV0RMQTfZDOhepCcNK3MdstQCoA7LZEZFKGlyEUBSHQGBjX3lK5709Z9VA6fLcnKibRolR57Tk6/YZgFF9BfUC+M76kPe79CszBnSgckbpRf7SNckSO5IGJGpD/z2RcOyCmDovQC6ivL8LCPq2tOEzQKv7T7EREwgYPWNAPhOvPah59Ejcx53fNgrdMx6ocpkGAQcUGq7/CSOVcL2Fa4hVDMnfjRFQMG0SdL+HTnFc3BxB8hfdzCRj//qgGscQvdADbLFAb0e7KsvRbcluZnZIQKao1ow== 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=H4OYbDy3Ad8KUXlgALT5b6fJAYFWjU4kJibigqFUmoI=; b=D62Iq3UNmmkebur7qtbFjDGRKpDIjMEIbTcRrlcMi9XLUTsInYUd/h+mdgvl68gjJtCcYzI2VvbFkrSs55kbEX6gs4pNNDfD9iEJg9dtm7GNLuoBtpHBiTUmek/A9Xhiorb26K456eA/OiTQB3aT98is1e/i6gUGkaCdt4moyVk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TY3PR01MB11431.jpnprd01.prod.outlook.com (2603:1096:400:377::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Sun, 2 Apr 2023 22:42:26 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%4]) with mapi id 15.20.6254.033; Sun, 2 Apr 2023 22:42:26 +0000 Message-ID: <87sfdhc3e5.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 5/5] ASoC: soc.h: remove unused params/num_params User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 To: Mark Brown In-Reply-To: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> References: <87zg7pc3fr.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:42:26 +0000 X-ClientProxiedBy: TYCP286CA0184.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::7) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11431:EE_ X-MS-Office365-Filtering-Correlation-Id: b5dd6313-6b65-4fab-bfd2-08db33cb888c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DQqP6cEGZyYuNakl50wBdPuXdee1D8ZTIHgy9pazHNP3JGmTRKURpx7nlH4fM+opkkefcIcnZfbxg1FQ1IYLMZEB/dbE5i6eqnQiJOx+3SvxNZ4lcGwoPWBumqnL2qHSr17VjAme7KljlYuXOfliw5XjqVAKSZxFxcJU6H7JXpWu8++n9jSyDe4cPV4mNzkuJOR8dSfr8+VSjhecBbU9EGx4I2DXvry4fk066QwZEHcbyx7gRCAuSQdVKO80kAlVEhvfPC0iIixNUm2MglFJq0D6fY+ZAPXLFH+sK6y+30QlJzv1bsiH58ALhl9q4GFa65ejQAqem5PeZO87byGKtZpLw55+6G8S3bsPCgfIk54UAWkdiBvnQMTNYRwvuiqh7af7yyUEAEJFSiJwRmAZGtz+GmTOUMFew+v2xKEf1J61AwDWT34PJ/zmojVFo6brigwCj1s/awarXhYtLAerBKsv3/QvxNRH60ddIbWz/lg/EByz4JP3R541xcmqNClikTrrJmINAsicVXE/Jzn9nT3aqvgAdkek5XH7QfdZWngOafwbAStNfom57MXSZkACzfm3+4cM9N0Vzg/rlkAwrCSD8dxCPggJPsJfze+/544mwCeL5tz/wYwa3ApXzERI X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(39860400002)(376002)(346002)(451199021)(4326008)(6916009)(8676002)(66556008)(66476007)(66946007)(478600001)(316002)(8936002)(5660300002)(41300700001)(38100700002)(38350700002)(186003)(83380400001)(2616005)(52116002)(6486002)(6512007)(6506007)(26005)(86362001)(36756003)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MKQZfNMP+DEhMT7ZsRkeSuXtANEn6CeXszOZ7PjIsIxDyQ0sht6qJNSI8zi1ycq1560brFE9/eVt78DvVQmHRao+Q133r9pZvnDTqJM9RKyAU4q89qkZhBafioC56BaXPUKLv8pVZkHNZ0vOu1ae1SYwC5ntPYhZvajUNH24ZaLOPtyi5IS63llTIAiyNUAz1E165NxqZkwz1FAVyhNe83GsFgGwlLYT7qmBNAZ7HPHQ5nH7FI8Kfm7nNbb879QmQ+x2HYmP2CpOIb+kQreMwaucBvVWQPT7TdqDhdqonPrM6S27mbfZ+pIDldIIREJuJZaVwMBlIGVkFwlkNu3BaAAJ6CyrvhQgvrd7kpD7Zq/pUbSlcd5GNjoXgvQ2MBAN//z4T/yZlJPN2DIVTCkGf1SgmIZRXy1J3TgAnmSc5c5+adN+KZn1HYWgaq96op5EOgWZc2x4H1jnS2zAbj0V1O1JPoclQYKTfSaGQD2AMInT0LElq16ZGr3TAtgsp4qnur7loTNsSszxUkWQE1smDnjWQlouCfETfOWsbPi9T67QycdS8kDY9M5EgNISEshaMroz7pp3IJ2Kntut27G0oijZ95EG/U9tG8nG9fBtyw42/YgyqwhA0a0j6jdxTbyJ5M13WT5l50FgdRwslqcyMTOEcuspOInVRolKxzeILxydzhE6dWZ8V37Wt8XvY+00zfPLMdLE3TuyeIwaYbStvWsH9g/0BqPWUTKVRraYbGm5P7rFZCriv1LK2SDvmXWLeDG2FlJxyGafr6lSKu34nv6z3VdZQGC/YP9vLm7kjnY3XzB4MILDbuSIlqxPmtbIJ6SFJ8jjK6BpC+uklyZ3zySqLOC74jBzIK0i1K7f0Gm7S5hk/fpmfRkJFUYwBPMtIbTF49jNQOvFw+Xhazp09j5BnjyJfU928kGvTlnjJNxKwO9hbt9JXps7QHI8aQHG4AGP0cTFai5m+ACldtSVtJA3dDGYvpy51ieQWtDpp6Adxth6aJnJiqDeLMH0CapUHfgOPIVI6gRu72ELm0o96QKGY/kTbyfCj1kr81SrR4hg5BXA04Y6NwzjMxyOsyT/Ks69/YwhmLsTZYlmUNgvnu20PR3DlNOGSZDhYaUqmGvivgZb5jg36ibPWv7/4GyWKozl28l3fVZbwPHNF1Zlq20Ne21nZhTPxwyS6Ki3x1XnEe68ZCMeoRUltaBRauQsMQ5uqYLmkJdphtNdlGAwykXNKG3Zs2NlgU7qQT8vUYhZz5tG3Xe31V6pLMTePVdauH25oapJzg/OLfhQezEC4+TgE4XF3ieNWN/YtM51q31oxu9949fD1o2qEqYEwMdAP72u5IEwMlj+mMsTSum8vQBIE9ggCzMVxf3zqfq0pXN334PDVjlV22PpJYQWKBRKwP7YH4ZGZb6ghp+LTUMpwB2snz/D/Y1QqTG+Wu38dZFuPaWrfp3/CAqkWgQ0nzasN6oTf+C3EdrzWRNE3JePy9S2LYLa9q0PbveeUWeTwJHcfiZYSzI/XESGdsSuaKL0JlsO0lE4A7u6HLK2tppDBJExgWdmnRHdmgHzi3zc0+GfMr3hjP/EWcFTMMkeCyb7wXwd5iKewIgpK7+5XdcvLIN1RtPRtL296nP4HQ3ozoc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5dd6313-6b65-4fab-bfd2-08db33cb888c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 22:42:26.6436 (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: p+3fHwUwyRyH1tJ8N7Wl+AOTZEIiQpq8AWx1baAw43Ys9kTWYK1WYoSNcwKOn0Zv+zfqTzP2wG5Z9w54mUpDzmjhQ1cbOy9mdc9afwpOtODG+mmg1b/r4zW9ZVp7o8dT X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11431 Message-ID-Hash: VKEHI5Y4KKBHZGQRBFYRWNFVRVAXP4FG X-Message-ID-Hash: VKEHI5Y4KKBHZGQRBFYRWNFVRVAXP4FG 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 CC: Linux-ALSA X-Mailman-Version: 3.3.8 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: From: Kuninori Morimoto No drivers are using params/num_params any more. Let's remove these. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 3 --- sound/soc/soc-core.c | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 276afdb1f445..3833184c187f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -690,9 +690,6 @@ struct snd_soc_dai_link { const struct snd_soc_pcm_stream *c2c_params; unsigned int num_c2c_params; - const struct snd_soc_pcm_stream *params; /* REMOVE ME */ - unsigned int num_params; /* REMOVE ME */ - unsigned int dai_fmt; /* format to set on init */ enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 04f1bc8a3128..9bbcff492c1e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2294,9 +2294,6 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls); */ int snd_soc_register_card(struct snd_soc_card *card) { - struct snd_soc_dai_link *dai_link; - int i; - if (!card->name || !card->dev) return -EINVAL; @@ -2317,14 +2314,6 @@ int snd_soc_register_card(struct snd_soc_card *card) mutex_init(&card->dapm_mutex); mutex_init(&card->pcm_mutex); - /* REMOVE ME */ - for_each_card_prelinks(card, i, dai_link) { - if (!dai_link->c2c_params) { - dai_link->c2c_params = dai_link->params; - dai_link->num_c2c_params = dai_link->num_params; - } - } - return snd_soc_bind_card(card); } EXPORT_SYMBOL_GPL(snd_soc_register_card);