From patchwork Sun Apr 2 22:59:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13197574 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 79A76C76196 for ; Sun, 2 Apr 2023 23:01:59 +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 07DD51FC; Mon, 3 Apr 2023 01:01:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 07DD51FC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476517; bh=2D0/FqrKQqVFq+lTvIg26z4H3ZtJHzciYJFN3Bhhgn4=; 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=G0WqnXxPj2VeVwulIrXyKusxFPp4zbm0jbeyaD6WXO4tYBCg7nJZ+CeFEf9Cpnguz 3dZHr7U2LnjeNJm98f0lRTibtbWhlN5WKrH6TtmsONqcHn2uRcQusriBKvSzaqOxDg 6x90Qrmi97JQsbxNtCwKIVAZFRo+hhmFbFtd56po= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1EB6EF801C0; Mon, 3 Apr 2023 01:00:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7CF36F8052E; Mon, 3 Apr 2023 01:00:31 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71b]) (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 9B05BF80423 for ; Mon, 3 Apr 2023 00:59:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9B05BF80423 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=doI6RUa+ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F0hDXJ8n8uPAU0y1xcsPbt/VWqHWlEzB1ORLZLx2uJ2dNCa8/+2IEv+dAXQ2u4TncHiqdsUXAevAzQdmgze76cZ4jPfvwZj8TP8CulAWXqo7shDhkMeGDd08+/kM+QsvCmF9wl72xjQrhRW1+IvhFF7ritpupJb2V6+mAfdaysZx+Eu4ezJsUUm6JiwdqCl57Xvn6eFAdf8gP8Hq0aEfvj3BRTBR5nsaTpQPnfvxEfvv+TRRsQbO74dDYw5iabvcpjQB51rxJ+v4bUk51MEvyf71wR8cMGgp9dnsdHlOpGL1TCDgs6PpYppLA4Ty7juWQxOR8mWAM7LNa6wDEtTM0Q== 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=IY2ypbIDMgvN2z+qPRVsEon20uA6hdwqlynLowK3GdA=; b=hvNPiYAcvK7yvsAQOKjn+YRtnH/FoXK+bJ0Oplgq5IIYXDnD5GFGH9WjyYw42GKq5760EIc7EDye8U3cvB803u4e7IZ1L10D4I/i2Ko0HSM0SUja4a6Gm76NyYZP8W49rj3ZYvLHbi7bVMN2otW3dTCKBpGHeUdrH3070mnPjU6MK6S1Qp/xRvzAy4HK+6Iz4jtuu+WpSPyPJBh66YYtnbOOad56NCM+EQC12FV5kyuKLMNlbS6Es6o1PuqxkXli2d+tSTEfUiPnXNRu5mXkZXWD8HHzyZGsHt5t9VV9jrCgndsxJTkVzDVRP90kxXTUrPvnoh2Pi/y+XFxppfGWTw== 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=IY2ypbIDMgvN2z+qPRVsEon20uA6hdwqlynLowK3GdA=; b=doI6RUa+5rBVgyijHh+aJlr4x+dyWTtiP9cJQx6gE8xAdU7HPhFx6q7fwPd4ztj3ZsjqlxUqrl43Nk8jYvVXOZAp56rxmsNY3e0jInOaXIs60dK9QNw/mC7Hh+WjMeQdC+dTMJSOy1WV+7oRlmZEZiBZO4Z/ctjPLuds6PDt9og= 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 OSYPR01MB5304.jpnprd01.prod.outlook.com (2603:1096:604:80::16) 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:59:36 +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:59:36 +0000 Message-ID: <87o7o5c2lk.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: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> References: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:59:35 +0000 X-ClientProxiedBy: TYCP301CA0023.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::16) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSYPR01MB5304:EE_ X-MS-Office365-Filtering-Correlation-Id: e3aa87fa-f6c7-4b89-753f-08db33cdee23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uBHNPJzbL9sd3vpPNNgRWudSqgQhlIKWrMFL4gdsaTWzd3BBpLcS4Goi1e5rhLVuK+0Sgoh9E0R+TF3G/bmI4EqfCYO+1B4q0KTMYkpu6t206ai2onOMGahYmjCcKYKxKQcfBhu51mXmqvDJzo+LcV8U1v60bapyZJz/rHcLxFRQMJVIdyY9IbXgOs0Ti7Ue9syTQJChhDo/bueiNRYP0BT1uytoHQvRdEMlW57oKAE7Aj4SEqHXltMBN0Lx1EJfZBIze5G1CkY397SShyOFt6eUg4uy+YU/r6gm8KjokIzDo6QfGv6g4EKCAYtJtlFQw8pQPTQMKS+vou+eyCrSkfQ0blVifAXal5qCpsYKkPIImFOeqv9ijzeB0T2MPb8H4ifms5F2oMvXB4neftqCbQU745kHrL7QAeNlFeEojmp2ugfoQ9VYlnjJowaYEjOMdeB7zAGmpj63YqbrkrFQlCGmMj2qmyu+QpFaKDukc9tfXdYTkrMzm3P+UZQrt1S0q8FTXLKiVSe42O2i6FoU6zTv0hFjC2pMHQVbIs2TK2Xm44ThfVcDeeaDbFtlmaeO/7f10ckz+4N/CJlmTwXNQdE/nO4LGaXsJFssdP73xLqHScOz8af7qRt9VBMQz75s 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)(346002)(39860400002)(376002)(451199021)(4326008)(6916009)(8676002)(66556008)(66946007)(66476007)(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: IdXfJR/2ZJ+AbVDmYAuvGKJDVjPVaNOODdVSBxRb5cKM9jRHP8zcPqZ9kmwHMSPAd2hGoluBccFn3O+swMByz6+yat3eZpCh3m03sgYvBEwls1AO8iltmh14jBP8H4kIpdJZDHJ6T1iuJqVRkUeW8BoKInw/yVps8Wa6yDV+hw73CbcjRDcFqwrtljyBDfIkaM5sS+RFyHNrZB89JSGDjmKT2rSfzyn/zVwtLhWO/2UJs9kdJEjOaGCLBdApmGHM4qQ28IOEH8ar9cZAYUrnFhO8f4JWe3jw6fW93Vcn90w7gQoE20eB+A6bc3/OlBMEo6NoTbpEsA5Bu4VfKseyHiFpMdTgYa6TTlbH11v5ZZ2xZavtjPO0nRxMfqaYkxBdlmBlMacHtdVQOXtye7W8CRyhzhpdDUTtUq8cox1OE/t2V6RQz82NStrudSmNwxVBU65qgETh24+/VDsdKRq6//hNyH3dHNjNCsgBcjvRpW6e1H3mGS7wum8i2f1jfmC7g6tIpRYcGSISImKY2e65v0KlQeAR/fS6Y82AdU6vF3H0f/JpO1fAY+u4+HtpaJAK6BE9wXDeNGXgDhQo4jjpSWIHaWoOp/3FHF30q63d+B6G1zXCZfWiWnxMc5JtLF9SBSZ7g+GDaQnBpDIXOcQrydaheEdTfSPPo7A5lI1IeU8qbRirDFC0kpeGrSMpW5ZxGeHzY/qs/36Y5s/zasGtm3MyH/bTiRmAAbJwhW8occyC4KlanBKe4ask7QVL/R5BignDbFZzbU9alU5WRqMz1VhE883HYE8mziX4R3BFbHldDFojnXH0eJCJ5Q6lxTUs1jlrGSfsVdkhQAjwjFJz8pbhRJhsRQDcIPfzPx2jXx8hn8eKPiyGtMkdnnwURoB9ZnK9r+eYybjRebyaOszng6d1xq1vTa9gJ84L6R24rIBAJVaxqFFrkj0cpoNbaIO19KWiPSsuDd9EfU8Gi8t1fGNSw9POGHKgjhUmwpwzVZ0XWuecgoMW9PIEthRXYfaXNhVepp4JvDRVsXgZS0g85wqYngCkXofJgk+uJ1Uc6alUkSU6b8lKcO77G0P6a3p6CWFfCrZ4+8Ybf42I7MVHZXtx4v/0O1rpWFqoQH2ofeDVAlD7+B6MZ/pFQKXSU9es6xXg/6wHeZnu5O11FFcWDXrVxbIas1ASoWfKU/GsCTw+4NDFE3CHxG8mJFwVJ9lnmuUHFANGlSLQV5BOzJO2wAhFsYtBzNIW8QdwGCnEO4bL+vetomO7nnvtS4ar/925+0BSfNiY+SVWoh7xzG0MjLdK5qJqIntzu3A5HSgAialGOi+ILLQW50M2uzeuZ/W/W6LFV/EM91pEEfJVjArSEBU9pYpvoynrCJfR0D5Dw+hRFmk/OiLIoKGEeUCdt51sssHKpUbcyuJSRrITR6oO+Ru0AZEfN5PcycFbRsb/qBfp3h2w4GRuFnVgOBZrfrYcR++mxzqwPo+JPDflvRdZSp1yWc825a7MzqPMCuYv66vTZuliJIIr287pznYE8PKTDeQWie4MwCZMXGjwUN9lU+MOg8TECWOS8Te1UiI82W8jcRZbmFZoW/pxWgggafsh0ocaOfwh0yzXd708/Hmq3vdwRTvJ498osU17XHrx0uc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3aa87fa-f6c7-4b89-753f-08db33cdee23 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:59:36.0703 (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: eade/Zclib0qbencSQORNmSLBseiUgef+qE9NqnO290/TIJz5IRwP9qFz7cGrcU3R1g8n52unfGsYbB0dbUY7QYjG6E4UGC+7xbwEYkZXwDps16AkGtZTiS70Bv+3GqR X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSYPR01MB5304 Message-ID-Hash: KQ5R2MSF5C3MFSXSLIMPL5PJBQDYUYTQ X-Message-ID-Hash: KQ5R2MSF5C3MFSXSLIMPL5PJBQDYUYTQ 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:59:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13197576 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 B08FAC76196 for ; Sun, 2 Apr 2023 23:02:34 +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 9688020F; Mon, 3 Apr 2023 01:01:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9688020F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476552; bh=aCzeecKsSVWfYe8dcz/jkMW8/0xLnLYMBgb3s4tY0iY=; 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=odVtQj5CjvkRDKxUI4hmF4HMUPbeTzMl8QI/PwJ9737Ss/7GZLFMQ6yQILhw3U912 zpEXg6J1BopPqeAmawu55L6ZB4tUkLKyRdu1vGMUKON9M0YmtdJc262EUAIAbHV/K7 ndFHGOuwf06NXyj/4Z/VQMPbxPCojBAFejtlmlls= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 14F6CF80544; Mon, 3 Apr 2023 01:01:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1762FF80544; Mon, 3 Apr 2023 01:00:54 +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 F178EF80495 for ; Mon, 3 Apr 2023 00:59:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F178EF80495 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=L68HRUit ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mG8ArhWy0aliQQZozHfEDMhRykj4sPAG6kw7l7Yko0rhTvEs1WEwcBJXlWE+ImFgWVfQX7s8HX6LHTQ1sqMMTvZeuMsPkBu2mIvzg91Yp2Z3ReHyjYSFY9SxzaBA1W8yZ3cRo1pIht3qeQ9je52z4pQmJGI5vZYHhOnKDcW4XcBtm+z+vr8W9Mavn5BPzktPN96FYfNQnfiWMNjbtlHpOpEf6BmKgjdB/hHUn0FM5Ce8oeAXYtaG661PAp2HNqfbP3HP2QRE2J+h7t9802Y3//Rx84VJ2dcK8laZqhQ2HgpmgDI2uFqfKqlNjiZDq0BmCiRgnwU7m0DSq7tRmOt5cg== 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=Mfeok9zOGnZlz4K6D19cMMSRZA4g0/nZmGoB9j01m8o=; b=JUWZuGK5C6dZSGehhee8mmG08DeK8RLqNZTaUOJTvwB+1oQyd7stVBkWO5I2B+6B7qbSyYEhVRVipG4fHGXOyUBFV0ci6E+9/5g57vumW/607RncxbueeDLxn/kr4kr+0ETuGR1jcLzJvFCVsaGoZGq952LRwqTuMJd66BK5kFn/zdXVAK9HbUgG7KuvpN1K/CyHyX/5n0wYK8jR/QHyXVtTHAmVnVTqjiVXn3/F3ZKxIG4afJo7ymzRcldTSP++TaNjvwR3GvyhDLQsDeMUsKl7wAR1RH4kGKGlwWPlLUq7WgEcNML1b0wbP4S+EsuBjQCIc5EO9bti1ejhTjGKVA== 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=Mfeok9zOGnZlz4K6D19cMMSRZA4g0/nZmGoB9j01m8o=; b=L68HRUitRfhi1IY8vAu3ro8cnT1HmtBXGszTAetJyzNK/iUsHh7ff02ezIAQ5qchAmMKEt20QcsCiyVEMtpvQiSsBC+k7VDZiGMSMnOJMTWBSIw4QZmaWNbpCphgO5yjZrSuwphotf3CyPDcK1/MSsrzbrMhmwI+du24gpF8EDI= 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 OSZPR01MB9395.jpnprd01.prod.outlook.com (2603:1096:604:1d7::6) 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:59:46 +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:59:46 +0000 Message-ID: <87mt3pc2la.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 2/5] ASoC: audio-graph-card2: 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: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> References: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:59:45 +0000 X-ClientProxiedBy: TYWPR01CA0038.jpnprd01.prod.outlook.com (2603:1096:400:17f::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB9395:EE_ X-MS-Office365-Filtering-Correlation-Id: 696f2c1b-8692-4dc6-8a1a-08db33cdf417 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7ILyH2xJL5z1vAycwHy5Y6qWtKABT4vh0H/9l5EVxASGHdaGBt+X4eBgzdV7DQ/EeX8qL4fATWJzoGyxoQKAgTn0aq7tlsOGMWg7Vi/MtNgoWymrhHKocK0yPUGPTb/hPrygQYkVKp2OIjIpQa3NOSs5ZJUpWDzihzcW1eQuAPbKN6VAABd8hjK8C9LWIU6y7mEsA73nf0KBP46OPHh0PM7DZwbBDncoXRUX6ncD5WVtqYUyD2Y+lPfU+CrGwPo+YcoHs6kM9j45A+Sc0E6KtNY0Yjw7uEhT1Ag1RuKTHlpKfbRXhcLtabaBXRMip0reI2Zf/SNsOx8lbs7H3HLNrmTFTuMW6KiTLnJ/JQZVBUdEnPWTd2Y3STSMzazBIKeEFiVzTU1DeleO/hAbuDPxqNEqzoUwM9ijlbwRlVM94LZvdltY4Etad7xb3VNCM/wML4AJ0+0UaQMUGyzQOVtMSQmB/ksN3L/d9QkMk686oIEmOi7zuPACC5zOVw82E/R6cXE/wEg8JrY+w6zt0FEuFXpUHRNZQz1cC+X8SxgPAJKgIouM2eDttzWx5e9oiMN9nkRTylvRD8cQpPqrfaDRkPaqcPtcaaXMOAqczY0dTRd/o5BbXw5GpnWi5VDZKjDW 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)(39860400002)(136003)(396003)(376002)(346002)(366004)(451199021)(478600001)(186003)(6512007)(6506007)(26005)(2616005)(52116002)(6486002)(36756003)(2906002)(83380400001)(86362001)(66556008)(66946007)(66476007)(5660300002)(8936002)(8676002)(38350700002)(41300700001)(38100700002)(4326008)(6916009)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LEILkGHgbc8R4J7VbCsejxNEBJrDRrrY1MhLjpHTj0nOxjlQ9+2nkZs6aEcRUK8hwWS+lebRjH6TB0YUWsohX8skdxZjUwqV2+hkL+7y3cedLkT9tIEBsQ3xoEkuxp39j0Cx0FnYQJ+uCtdTcaovRoZp7r/TxSy/IWHchwnL6k0hblmmIDw0QjuYu/bxUXZ0r32jsCaUQfpru6tIAEaqWvCczBBZH56uT29GlzK+DoU0j3mF638hkkfQVMmJpsG94ulmmMyvjKm3T3TPWeXtuwNS7AT5qW+MpP1TgPfIw3jrJaot9MMZr+n/2bQCPG5ltJc0p4eddA7uM5k1WZ83OZLIQKPOz9yB/N0TDKIjhm1AoRulTmNkVTeoAbWNvnbYIiYxeN6K8K0yWj6fvoiuV0zay/umpcN0obVa4bBwyjgPWbAz5BCq11bCXg8Sqfznra2WH7KRTe9pNhLf+dbX07Pt23jDrw0wTNQVvlyVDvu8BAjKwRWma/Bpc1wFaE1kTySWm8Xt7rduBM26kYPvyXO2LUCmSOWXyAQJfKK0Zru5yEnGJIzTGN5k35KWtUwmyoByqmzxZsQr/djbOyGkBT0RhgJ7ldncJSwe0atvEmjzQhyyGlpvl0qYable8tnp+b++8l0VYowbvafL+JrycWV0m/JcGkKFskaB4+dZVLtgzx4GaUaxu4yWA+fMYjIXPoB2v8x8Ti81BL5xjk4zi/e831OvKkLS2/f/bzh/q4VUi6mliUE9Dl21/hAM9/MCjWFI53LAiJvBluAtJB9Hk8fo6+UpJ23olxQ6xjT8tYWTyzsU8ruQWwVX6xB/UrR9qwWHVu5DDAQYXuEGy9HEg+aYOB67FO2tbmcMoXUIwY0L2LEF2igjDwFcBF7X+UAFyS68OfFgKYiBUl7EQQreDSd/IuodYBwJoWRa3tmpEN3UYD3PGDp5UJACWiwaPWieiht5/9Ug1nJRaqd3apKBBcMs/U6ZW8njZ4SV5Tu+FAFhATD734bP/a73RIZ40norYvVjFm0usIRQttCxM8dr6diOoMRmVWOyZpDmnYzUMIbuu8IJLY7WMggYUCjeO4UOjRQVhbNeBVyQeuGjBvmdw2PMndEiQJ7qME04Bv/0D1sRqdUY+3Bj5lPBadQG/p0H4wNoLpwixt2jaJdukFk1fvFRdZlMDqQ+d6q4VP/5gHa1AyJRGCWpLzug3z8HCFtWsn42MFwFArMgfCNFQISDxSS6OaWC0heyY0JlpA3NCHaAuws9/amSu93KxlpWThzIibCXE9RGPyJeme3xZCiir/3vTKr6mt7ycC4Bpf2GHKlnbCGUuf6fZbHU3L93ryARV/JL62LFAkzeVbuf/4TQ7c9RrEK2QKKREnpcPT3m8q2Oi0rndSpQ2U24lARRi8SmceNw+Avhts2TnWFgOqHLvMtYlKpQ7rI0XklDD4bhiYo+mA6qTun0Qzun3U7BUWuTLrYdqjknJbnSQXQplrENqUsZtihcXy3ZCx+dvaZTKOqaX3hHpXGIRslyuvJQK3PRFBoMQRoC0ROuhZkHskEsliVvWpnUHoqnPudPb72iYShdSKzrQszOpwj4alJhY0dDzAu3PDGsoI0ypZ6VVg0XD82IB9IyqoLT5oOLyHgp7Lo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 696f2c1b-8692-4dc6-8a1a-08db33cdf417 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:59:46.0349 (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: 5bbjaTBEiNIvKgjBCGodneCArj0DoJqTgN6PHddDoUVqE2BoiPP/QizXHNAncNQSGrN4r2UHbZj+XCafjeQwWgf2l3OxG63NTlF74/YE3wL+JRhIMYq19DBf/teebiQS X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB9395 Message-ID-Hash: GRIUJTJKFIQKPVGEZNEUOJ6ZO255VPDB X-Message-ID-Hash: GRIUJTJKFIQKPVGEZNEUOJ6ZO255VPDB 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. 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:59:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13197575 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 3F200C76196 for ; Sun, 2 Apr 2023 23:02: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 26F0A20B; Mon, 3 Apr 2023 01:01:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 26F0A20B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476545; bh=Euj1QmiQnQ4T5l126Bv/mJffcH0+zjpfik5kYxlHq6k=; 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=cOjguE41HLjPZew+UjhmVObvfAcZTDqrJv/Qo9RnSL7AsWKmQXugVHfxYZ6lZvdHp r2rcE+EWKaU4uAvYDr4zZGx9LStU5jjyrCUnROpNN2MQH2WjsZ0+zyB5ZhcDPZQxr1 X02Ocmg7b3ToKw/KPVBTELSM3mrCeg0g1qqbMKK8= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 64577F8053B; Mon, 3 Apr 2023 01:00:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 839BDF8052D; Mon, 3 Apr 2023 01:00:42 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71d]) (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 5A00CF80529 for ; Mon, 3 Apr 2023 01:00:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5A00CF80529 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=WWbAns8C ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEQDtUaOP71/CDqQzKt6Iqb0AwYNGoxpDEqXE5KtYNtDeCkdXDZyLHENNIN2Kc1ooV1CdCkkoG5pMdObDTWh20jEerbAMdmeSE+Syi8+jrKDXt1Nvu4F1Z+MMw+YVI4eS2GO5s41mrBYSiccM3WsXPhOYF4rqxPMQI/gwSaW1COqVU8M1BQibv6f650nFSlKly2DeouuMqf/QL3ooonXoZ5U9TVY4ifaLz3S3/ym1rLtqxJMVUC/MNEyBTEFe+3kQBahgSK7QC+j+oDHj5HsDoI6SkXnBeDRL6+1I++W71vwNMMiDvxQTD9A5FUsaBfCLTE2u19/i0LGZnQh1yap8A== 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=OehcGt0dzYxTBr+Zq8wbjNtjWSmtDW5Th4H3k62UeK0=; b=KIKvwSrqiMHJD2RayCLJSKOlyyOWf6PU6LGy3bEdvhE60blM+Su8rJ0tFZAH8jV4cjtCAhAMW00v6XESmCinl105ljdoSSi4pSM4usKMBRRiJESxFT8NhwD8mOTbzOzaIM/5yQtf+7UuDg0y3IQxy+4iBjsAo79bH1EWHDlvktOnb1Pvz/1YSKM6y+9GhokODbVrffUyXxfv/hiXin2EgNA/m9lGlsOYM38bJVQHVh7JmNoDxVbtxil/wt2P1heD8WM5Lo7QcQ8Qb6l7ZLBhKIL7GNsmttRKYPjc1HijFoY15WN8/OI0ZDWjWMX4FHVabpitzLchIw0Ips4/kjDJZQ== 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=OehcGt0dzYxTBr+Zq8wbjNtjWSmtDW5Th4H3k62UeK0=; b=WWbAns8C0KDRreNkKakCsvgD1bDGZRWx/jwIrD7LLZuzfUMrCZ0P3llbXZp0yw8zbmIJ8ewi1zKCgl05nRuqWWdMVopEM6BBxUZ17CKDdvvLBlIQarhVMeV0YySgLP+1i/4Uw2oajH7WKEIOM7mhgdo+Z3WDYnJthHjQMOJSqUg= 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 OSZPR01MB9395.jpnprd01.prod.outlook.com (2603:1096:604:1d7::6) 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:59:57 +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:59:57 +0000 Message-ID: <87lej9c2ky.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend 3/5] ASoC: meson: 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: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> References: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 22:59:57 +0000 X-ClientProxiedBy: TY2PR02CA0048.apcprd02.prod.outlook.com (2603:1096:404:a6::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB9395:EE_ X-MS-Office365-Filtering-Correlation-Id: 610e1ced-2a96-48fe-834a-08db33cdfb11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VBDR9Sw9Dt52c9nX/Rn1JwGPV7EGfDz16KBBw4cufS+zlgfHyrEcxAxq2wf/Eonjpl9gR5WKEjLjhdOIsURQ+5SHwaqMloVXuat5rKYHt0ZhoQvHSLWgCrnFbQLoKOEYhF2LIY2HlMNff9huAFyGKbD0Fa08hmFmMt/nTEZIU+NrdoXeRfAQCJgcewckpLBySsrYPsxDCYjwBnbD/KNibUfp5lrXtleVQvslIWuMt6VZplvRHmdcxVOb47j0wW53YBov8/3IY4FgbM8TFphoIX+u1tJ/V7RhIycNjU491ddS487N2SXyaphS84XNV8gw/Myrg0MjszwZ4cLO99hXoh3I/8LtRLEgCw2DGBBEOOHODFbg973joBHnTPA+HfTRKgiLxFFFIHa5xpnb0+nxNwy9U4N/5QEiblYViHU9o8LYOPNy26PmgiFSaHhTjXSRSg+PG5Lhlvl5BV/WxIh4PNzQgfFxjBdBlt8imZjMVIy0l0ngFa4Objb4i0U1kt5Wg/jy6CP3WkKNgBeJpODUURumGX7nZk5jeEOmRjSeO35Bpq6PFJ7e4alqHT9hEmZFOtL7MdGQHImMFyi/1CGT4EpvuRb/VKX/37l73SQ8sG+Wgm9LcubjV7NaHqfwzmUi 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)(39860400002)(136003)(396003)(376002)(346002)(366004)(451199021)(478600001)(186003)(6512007)(6506007)(26005)(2616005)(52116002)(6486002)(36756003)(2906002)(83380400001)(86362001)(66556008)(66946007)(66476007)(5660300002)(8936002)(8676002)(38350700002)(41300700001)(38100700002)(4326008)(6916009)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 58hjSiJwYOaOfxVyHrbz9IJqRwQl5pr4Y2l8oOBz0scafJJyZmM44BNvcx1FUkMBa687lyMqU2JHgz14tXb/kQh9nNTmek6SoXLk9sG98fzARmAkoEUzEaAXjYKKDOE8KWR1C1SA70cAgwYSnzoUp8nUMLdzXOfSDSeCz8hx9zD+YfpBWHnUoypgEdnbH/AsAWffGic/6zUFvavqAA6Lj3iAAZiKo52CVFIg9Ona+UANMfTLGS63HAAXonfVTJvxXBSE4nEHLW/JYrzVjAjtxsRkdjSYPetKfRs2hQhWDdaGtHHSp64y55f+vt6tL7GO4iTnnR/DbHNlbhekGYqeo65eN4vzBhPGyVtfZ7RH2opSfshR/n2TcF6atAJbZw1XEM5HBPdfR8Zd0hg7eDYKUSwRE5NM3W8XbZ+/JWSnEEUdDBM54CLjOi/asoo3WYelqYifY/ME0CSlDfPQxAiKQkRtZ7W0LKNquFwY2hXxt/ckDi7oUWei/TpVMloSvhAxib8IX2zF29X5WA8lU4t96OhCzeWFACwu119/EE0dP1HAVLXAu+BTGvCIXKcTbKrUWykku4ssu9wfstINvYVOHmVEcpALvx7poX5xFu4zLkpMJsEUNlkh7irgCNCM6DfrpkXTqIE56KIQ7dnAlt+L0qWQG02Di0mijU0I3FbiRK7xszD2qcHGK0B59WEJeCX/ytQzFur76P4UluV9yAk1JN+quSWe7OcN1KLV/NEjXiVxrtCUEr8auyoKCQ/oVzPsuo4hegBg5FUPA4KzU+OvDOUx/+jJLzHS4WzZvAVUa/7dXYOmklmGZd3dWfiSxDNl/vJDOjYNGgM8lO/shjCUI02Hsj1pMNFNwm+ln3aTe90VOCMW8Df4CqLTl28kcFnBCF9o0paAEsw2NEP+cO8C5bWwCcF+z71igIcG4IrQLQqwEZ09hwv6laWbcXKoC9UCaMWoVqB1dSmo2uVbCy+hCNbOWNbhNHEYGUJ7PmtWHjqGfnstQ9ppsZ7T1G+naxBnspKgHpoXZhlSYBpgmVxTvPwtzqo//z3AmHbDLQwGVr3ROH/e5dbfFDWlcC4oqXqeOD+QLcTel+FnUZOqHuzdykDcohMdWakOl+ttB5DAPc0E4kH41tN/m2mQ6yQgLLNp4rLbAZjpwxS6RXVP/qlUVfzZsaRdZqA+eIPDe69q1cQZqbY3YcxEeUBPKYzPSOAFSQbcj0wh5m7b75ISjgppEK7lRzGKrPjfPxw/Mp2PGzf3bzA2v+DHEHY25M2OjiQYokuyyFsatxdKFk++Dwt/+O+iQaBKbt/E2Qpiy/AfmzZmiBkzpLltGVuG4a4qWSgFyOoon4zht9m/FP7Jad4azvOmsBql2VHTxYsA9KX95yQxZ5Kg0CiwrdKItSI5U957YLlzPxu4+w8aMiXpiFRXTcTwS7+tucvFWSCaKZqdNszEEH38nc6K7UP+sSiN1W0Kgt4wNO9Zip2nAtdBZmLYMj4urETDKShnV3jKeqipuw81ZS0rpb600wOETvu9xmmBx+F0RlQxVrm2CouPIEaqQ+UqRfR2QinrR4FFyyDUaOgbuBWRqJa8uxTPgHGvQlP5y5nmHaFHWPyGizdbnknya+mh3T/N4eSLO18KJR973rQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 610e1ced-2a96-48fe-834a-08db33cdfb11 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:59:57.7481 (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: S22dIliQgdqaxV28it2mh3q2u5Q4zJ581LdU98yHk/2cUCwXnSAWiVW4ElaePQZrjbCw9qnndMmi6fNumzWGMufL4BThyT84+yvMnyeo1DXJEsyb+MLdxkpowYcJnAL8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB9395 Message-ID-Hash: 4N2EAWVVSSYEQLAUHWQDW3N3LJUGGDZS X-Message-ID-Hash: 4N2EAWVVSSYEQLAUHWQDW3N3LJUGGDZS 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/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 23:00:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13197577 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 74E0EC7619A for ; Sun, 2 Apr 2023 23:02:51 +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 0C1F37F4; Mon, 3 Apr 2023 01:01:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0C1F37F4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476569; bh=Lmxf+qN+Gg6qOFp1aB2OmVDEjdPLu79WnWDL+HILz6s=; 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=kG4HZO4ooPBj+/0BDogGbk3etAZK9tTN1cqqudur7019X04IgSd8Mz4t9WRjIQm2p KjImmn7XM8j8eb3dUelurBmlQNAfHqxyraTVioDnV4UcA8Ha3zYCzr0Fs/CLo7Keb7 PXi3dUSGF+M76+0MJmcF5BBlDTylT56YaA7M4BLo= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8E8C3F80551; Mon, 3 Apr 2023 01:01:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 31DA7F80549; Mon, 3 Apr 2023 01:01:07 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20705.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::705]) (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 0ECBFF80482 for ; Mon, 3 Apr 2023 01:00:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0ECBFF80482 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=CRdQtigL ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hcRyu/EBWiy97leYUkjUuX3sy3uCqPKk9LS7FElurKb2xpk7SBhErXaOJZGUTcbW4o7PsitAnazoDCHAwORH+OqTlJrMEmBhMaFYDfiHnSLh2WIe1RV1kdZGp+tTRSyXRNdFkX/TSMqhiAy8oaY6VI3cp8Y6zT7E+OmYCIcHTC+tgJhGa8GBB3DbVsk6QAx8efmTVnTJJfC13gZPVkbKtzWdLMuzdwsmf0yG8Kr2k/280YbX0sIeRkZaccmKchBPkOP/2uFqCYpQIjxeCn3dnCxAbS+upVrD+aRoYDZMmdwoj1z/nvCCVUUJOxwbHsTLu+S77b4itLSWlOYBV2oq1A== 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=BdE9ZdfsMIcwIYBk522MPRz6/dpjRrySSqhHeB6SV6Q=; b=OWX4DfI1ikd9tZIOvireDdTJuWmOFfbXWwTaLWusO+kEURYHCuZi6kDhcf6Lv55D87zV9NzzxdAGCqpnuF5f95P3LtcW65e/Tb2bf5iyIRrOB/VFMyMHKpDlOHmA1ni40qaHQNU74xao8Gz9OzSi6cu2HMttyXNavQMLhG9ayfZNVmujs55AKQZSeaDBEigUSF/95XqLWjxQaOvswMyO4fwFM6opETv+U6uKVdiaOBKRmFOTxB83YnZ0/42ChzVNrxbXWlziwOEec1+xjRu173ZdqFF9TPVT5SITAotY4A+I0JdoG3V3HEdsoEKgjxY9gqprXVRpm8muYlY8wa5/Tg== 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=BdE9ZdfsMIcwIYBk522MPRz6/dpjRrySSqhHeB6SV6Q=; b=CRdQtigLcYH88HJdl8t9r/fPuqMqP29U6IxkGBZYteR0oLjUOr2KWKzk0LN0MZx18jJs6/NmOrEIjEBE1RF5klCo+D4got+beTW+5dC+M+cl7Sy2IOAIlcoZ/+miL1TMX2X3iXMQsT6KKeoC/IZO6bd/XoX098v5+8sZ7VQ5tcA= 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 OSZPR01MB9395.jpnprd01.prod.outlook.com (2603:1096:604:1d7::6) 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 23:00:07 +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 23:00:07 +0000 Message-ID: <87jzytc2kp.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: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> References: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 23:00:07 +0000 X-ClientProxiedBy: TYXPR01CA0043.jpnprd01.prod.outlook.com (2603:1096:403:a::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSZPR01MB9395:EE_ X-MS-Office365-Filtering-Correlation-Id: 01cd2a5b-1ccf-47f0-9318-08db33ce00c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wdPI3evW6hQ06fLDtvxzCoD8xE+e/70uGFaD64VdtCKDvMG0XzN9UtAmTQ0/IJQwznL7UeuvWL4r5fvbvbpEt+WdQldOUC3blKNRl44nVDf/aV2dUx8wnBdYis2gZgzAqrahQUsbNXrhhR62HqypId6JvCgValBolxPPxnTLahzuhT1rnENUfwBxFys7Kk8kWogfoGRnxUIW9i9ieX2TNaRIhuup37Qb4otpeWinswwxLeg8J8LT6u6GIrXcoGjFxPVcnfLA0U+JujKp3HWq+NEktWkbad7DcpZzwpql8lJWAu1Rc9kBsxbVNpQLZQIN8ExiwiyT9umRdouKvDxSJjbdNAtZ8/T0gsgpzm36Ldvtc1mX1kBnZ+C+1XVg1CGk0HZnAsXqqEpZLAuMF/2ZvCaqmNEAJnJWROXAf/nulhbpq7JhReqfFDlOOhAq9wqLLJRnSWHJP9+XvDcHNVxKGeN0BdPKdqRLhl2ApZdvDUk0voiRO7F6lbKEtnh6Zaz922gD3lJVdc5WAOLSMnWyNZ9TVImg12LM2LPir0BFR7Rfz4ucwMwBX5yHvcrxNcwPcPDg0tOsJCKN4ISosHLQkI3GuLqQlAS3L2lAXAky/DCgxUQZYZOeRfG/gZxcTya1 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)(39860400002)(136003)(396003)(376002)(346002)(366004)(451199021)(478600001)(186003)(6512007)(6506007)(26005)(2616005)(52116002)(6486002)(36756003)(2906002)(83380400001)(86362001)(66556008)(66946007)(66476007)(5660300002)(8936002)(8676002)(38350700002)(41300700001)(38100700002)(4326008)(6916009)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9hZ4e2B/BXim/bK/DahSU3k4va0Lz0yCWncg5qapyG4WM1mXU5or2OyCH/8zVBHxdACuA/oJywRjtIBjctN9+FjeqeSxqd05qibRh5ZsNWxMe5OcEw7V45IRzjR6tpVmK9FskXLe1iMLbsLj0dhS0yvpaYxzoP5raQBiH6ZX6/Oos7QIJDHy9VmbDuLpoOIxV4C+nqgtx+mDDnfXcAPJ5JlzA1yh0wX0gKt1Qxtl+Voaos2Q3Z3UdgJz51z8rkFx92bjHY5sgpIPLmAcg9uFyN3YAGdcDaxUczUoVJhNcfOilWYb6WyqMb3zmbo3y32QoZY0wwxvls5rBi4MAy1dXm2/UqLItcEi4VDp5J9z7rh7pxMDEAXxt+/lVH79JF5WqAztf6S6zkgoFsSnN8oBkfmPMm8kJJZtEiX+7kfIQWzMQmKcauzlMDpE2jWOc+xSQd6ELbqRwagTho6W/SCin6YyRvndo7qazcoNyv3XnUbvJRLtO93tD1os7A8hM0uSOeuJsHs2hyK9IcbryPxEd7m6XpUA3QoJObOwJhBGi/s+4iHmEdHA9Jigbh3cOrO9ARKkRaYQ4pIvjEcGTmpTINE/8m8c5F8kgV5SBTz5t07LnuXH82Q3CinWywVHutzTwQfgt9bKmiQC+pcnrWbpvBTmBcWTzeHoV4hXgTkJPswu0RndbfM6pj5qQNyiTC3fM+RZ9Y1FEuB6QadkyC3robVGKadRUFxnprPK5qkvWIaqccdgjTIcqu/WDwO+mbpBQU6NWbOAol9duHOCom4o2zwHtO5EyDR5/j+DgvHKiGLtfylxCOzFzRwUgdqgcIkj4QMOHrOqJi4gSiTgMITwUlwU27C2/gQWQBFkhTj4nGwfwWYqQi7Wnbsmo7uuD2K3r+brNnMb5WzyQlxbwFQk8elbS6Fh/vAgyEInVbSLQXAMSBHsJkG8hHq29v+2RxgeEF6njVyPPO6s7F0JlDHc/1EQ+bWYTVJUrsA4cNsoFdIPSHsJn3T0xQsB41/8dxARxQQ2DPyifigZmg3C9j7V8gLDGAlRuNTcEY0jU42xxb/osa5UZ2aU0RIbkMhxWNqVpddRcsJ1LU9ozTrV9rpyW+OqnhH1023HABEsrzNwEH30GF76bdtiNvwVp6ONioOHzoLRCLPLvoVEjXzvydxHJWYy3mEfMYEMj6WLIIeb/Vbr9Rs7ImnY8u8mRbWy1WJJTaqqeLNo3g22xYkxNc3eYGjpSrdLFuPVdy/ysI1VQQy2GbczhZh+oOZA8vRE5BNRMep6eKNfx5xbtug+Heaqdj3T1Ok6Boy5ESum3GJs15LyEJNKjfLL9Vj/V7raYMJQ9aWfAqKEFFpDprAAEXny7CiUfXlBg6wpvenwTDGPq6b3aCoBGE/Ua2ozQuCX3YcUnphGfMsfyMLOko/NuBTYIUpAeYHbip2gW8F7OLHKNpqAoFP6Y3tmwAClWQoJowptERa9QEFVacWG6vASBG6aj2eERkIyE2dKzDDih2Exfcgtlf2sonQihJwmBsmxAk6WKGC6PVzo4X+BxcyvYkb3T5+mzbYWaaT5ilL1Kohlb/K2ymbmOtkL24mIlnEwVCZMn0Aik0yYk4TCB3iZbVc810AHQADer6U8DIH5mVGVKVU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01cd2a5b-1ccf-47f0-9318-08db33ce00c2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 23:00:07.2938 (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: RpIulQ+fw+TyfKeJj9fn3MnzOwQ4ZndDXs97/i0/VT84920ipVKF+HJ1xxfhV0CrM0aYLl5yTY+BKrRXeN2a0KHWufln7qPCT9R6Flg6LS81+HW1TfxBu2C2IsITGTVe X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB9395 Message-ID-Hash: A6SRSJU3CMUAQSFAMCN5FDAI3VPFHDU5 X-Message-ID-Hash: A6SRSJU3CMUAQSFAMCN5FDAI3VPFHDU5 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 23:00:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13197578 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 03416C7619A for ; Sun, 2 Apr 2023 23:03: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 DB5D2207; Mon, 3 Apr 2023 01:02:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DB5D2207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1680476594; bh=tBVMTydThlMekkaq2ZbX0dK4/J3LPUAy5MNVJDseJiU=; 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=tyedR3GVr2+19Xq8reFR5POm9NW8wX5Ls27cIoyxs14Q9kp43WNq8demk9sM/kSR9 vbXLQX+vXF5hmSUPAPg6Bzix9UoYSn+LOTL9DRvabi1KRY+leqMnNfqWkAU8WMYqIO V7/R+mtWqMtzdK9Xwo/bm+eY3436VKljS3mAQoiY= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id EA5BEF80171; Mon, 3 Apr 2023 01:01:22 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 019B2F80557; Mon, 3 Apr 2023 01:01:17 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70b]) (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 4DF57F80171 for ; Mon, 3 Apr 2023 01:00:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4DF57F80171 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=mg8fR4eW ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HL4/I3xcRcoUOFIjMiZQEJncexr8zUnD4LL9ZMtt4cfjftfUOggJ2QtW7pZoNSfZBOd2lKU6kC/jxPMU/WRYW65UBgQOtV2kiBmnSPlEcmDS4OMVCYKflxHiGO0/ioNMlVipNKK6IxKqRb7InaQju+Ww8li2H2M8Z61oWp+FCYlowUDjN797vzsPCUo6y4LbZNdD8YsHLJL3A/nfbnQgTjB3cTCD0A9kDhfMfLPn48k8HS+Nz7+85kRs1b/6dKAmaVqs570d33imog99/DPd0aXBVHn+zX9TxpSMFZQH0ZlMWEvMdHppz7xVHt/11s2x09B3hbFZACYmznjwgLIioQ== 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=WvaJhfx7UAKU271Q1ysdMZJOtZi/ZsIuAS30LdB9f/0=; b=TnQADbdP+8ko3EzR48c8WIWKZ7NwQhGXpG2bL02FsApg0+PKcjlApgySZyzLih5tnTpRemf6dl991xUeR4urZTkbXsLmQIn5KcA4ykj36D6k3dI9l7jFJ+YQ0HlermSpUvOWEbA+ggomZNKl+pgGXeqsOW/5wT0G/RXsWPiOY+gqVYxHb8mjLEIyV5+Ply3ohKr5BqAhtNjCB8ysIMBwx+tzKfIoPi1ImY/0TxyilCErJ7Ag16db7D9zpK2nsoAuYGmBrkqAwJMXbfiINF5n+U8/18he4H/rBD5zE8n+dsGV0T4hbnP4bdX9tBOKTqiwqWijJ2/8/RQxzghSy3Ct5Q== 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=WvaJhfx7UAKU271Q1ysdMZJOtZi/ZsIuAS30LdB9f/0=; b=mg8fR4eWAefog9S8+gVzYYtNr047fT0E8aFql7eaHXK1/+QFpkRLYl+3Rw0l1GYDt5+/CUBOjg/PJwZyxUEwdBzRVFTJxQcBJJu2GTO0TJ6WPz8eKMq+bMP3fdNG2AhVJHAPSWyluWW463Sb/p7ujdvUTTeoxAvNjlU8XAN4pzw= 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 OS3PR01MB10184.jpnprd01.prod.outlook.com (2603:1096:604:1e5::14) 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 23:00:17 +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 23:00:17 +0000 Message-ID: <87iledc2ke.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: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> References: <87pm8lc2m7.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 2 Apr 2023 23:00:17 +0000 X-ClientProxiedBy: TYWP286CA0016.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::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_|OS3PR01MB10184:EE_ X-MS-Office365-Filtering-Correlation-Id: 792e7424-0d1b-4b94-28d4-08db33ce06ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SKCygCmLNZp4O6/V8YHs0KkUjisyZ/ZPXttZdlHb7ZBGuDMIc8yPkECo/onVa6vMhdILEZguZBuMrb+h+4Al0WGf/y5Ed54Q4opNfDoELZ627p0OqTHB+NMN5rv418eUiBgBCzw55o2cZi1DzLebE0nO4iO4x5HF5VRF60ZsWNf+g7H/73XRyS/2d9qHWMq8Mw1bfNOPrs/JUJ7VT+8bgLlsuabaIZVuMC2YcAJkdP2+a8iAPZuMlHj0Ca1h680oTO17P9U2zCgpgh16G+aGsCqQEEUdzwiNCVOLm86n5KxUzw4jsW6BblkqJd5HpDjlHHVaEB8M7IZ0OR7XFvK+ECCEsz4XVonCucOxcFxZPR5xRwpjvSBbUPsTvD1KoYt+sOo0iMZRDXLSeKV0eQ/QC2ymDfOdmFr9oxtZMWCC8p13W8O1QaZX6mg11Jo0jC8yHGnt+b3LVPFnSRSM1cQ1d17p+Bqpt2GPUrdfzWc9Y79231ubE7yZf0s7TN3zLqdNeSW7rUCTg1XBe8EwwIyddpL5ZcLp2WrfwZmzyacojUCOPgmx59kyZFItiPmssN5P3eVNhTAPFGVTuasLxQeUA2Dtk/yheRI2jUbL3sJpq5TeDJWJC3qzMSTHA65z0iP2 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)(366004)(136003)(39860400002)(346002)(396003)(376002)(451199021)(186003)(6512007)(6506007)(26005)(478600001)(36756003)(52116002)(38350700002)(38100700002)(86362001)(66556008)(66946007)(66476007)(83380400001)(4326008)(6916009)(8676002)(316002)(2906002)(41300700001)(5660300002)(2616005)(6486002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Loz0W7DLBqSrj3fXTVMX4CzZxv6i3kuoLz88wVAs5/ABNFfAghuIS1KVxueLl45SPY54K7NCY7K5AWC46lJjPCqpoYgIcui1H7OOdKe1UuV8e4SUXGWN13ZoEKNkB/k2lPScWvmx+pHIWKEQyWIOgaS97fxwZIsesFSkZsgAtJfYeQ2cZeAYMmuyVKIGdruT9jBLFUzH9IWUqcJzD8yMrY7PmppCyUwXeG/DIcVlQ3AnBgQGXwt+6jp0fdcXriJKzW9rJzS6rEVacs6xgGj5FOqq31ZZZNPwoz+Zk2/MEgDwqNLAQcVP9HxvRpA0VI4nS1v924egDkgb3sOggvo10dSHUzC/jbBQnl1R8aN47FehNmJMenrsayHly4yLiaUARL4GGzRoXbrQbY4PeYYx9b9NJSp0TTAQ+Kus8J+c0o1IshetP8JcydWdWkxmBitHdr+lB3hWTqkkU55thWTcja60C/sUYJcWHNlvhuLaW6RQ0FPKw2JshNTvAz4XTCJWah/YyDKzRNiYiVzbYoHHB705KSc4QwSFEe+RulaXEqNF5u/rJPqINSqMP80al1DnNpr2scsCHORuKE90DUABw2Uww2CLIotrh1iZ7HR/YgX9aLdoOdyMjEL5rNbYIZR6PDfKQNZbN2VelDE+LsmXumBJGd+LFo7AtPxIDRcbR2oYZ9m2xf7/H7mx7lQvMA6NqZgB5iQmWF+De25PF6T4AMl1vB6WAzH11l8zcf+ZoAmxzkD7tfTKmiq6eX9o0FbD5dAtvhE01tlbaUNrDVhnhY0zic8mM5br5BeGt+2AH/p7mOyg278u+VUxCQ3LDDbWrsIbR/7u+ig1r3QXkIHYPxeavzP6djVbe9q8TUvpZDW35PER29t+Q5700UBtJJFl8/lnRohmNvqpFHJX8D75fi77juNil1jwkoo6VPkgCLErdZ3DVFQxRt3dISXUVgJWlPeMEur6zeAZrg42PRbd33fPNDX7XWEC1g8yUMy+nNSaJk/Fw96jO9YXXy6W1XEBCQFK5u7tA8RhKMuY0fCWfo8LASuZcwOLCZ7GrEgy+HaSkVV1NWqZbxKWnoZAxQwYA2jb8lW0SjHPMBF46g4jhCGE/kQwrQVMBvTVwaNyKALXXdJJuZcpHORsu5hvEjK9OE4hblWsbLMumxzDXPy4mGc5ILlmb6iE3EU+WbxbzV6G2urEdNwBfrZAs9EDz4aXGMtgEFfzvnkzyCYB7oacfVYYMvBz0dRHIipttUm61kKHb+onkhq/0GF0dXfwqqcRMulit/+6yftEVuAbb5b5Sh0752yOsPd3TlDUyQI85RfBtdJlCnjas9kVMQ5xGflXPa9jeyXrVKkSfCOapHhndF7yB6nfNOwNDQwXvOALUSWtBEseiJS0e+dEzTn+L8lA6TPZrR0Y7jqNrCIP3YZqmUKplepE9chwJXvcREAkbNA/YXYFN4o7s4fcDRrcRPQbQabs9mmT57UUw7iI7bI6MS53QvgBAtA3t3I6qSGg4RB6sjAKyF75GLubB9qnJ5Qh5GznPDLVfKNgYgEeqWrGnVm9ThXjKBtglQ9+tZ1LCjf89q4KlAxTfzNwbyJC90Moc20BA/Hve9NTskMeZrBqwV5FlrWDkOWoty0jQM/XEIw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 792e7424-0d1b-4b94-28d4-08db33ce06ed X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2023 23:00:17.6406 (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: CPj2zFDuNNDqin9/EI+LVXlsTEiEWGNPVNhiIuRIlncsHnXAZvuuJQR7ZLLFzTbuwyUUXHqzJroGkotjHfAGVOiEZyQkT0kKcJmLYa0Snnqnxn0/LZcTNHcDVQziinAA X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10184 Message-ID-Hash: KEVEJFX4PC6AIHRIUHRELHEDU5R3DYYP X-Message-ID-Hash: KEVEJFX4PC6AIHRIUHRELHEDU5R3DYYP 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);