From patchwork Mon Mar 27 00:09: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: 667440 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 0DEE7C7619A for ; Mon, 27 Mar 2023 00:11:37 +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 BF4FADF5; Mon, 27 Mar 2023 02:10:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BF4FADF5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1679875894; bh=SWCE2Sfwq7v7IuIDSU/rczVY6xy8P/drc/OhWiDnlWc=; 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=M6tGusUZlXrlJ8lnzkx469Ll2Sn24bSmUnGEjGB/FmsSM9dYBnCb+VV0yc+hLk47v 5y8tVaGgBQ/K3ow23lV2wbMeMZNP/FfDPDHn8WNMlkdYr0GAfZaXD/O1D9gGuQaEu7 FfKOw3y1hegijvpqu7eN7VeULrWdOejCHFdzXu+Y= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id AA7AFF80482; Mon, 27 Mar 2023 02:10:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7D697F80495; Mon, 27 Mar 2023 02:10:14 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::71c]) (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 A9DE0F8032D for ; Mon, 27 Mar 2023 02:10:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A9DE0F8032D 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=A9ka1/Vf ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RksGhfajpldjzU2tnXt6RrMn//oQ8fmBX+WsWjoGoH4m8GcvfiOUcBpR5j8T6lET+oWQ2ONnUorpfoHoPIlve42v4oaORFNmQS2/GL7Glb2zJMR2ti2QW/AJqFTVl+/ATcgeT79XogEKi33SBpUyDFYEEQ11d7co+DtET6jw/84KFNRwNmOa0u0j7s5Uo5iS2S1tp80TTC/bj2a76cBZ2jHw00sD0QTbL6Gnu+7h+xcak2fMRT9iB7ZsyA6gmrWfAObfglNtjg0kLVPIwHy3gJYOt6r75TINLEu/eMRSMDxYY3/pjGWSrKt8yuLpBjiepuIOpBoXWhptje74IFTzFg== 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=FnSWMygukqN/0VtQuVH+7UQ4L4gQr8mNjj+iKCnpYvA=; b=mpnzf/kr06JPgmalsSmD57ialRp/DdVoKIdzkjRUep1cCpCexgh+h/QU8Qz7BqRAf/I3PIZ5xCnj/C/Ct6z3c48Fd8CZwQ+71+zPre4X07CvKfMLMIjJrc6nYnILBpUQTsh9HzusJxkGwRJxXIx+7UHEoTwSk4KyXvBXSwoC6IFlbP+pFL8StCukK5dQZRW3vc7XxXssoeSk2VOoWk7VAUBsiqi9Wbp2ktZ2DRln1F2ROC55cmPrPQ/yNOI6nzkxWDa92IdRZJFrS4Fif5qdpjdOodPBlAlv6Wx5ulTXbOFDhDNEFQHv3+o2yusAGeHPYKrh4suCVDCZyQtGzrg6Cg== 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=FnSWMygukqN/0VtQuVH+7UQ4L4gQr8mNjj+iKCnpYvA=; b=A9ka1/VfI36iZAyklYZedqo31uzXtDUZsZzMDlyBu7qd/nuvxNXKMG1Ory+VodViHOhsBJN49L978OJWrBTwXY3wjo44LUoEqkIDUt/HhwpjgHK7qSnY4DpztztzYcqT/Esry4O5YKm1uoom4hhOKX8X565jwKFj8aCtXwxQy7I= 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 TYWPR01MB11465.jpnprd01.prod.outlook.com (2603:1096:400:402::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.29; Mon, 27 Mar 2023 00:09:55 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%3]) with mapi id 15.20.6222.030; Mon, 27 Mar 2023 00:09:54 +0000 Message-ID: <87pm8v6omm.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/5] ASoC: soc.h: clarify Codec2Codec params User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> References: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 27 Mar 2023 00:09:54 +0000 X-ClientProxiedBy: TYWP286CA0021.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB11465:EE_ X-MS-Office365-Filtering-Correlation-Id: f11010fe-3fb4-402d-0554-08db2e57979c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XQVUlQF7XiJWAeMvrwHmSKN6XTplIkBWIL0wgv6/Fa62w/DXLAexPL1BMLTzsAF4xhF/hgHcbqzkgM4BhE7MqkXjPpGpE/erNkWlLSNt3VZDUmRgo6cuDhmHZV8CDy//okYfObyv26DLE/egoYtdd6YTAB2J9tBkBGoX9JoyTowk75L2LiXtphyNoFuP+EXMEMHjowlxcsL4GfATxs0yJmZcn5yii977mI7HoCXsrpIzzCtRonMyvJktwzuaMAfvWzwXgkE6MdlhySbfCpxPTUaUtcDGsdVFdBDbb6fY1PPIKD1pa/K2QA/YIKNlZvYgmCeakKMw7wWeQP08M3Ut3ujdZOPSQkaqt7hh5enULmsuXSFSHd5weBQWiRt0vSIZtRBJHQmbpVJjqqnOfZdT3LKrctjUcUyf8Y+FU24aMHoEX2XnlNH+MdxJK3+ndE1mxusOfTJmvphjzrPTVZSkNpbuekhfhbewbyWg46DHUGFWVHNWPrymgiUG1UXjSsUuPCdmeuNtPI1ntaonSdrO1GTOGKNKSc78auKB3IK/Ecd1GZsh8Q5WmBfQmAC04zSC5cH9xXa37tbMDQMlKwIRO7rXJBIYsW4okQal0aeskhtkZ6K1Rz+i7TUyuwRRJX68 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)(376002)(136003)(366004)(39860400002)(396003)(346002)(451199021)(83380400001)(2616005)(4326008)(66476007)(66946007)(66556008)(6916009)(8676002)(6486002)(478600001)(52116002)(6512007)(26005)(186003)(6506007)(316002)(2906002)(36756003)(86362001)(41300700001)(38100700002)(38350700002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VD7bb+QMQqyswMRiTpWa+qFqUW2ovG7Fy9YwCUvM3GXCm1EPlJM5cugL4vfSiGVrZpbus/7X/bKXcWClxbkRzQeWNvkp2PEnhdUTk0c+tiWEKhasYSBXMHfsGtp8ftBIW0fM37ZrIjJVZsy9+/84XGbeHpHE6G66xmhjghlCx2zFDeFeoJ8lxxms0XymHhs5u+9xzX1ahSvDkJdGj24VMhiMwmRjM9EtQgdfzIEBtl86UkoDdQ6ezwAp9I26yOdKfx8svYJNdkO+OE5cAhaQpqTJP0X/DIXtDvSRZkiCZZKz2mZ0F0xJ9zYegyI+EtrRRgfYCbo0mx6fmDrZ1mJu24YUSpV76n39WbNtovDCfASdwJWWsifmcGotZfCOuvunYk/rHw8rbX6SAkeGGsPGZL1rgoT2uH2kyURdyp8j9ZN5lBzsAEY2hak75rYcQGApQE9iPjBe2QiICXqaVsDv9y9/Rj61OYZMQiLGiFgy/wZbg+2MKbNHmggoPGee4Nd+tr0r1PibbnkN9lWX8STMgvtb4U7/q7XuFYpYsNuCNDnvImSQYBZOtv6buLqH1m0RJigA5SIqQWRu1JTZPdeAFZYECG0DyGFPg2RoUtdP2l3soT1zs/N6AJ469i920FQZCLylzI3tJa8MXLWdh7lmxQJ9kdySGJsJNs67lLOSH3okRP5oDTXP69D4MiPFDJBieyT1tb8+69Z3bOqx77787fz8N9CA/OiX/kR/tXdGx5fBrErKDbBr++o41NJmvzpft/aAhWZDrk4m5Zw8+AyhLdbSzlq6zLpVWyByePQ4O6+zXupCZ4SWS9vA9PoxA7000HwtslLYzQzS+7ccz40awqQCjrNfLlREoOwpWNYyeUJ4UQ+74y/WTyXnI4/zYJwEQD3BQob/kxILk+zYLlo3HfgaRlP2qyTREQ026UQsrPws3Sqnrw3vMIodA6wM6Ek3l676K+sNTXOKkOw3GSJDCQug6XAcf7BbrvJLmAD9ECKCpWeQxi/V/v6OYPiVAXAn3s2vTmnPcnXflHIk+SOZizMJKSVHiUkPTvG0RmqNzqGk6FbUILiSW+ZTgrvmUCx5VhRU5JiGahKDgy9R8VMltUy3dLwE+7cXRx1XPd/cR7xVFFQL6C3J6Cl9g70J/uoUAE2QFxY7NpQ/OgUIMX0lCE2+03+jsPlkEch7S8hIJa3UMtmwPk1stwmCHc2v5BswmGIaQlJMayPUxOzdffm94+dJ4whRL7x5CWpSUJOxI3fdF7oMzGsHPpuDjytvihkcU3R1GenljD8ECEjNfwc38nTfVmQhUejVNd4yKaRgB6XNhHNggSmAerzAIvk35RGfROm3xAGP8hG7LQrpOnuZshMh+z39ue6nONTVrtRqO4xFxVoe8ljuoLBfmwE9rrTcpNb/acPLhTGO+MdlPL7RvSIp2651UcxjESIheNpKSzTryKu7s8DwRlU8c3ok4XOzK6HZ5zjZ6ziG+WYcqUwEzGtuXMlDABVQsm3PKZSC2d1lHo36ozhf7K1E52ACdsqWg6I6IpqR3jrl1g85dD46I5S2vYTOWM7vJBEzm5ys6YDapO/iQpSqWTMlGYL+guoefeonbcIgMVu46hpt4jW9P69N/MEtsnLvszASUUDkevw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f11010fe-3fb4-402d-0554-08db2e57979c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 00:09:54.5545 (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: S/IkFsaXlY5ObGiRqmr5VbU0508m8g3kKpEiFMF5cbAzTGprIGtIwBeawMUgRLzAsC/nDcFZ8EGe07O/HosdKhSwQjfsFBBLftHpBDb+55XhM4fkq/azEvbX+Mf/gpor X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11465 Message-ID-Hash: WG6Y5BR6UXNSNK4WX6D55EI2PEFCKKE6 X-Message-ID-Hash: WG6Y5BR6UXNSNK4WX6D55EI2PEFCKKE6 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: 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 e58b43b5da7c..08fc69cf6b74 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 2faa0d8d0d8e..f3450478e20c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2283,6 +2283,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; @@ -2303,6 +2306,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 5d9a671e50f1..3fa30a3afec2 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 f6b5f72df65e..d88b94b5a0e3 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2789,9 +2789,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) { @@ -2835,7 +2835,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); @@ -2892,7 +2892,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; @@ -2900,7 +2900,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 Mon Mar 27 00:10:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 667918 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 B376BC74A5B for ; Mon, 27 Mar 2023 00:11:40 +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 39EAFDF7; Mon, 27 Mar 2023 02:10:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 39EAFDF7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1679875898; bh=uZOiz0EvDzOGXbOG302o/6FMFBpooFFKvDCAzLi+u2g=; 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=Wfdbg7yHyzPp2EdnjiJTuDhdgFVXuZyAwyJnfYQXQkdUXXtB2xjqw+iywHdsovhWg EPhxMCkNxWYoe6tvpZpqvRIq3xxSqqLB4gvWoMtxUp9zj8+xbKXvXDNXak9S/Y0bs7 Bk9Zs7ZRLlVFiyC69OLX+jFAL+ZhdAZliW0SCQoA= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 6BDCFF8052E; Mon, 27 Mar 2023 02:10:21 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7E098F80482; Mon, 27 Mar 2023 02:10:16 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::71c]) (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 060D5F8024E for ; Mon, 27 Mar 2023 02:10:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 060D5F8024E 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=WZ/DXm66 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BFUYTxc6uvTLJpAWFbKKHGNabbDOjj2u6Br/g/GmlkifJLh+R3kfOS/iP8/p1HVz/H+3w2uOkv7gRwOcSkcdAVskwkqQ0l2/7hdEK2g3mPdAprmAvbBBPmAB2ZgBstSvIuk6PRzGz3Si/4HfmSBbHmTUya+SfPicVrXbCj6VlHBDhsfoEdCw6pUn6WJiacyRpJH2WQTC+0YHKvOlJ/h+4rkOhHKsi1ksmNuvm33Eu1+w1aT09G7cxfgtp3zTnUa9zeqRLiXVYJkBG8FEhCoqMMM45PkbH69lqrI65XbYa7Q+2XIsyH1NUKwgnScYbRKC0WKLRuGouTQydEUEFmpz1Q== 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=uTafix4X+1IgMA9p/NXnzXVqzP3/3rq4CxkBvcmszVw=; b=AuJ4BvfKhplhyl4Y/bUV/dl30sgIAPxVTVeQaglh2OvL1I0+4K2WAg4vp7es/MDFQnw1KAjtX2TwTk6ZDhYlzPdrzIlEApiVhM5vVZuLjtTqvupfIJ9MituROEA4sFu1h+WPHLndxiTeyOgdwcAux7OBFFes5ppXesR7Ollc5AHEWNrxaScJ71a6Q7Takhgq0hhnu1UNcMmvNEjCXkGB3HYbLFqTK2guo+0jg4IDMtbWYiFXHZmr4Z4DWFDWWt1/9buqLu9ksi1jO6do+nl3ljL+LVy7JkUkoubJIb2dSI33sjf/kLWESPNMj64mNH/4f6h8M5+FwHGBR8Rgcjnv0A== 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=uTafix4X+1IgMA9p/NXnzXVqzP3/3rq4CxkBvcmszVw=; b=WZ/DXm66aUQqFQIOi1szUB8W0EdlBWvQV6VHlVF8juobvqD0SbI0j1TPMhYRvlVTcBRiC0jT7D3JLi89OXaZsg68pI5cNFAfWjFLD1Yvrvyhr8DtcnUEPVpRrnnTgoKUZY4rmE8+rNTwKdLz4/C5h9ThxfCBzvJixmJaYppJnIY= 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 TYWPR01MB11465.jpnprd01.prod.outlook.com (2603:1096:400:402::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.29; Mon, 27 Mar 2023 00:10:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%3]) with mapi id 15.20.6222.030; Mon, 27 Mar 2023 00:10:03 +0000 Message-ID: <87o7of6omd.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 2/5] ASoC: audio-graph-card2: switch to use c2c_params instead of params User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> References: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 27 Mar 2023 00:10:02 +0000 X-ClientProxiedBy: TY2PR02CA0041.apcprd02.prod.outlook.com (2603:1096:404:a6::29) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB11465:EE_ X-MS-Office365-Filtering-Correlation-Id: 951f7f03-25ec-4220-f4c3-08db2e579cb6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rKzWjTAj5TlMK2jbTlblGuLnyM87B6adR/MPuCbs7ZCAjaMPIP1AUOCkfEcxnKuSzQljg+TT4jV2CP5BupXg3YwS4Pziw0eR4TPKi8MiCAGsBJc/G31xH+aUhuuvCsHf5odi3Q1ScGhEN4q3RN1/Y1VwKcvbqGTA/xI9Zvb57p84R+gV94rbZkkIPG0KorRiiiqolZNurKhsixOsd4iFAU5ze7INaTNhIm3J44fj0mori9fiCgyoKMB/kDoLhMr1uORT30eO4l2dr9pfxqONfThwlAScP4SSWNmZl4iZgBC0ooFw0RsZLm7M1U29BNGjalAdANte3cL+BVL4hlS0DlmAzV/Jz5L5lHven1+lGaE7Pz87/SjvZPkjO4s0rhmGutGTSKgp+ICIKx2hP2jVT/2sVVdaNEhnPcE3DBwR+oYwJRU/JGb7Lju4luWAuEOANzkxiikvs3ZI0pxChauf73a4lcrSFaNj6jsFU5+RgytVdr1qNrSajT/z7xD9CB0+ihLult0oVugJHCeVX5GaOz2V4e/mhpxvX7LcYyLjjU5vU4chulnz/9HcNw3vJS97iWgUNI3KkoXLXuaWsBoHBIp8YnH4swIwu60lfwilP0I+RZ0Z+OnDIKpuMQg5YiHz 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)(376002)(136003)(366004)(39860400002)(396003)(346002)(451199021)(83380400001)(2616005)(4326008)(66476007)(66946007)(66556008)(6916009)(8676002)(6486002)(478600001)(52116002)(6512007)(26005)(186003)(6506007)(316002)(2906002)(36756003)(86362001)(41300700001)(38100700002)(38350700002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BctzYhxdwJqNVYHG8KNGCltaNCQb6Or4t+O21J4eXUiclDeKuhuwYnjQpxWse8JkQK8VBSLc/mij3T4jP6sJ9N+Um86XXZemQI9T6XJtBKWNkUAjr5zxehOyC5taxE6BfETP2U2oAu4DPiI1Wssr2yB7zEIaHfIfkz6VvWQwigqN4zPOpl+nUGzeG9/jPaZ6X0UIjYMLt66ltb4w7Gj05q48GpnTNEtlq8nEQQTlxiUjs9swBuZczKeqmsZhsC+XMX5t6A1Gu9Bk1vNNO/tuvvRgKfLgnYOJoWjNHQkrP4vz9qMTU1lEmudjldRsl/vbQMqo5EGpuTVM77/dloDLhEOzFEE9R0UV195BeDu91BSAncvWxq1fP1zxVfeD7I9RrYw7d0yo9VnXfLf/tHzOXUTvTJWhXbsynWalOmoixBYkiDg14V8fU1w3XQkdNdnYCFHfPcgxA90hXGRCCVgUZCU43NszT14X+Dyf54kxH7O/rqHRTKmX1Bcs7XDFNU+oxZeYPNT1CBLpydgBQW/ZvPP9X2TkvLfY3AqtYROvnsGJmftWwLXiOOkZcwoExfrJi4YfpX8FpJs6XzA1UncMb8TCL75Ziucrzc6SMgdK5aLpA7ZAfa9C1ZhWlwsik3z8V7h+dUfCEvdXSsrA9+dbjqkIsfDM4AP5RcUfBhpWUx2vwSRU7vTWkvQ2Llvi6/SUHhRh4FQvWnv5UWsFRcxZziC52ulOXAM1oDvcW/MK+Z3oWjHGWED4sT9pTPgiXnOfKh0zqQZw173NnysCvChQbLIdIrdUe0JdUZR48dIrmXi27QwJnabUS9L6KDdhOzWImP0T0WOcaGZ7wDME7AXBQ9rSnSdjyVLOftVbFRTwRrZOE0qJcEV2mSqudvy0+yhvAw4pO9O1LX1MqkqKf4YFp/MWSGAnpPbXTjsdkPiZ6s9KRgUAZCMNOL4oKhwpwZ5DWS2yxNsDBxx3R2MTz61clhj/MQpMOvzl2YpryUNmZ0OxtoyGJ4XFbQRtpJ1/CWuaR9z4DL7ULyQNCrcdhdd4QhCMqssGhxrBaJrbrp++tRmltrwRxwEgOIazu0Z65B2K6rfOSGtNBpU4PoDa7fteSOZL+4ZIYwtpubS6tw4f4FPY/CDY4ChcWaxBLyA0d/tw7/x+QbMQEm8g0dSFHg4il6rXQGXO0qU4bT7BJ+g/DJIBm70Yvm78cphztIKIH6AKEHOZvHuBdlJyyN9nZZ1aOpo4mtDZHMdNnYL7i+a/6OH3MWf+kvM+qXNtWhGB3cyTEGzJ8AtrAA/VmlwqAAPWqUWGuSiQRX8VLEhPABOcmGVpmQV2siNoupNxGKCEtu+raa4T8J3QX/oJt5B12xN/7pfVkNo13xCRGZIkZ/NIGg0C8cIs4YankyofGmO5aHaXWyH5e3fzGDUyQXvBc+w5BJa3Df7a7r/o+GDyNIR0YwLWIZczxktFLZbmHlzI3DzTSLHbwJ7cTtPq4rnDV1bJdBuCQP9S9HO8FwmExdA7ROoYGkWoMnVyQXHlkzH/2g2mT2TDdNTFOXbEr6UAzzEBrqaIw+ViqiTSA5poIyIQNLWGRiNWIxA2dKY3Kzvo9NpoNX/O0WYHzdnU0jTNJHeEcE+aqFe95N2XRO9+LVzbcdk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 951f7f03-25ec-4220-f4c3-08db2e579cb6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 00:10:03.1266 (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: FK9oG7LIKXxD3QY/7PNcfypxDPyPrsp7MpdIq6jmt4kVWsJ5Uq8iJ3d2p+MiXECrwr8a6n4ywoCRGWKS2M+V7hVOO13WnIBz47s1psMyGEG7I+w4mqxKeyLpWqXy8ukc X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11465 Message-ID-Hash: GU5R4RH7FVCGOIX33QD5WFSBHSD7WFA7 X-Message-ID-Hash: GU5R4RH7FVCGOIX33QD5WFSBHSD7WFA7 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: 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 Mon Mar 27 00:10:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 667439 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 382CFC74A5B for ; Mon, 27 Mar 2023 00:12:00 +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 8E02AE73; Mon, 27 Mar 2023 02:11:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8E02AE73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1679875917; bh=EX6JdDVAFcvDm+hApKAYAafoynFntiKdzTGEiqNXisY=; 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=igCEVdOfSDEQM96fFtAfLxABPwh0SLts7xxcfKCCL67LSnqJzNIcTv63SWj61ZrLo l6987sUTu7HEiXj0/x3BTY0MF/Zko0hdM1nwz9VBr+rUXM/Q2oRu1u1fBSbiCZcazc 4dIEd3qlBjeRJz8YwXsBw/TBs27cR0kOCuy2N53Y= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 76DD2F80549; Mon, 27 Mar 2023 02:10:24 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 07EFAF8052E; Mon, 27 Mar 2023 02:10:20 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20700.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::700]) (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 CDDCEF8032D for ; Mon, 27 Mar 2023 02:10:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CDDCEF8032D 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=DvF4wy08 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hyz72RE5XFHySOnmUgcyuBmypn4yhGh8a1CFJ8paXcMa+67CSduTOC5PfCnwZhGlqsINMWz1TU5hd8VpkEZq8C+WITqY4f2jWddtj1/n9JJNWW2r+sKD5pFWm6lO8Wu6dyWjkj80Ap5j+nl5jIviSBYuqK6o/Qy/UXUNqHA4EIcgLlI5ArSUEmiI2ogdIw148YskLtacrPTler3hQnjbfK8I7Ibmftya8osiYaWe9rMYF53l+snFVMIwVOLXgO9zGW+62j4uK7z4xpx+e5HFczRAjGCbf1jwGDoAOJyBUZ/VI/Zym2KJ0ulPUFyuTkrGvatBlGfT7UMz0qcjxq86IA== 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=K/sZ1aSJboDjo3tjQG8+qjHYxNuAdIvV1BceQpoDqm8=; b=ONyAD4Ap2tBh+XuZwRqRf8zLqUY6hIfUAAaDY3T+Gx5CEFHD1fXQgbnoU852stkKRnrQzKdiVwP6dtj7id8Ul8GGk8zkxc+uk41Fg3g1I9BTpKBaxIvJeSFmDLCnlM/cf5vi5F8L1fK7GYz5HwDlkyw49ZtC/Rslr5E4r49ASbXYBb9xrGmJIzQzXcLn+JwvUzE1NFLSXwjP3xgMBnGnMdfb2JShoDETBqie+C/POMe9mu3uOXG1VDUpHvPJLXU2QQEWXuDFrKuX/p1q6j73neqrzIfFaq4b5ERfSRT1pqL9WiR+S9mgfjesVZxfkXHabHJJJr89zab981Yr2B40Sg== 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=K/sZ1aSJboDjo3tjQG8+qjHYxNuAdIvV1BceQpoDqm8=; b=DvF4wy08V4lrfvHlo5/mcF/UZsl9e3eVv4a6X6KeCVtXaxQRGMdgnhp9kuvy7V2b0t8hEKy5bjTzd4kYnf2B+hYj+FYY4rnrUIcYYIIODOhfemMGiEKS3spdHwiSFyy1cR2LcO+d195IQAzDX++GvVDcnyPZlvr1V3h5rmK13Bg= 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 TYWPR01MB11465.jpnprd01.prod.outlook.com (2603:1096:400:402::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.29; Mon, 27 Mar 2023 00:10:09 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%3]) with mapi id 15.20.6222.030; Mon, 27 Mar 2023 00:10:09 +0000 Message-ID: <87mt3z6om6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 3/5] ASoC: meson: switch to use c2c_params instead of params User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> References: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 27 Mar 2023 00:10:09 +0000 X-ClientProxiedBy: TY2PR06CA0034.apcprd06.prod.outlook.com (2603:1096:404:2e::22) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB11465:EE_ X-MS-Office365-Filtering-Correlation-Id: 923f7569-3905-4bc8-e177-08db2e57a0a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9zavJvfGOciEsdO9opMKC/qQITUimmLBkMplC8qb770Ns+PC4bMijvTIJ+w1/ANWank3a/2TJvMkWCjMyAl0Bpnxsr+P/M0VLmWsme51YhafM8SAFnyyJy1bV6dLYbof4Jh9IIAkNimwh947niM/EJ5yNDXyVU119qdF0NlWEaIem14dg91sJ6Dz8QPFJGjnBOmrsZjJdXEWlHoUV5zlAxlxw5i7beKw8jRHL3T0znTT2U3Nxqo5oS0DZkPd7mGP4t2kd2xjuVTxKgXk9MNzNcUl5oZCeKCIstklFYtAR9NbvY080WmX9vyUF8zf0wHb3+teUBEpSr20ZPJ3fNTBNsHUZ0cDkjjxlCfXM94dwhvivwU2/SJplQtUubrB40oit3o7KxTU3O8vrDe4P8XN1RfzpCXEezqf0WuSfD33/flqvZZ6SVf6qocBg8ZZNA7WyDgQPCftCukcg0eey/POtln0oW16WWGHxdZJ7+gtFPTAKQKCb2/s/2ewFGPxkK/vQ0G/dDS4vwSBjflGDVYdZ/Gd/WakjpzBUFp8cRGR/45CTSyGVpu+UYmF8+Ek70xynlMaBxvJ3YKrQ1JFoHL4nBuKOcFl6CSsrbH8JJOuYfLR8Lgok3XTGBNSovvQJE61 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)(376002)(136003)(366004)(39860400002)(396003)(346002)(451199021)(83380400001)(2616005)(4326008)(66476007)(66946007)(66556008)(6916009)(8676002)(6486002)(478600001)(52116002)(6512007)(26005)(186003)(6506007)(316002)(2906002)(36756003)(86362001)(41300700001)(38100700002)(38350700002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: biMMPEuHKkItszSuCEY3tAr7fYtbfqVWnrMK7wnifhjgAxQOX2Xt25REgnYlygHIMSg89YyPmrWZoEi/siMKlBW28TutBaYum1wcHe5nSRPJZ0EXICCP1T8ROc4mlO0iYqLrc8IPK+5sYOaGmLi1RHD5UYQAbcPQeZE4p2INJqtuxZgsoyhjqFhpnveZ1V9DMVj5yQA1XAY1v5X0MvydDCXyJ3PIF7kxmUZ5+jyVNIhJ1o6qIC7ONEAYhbDLvNzF9oUwIF4mLnf24fPO30zJtg23bznq67aB/omDkWknPwHAlooigU7VuHT1HlovSJBDsu+GQERsGKy11hnsILhaq3GqCvYRtreBtyHkhoB0DqfihC0OIcUETiFHkt9AiWl9vGiSxPdk5N+sn2bg7tjX1vTrRQhl9RneGe746vZiWRexzXqlAGt+j1+yqp6UNn1YHO/6szNhJH0NA6ZJw/WRcS/6e4E9JogWetRzK8d5tubGJV8NHHm/aKRHbD529l0ZoIgiKV6qrf7ENy80GdWUg6f2gU7xQK9x+9MnO/SAO3QOsjjwvRGnpMHst6+yeP1iaW7xJvWDc0Js5gH3ioCLzdOCkNkkTvpPijCmR58TazJQUMpHBsOl4bGfdXkpX/D8NZEaX7dFDiShCODXFhVuUxoGrNaG1zliWjVY9QBhd3WW2ZaG4YBQx1bpxP4OJrE5Xbybl0rFG85YtNtM+HC1RBkABdnSOwW2gJnfD9PeKn0SaBo9xARUXPUT5BJH3wp9tjwBUavY6aLXB4AqJUtODM5isKX4c+GrmEf7R6qO4r/1/RTmZcIhbWaRCDqJsLVDlhLf8lHMzByT1nn1KFWn3tK1HaV96gsgGFJnxIEvSzXns9PNV/nFsUswyH6mcOkBzWG2bQG/LENbX7ez6mIDCHzPaNsZ6yncPScPUurnhtxcyVkW4ZFqTvaSTDGNeWoEfKrexz2hoGla7ngN/9gKHo+kzUTB4ja51W1/irFwmHzlAz0ecjLeuOoTMexSppIJWp2V/dw4dpVpKBtzF522fVfzeySfME0Q4ZndurDNTthnwVG4McWE4p8wf0xaRKzDtye2nqbHOvR7POtKZBUNY5fYQXV8+iAJAnK/ZFjTtiXqPWi6bv0YLypDI8IQbcfwy7OgB3cXk10QigSXVende0QieMxYby4xxFNmG/3i3680vUTtPEqFUZ3XF0JvJFSHT8r6J+nc1u+lIIH1SXV3F3rd/qliyny2v4elPofwBnKFDXBqHVtSGRYjkUL/N7LGFfXQ3v/5KMx4n/B9RaiaNpo/QiBg6WVneG57anAGwdTsByZrsc8guF7kmUlKwc4nOki+0epflwIEoLLp5VUEazteEjC02hRX2kncZij68HdkfC5VYwZA6W6gwmvNWgyAwQgrrt2ImnYCKIJwPModHTMUb8Zh81MCh527Icq4qx1tJy0oh1sA5aOlWZcU31ZLXHRNw+VeMOXIfEqnr2Iy9T3Cu4bU8mlVab7vuuzFSjrldf0TzlfpUi6KMzuz6J3LNSGdTC2eBZ+wXqELe7Z0H+PCDSDjqIsG1Ige/PhptU1l4Om3HZ2ZI0zAyCEwH0cBsLrGNbNVKS1ijIhF2F85mZR4i6ukpHdSg/1o73WQkZ0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 923f7569-3905-4bc8-e177-08db2e57a0a0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 00:10:09.6530 (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: axRpnPaSlMPCrjoNAW0kaPEnZvWsCa9fKY6As66PyuOSYf6XYLyQpzUjkrDPE/6TfeumllG4RHdmAjOpE1uqNTXtMK8uyY2KnjdbS85wqUwj2imGnLCdbGLzxk8DGH8L X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11465 Message-ID-Hash: 5BCLZYHOVLNQA52ZA3VM7YMJJC7TCYTD X-Message-ID-Hash: 5BCLZYHOVLNQA52ZA3VM7YMJJC7TCYTD 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: 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 Mon Mar 27 00:10:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 667917 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 CFB86C7619A for ; Mon, 27 Mar 2023 00:12:19 +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 5E9BFA4A; Mon, 27 Mar 2023 02:11:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5E9BFA4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1679875937; bh=wUoAd9hEYtCCHjoXBa+rpbbaqf7zK2g622k+xlukn8I=; 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=K68+27wjFZNed4Ffn+X+SSFlNw3F/onTMusmt9NEMhg7sEMJHZU4xXWYUGUL588qq GSig5X1WQXDjBeRbfV/ZXqPNY6VBGdiRVgMQjqNRrkjSPM358cN7nGyb/GOdtvPJcT qCoeJBBF7A4ETtK4UGSnI6UNRCEztIY7G68KccRE= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 0DC68F80553; Mon, 27 Mar 2023 02:10:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E360FF80549; Mon, 27 Mar 2023 02:10:23 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20700.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::700]) (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 1C16CF80423 for ; Mon, 27 Mar 2023 02:10:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1C16CF80423 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=Au95Et7Q ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAmmaRo20d+Ndbvj57CHEkINpKmYsWQeTZXZAMTpskEe1LAImjVf+jN9UKuds97C4cVGlzo9I2a170y4U+q+a5CeUK/U0AVoMpEK+J/7AJK6pWfeGf7bYDdUeVCTFoSLK2cXK8SPFwQW0j47jTWMcqVeUoSnqP4Z0+JFkCmC+ArBbHkiT4V/QwL18LwoeIKPGpw4hF7xYgeUdN1bBqLLmYwbeGdIWu8X49zKrcDwpxfjIi8Lrbh3csWphLfDBg+0r2KgPM8pxRNImZEFmC1C9sxYBOJFyGmcGquStS0Tnv5rQSz4xm8xEzekEVllMpQSFSBF9yvU1rqPT5PGddZaPQ== 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=51JGaRFzod/4roMBI/XziUQp2Ibk5bMNSzubOQdKKwQ=; b=czNo9SsusHmitgCibLWJfwxbges/NCTm7xBhIjK801oqTdbZoz1ZpwsUFQcr8/haROsJiZhSYbMB/188olL4P87fLcABxAtXm24loostdX5C78DQuYGWo5o/dZfdhs/qsQ+trnfAFMsRlupzdwFVTazuwUsYhr7wMZHhIz70H1q6PRolzbAoCXosH2Fxixya8hn9HDnb+vOBJW9fHy58UQvWdj9PMBW1acihIxQ5NoyIM29SyiRJf1CRc0MUh5/FMOZyOFd1cx4T9ZL475hUAi+Vzmwv8ior2eFh0A6MSquO1zuBQcn4aUXODZdm5MV1SCFdKvaDH2ylF/HE4w1LWQ== 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=51JGaRFzod/4roMBI/XziUQp2Ibk5bMNSzubOQdKKwQ=; b=Au95Et7Qo+GGyjD+dxXDelEa3p60IONd/Hamamq+jzL5EtI+79J/X2nI5txi50UnSJ+M7dCtrr17vtdLJfLqJrjP0LwXTTwodEFMlOA2MgyTKoH+vnr+HXKB0mSpElXByOXn2/D6eD//bnBLN2OlbGM8yGkCzf6FdQt6fucVz1I= 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 TYWPR01MB11465.jpnprd01.prod.outlook.com (2603:1096:400:402::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.29; Mon, 27 Mar 2023 00:10:16 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%3]) with mapi id 15.20.6222.030; Mon, 27 Mar 2023 00:10:16 +0000 Message-ID: <87lejj6om1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/5] ASoC: samsung: switch to use c2c_params instead of params User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> References: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 27 Mar 2023 00:10:15 +0000 X-ClientProxiedBy: TYCP286CA0261.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB11465:EE_ X-MS-Office365-Filtering-Correlation-Id: 595261f1-190c-4eac-da4a-08db2e57a406 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: thmozFis7Qmio29pgjgHRhohJjq2Z9dI5wswu6hM90jgVIk7KLqh+wbe5eCgbTLI0fnKNpDo41k1IA1aDlqLZv7bkNLDynmmxBl0rSMWFpj6WU7ojwQQ7hQLzjM3T9+eyNY2xrotXDvdy35k61XbcCSvjVfMEaaCm+1uZpj+Gjyjj9pRF2JqAJ8EoAPO5kW8O2L4l/+PXfKgroWwshclZI/tvoGr9AB27FbW2tddtOUFwUZUzJTa3vDZD10VS6ZL5I9fryZdC97U8HzDalVY+73eaS2I8n8sR+DsgKO04oQHPH2XcRDt0u6r9NJnU7ymCGLuDur3QP0C0G/qJcZVJY5J2oYR/YhTJ28FjrclPzzmaSmfN6/otJOCA2ZOMvUMMAWsNkZ0KqKM2OyGyQOOaO0zksDZkSK0sLlIcjhQP32yiqVp42AEaXcUcg0W8Bh4e60UcDV7kXgxdRDuWkkRDIWCRDnQmPNDM32G4cuTs+8FfGjJ0YkzpzyjxTcDfzEIjdG7nnqtx+gfTRpLEhDp8U1VwRKhJyqkI7pxE+ojpTJlYSyfdXkF5n3dwjiONsAFJI5EbtpsPxxfE0+5C0AiWnRhOO9iigLdXgAi7SSbhV1yq3CWyLVgPPHt4gWk+Miv 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)(376002)(136003)(366004)(39860400002)(396003)(346002)(451199021)(83380400001)(2616005)(4326008)(66476007)(66946007)(66556008)(6916009)(8676002)(6486002)(478600001)(52116002)(6512007)(26005)(186003)(6506007)(316002)(2906002)(36756003)(86362001)(41300700001)(38100700002)(38350700002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XBP/if0rFakoFTmpREUYXb661DrTTAvfovm1rBFOUrfTGATo1UBJf13IRdr/gDOCk1NdoRtrpgRBiQ7GNfVCW24vr0qj90vdhAvQbFn2yESaHxuMlYxVqZZYME8SpDWw5YjlrgKKA/cH519cqr9Wk1atn0dUyoGK0ed2vqv8MH8y6G5yqe6nAGIKhRPKB3lAm3q/HkGr7ODGZeUUlvThSwdG023do2pFtIRmNzouGm8hYRe2OhiszSYbV0mnPveMKsPxNW3gTRcH/UxOFeMgMgfPPBGle4ip4nG2OZnaD+LiTbBAiO9Xw4i7/kpIr8E1VHp9jmrmM+68i7560CEesgdn2XK9RgIFiAT4kk7ypSVWwGpZ2RloxPN22u4+1VACh6bZW9HB8ll7I+2T0s6YbvATeDNDD/ZjhS25IJthI0qDjh1qG7DhCTRPSvohJwAqJRNdp43VdCueoMx8XgxruFoqQE0lPTXyWHdNa6E5XZzEyrGFHGn13hr24rUn3pfCG9xO+6MFbTPwY9egwJoqaozRvE7+emzs+omB9HA6OXKJfSgqA2zeGu9o2L9l3IQZ+SWjs/qRx0ZmS1kPc71jvGk0MumLRNkj7OIwQrPc/dl8budwSwnlEJXVmtPZh+hRNfREYpEHwf+JJ2tGDEiKZSth8mmMcO27IopFcnqOQ9gW/P3tmnS7azTcBYl+DdEczEr3uqKk96CAwPJ0OGZ70qG7naDzNtLhA3+TTehJxOCtpNLvWBuJXhFUWyms0+Bgc26CbEx/ezuqDiQAtzTSNv3CyGvF6DP7aqrWmh2VKP9Ebr8CkhjIbrB6PXN9c5lK7/P3TrjOamMbu1t9dLDwIuiXUkXnOx5FSvtS7sF/q4vdbY/8bi7WQapjZqYLc31omzeM7gqWL6TgNaf9nB9fcNCmcMclqqCbCYlhFCvRKjIdrivzOmvyDaSr03xy04LXjjXPvK/K39NYNNhBZnsYIkIlXgAdOl2+bA7LPrt1S9riaHyD/B0VCMJcy92Vd80QMjoUWMEXXTYdQ4f8Ol6RbHpf8XjffCC7r7vmbhgwueHQgMo9FHKqwVjKayl8MCtlHz/7znKzA/ydgPRJDGDrTl6TCWFFNuZLgH8VbiedV/+rUQSVbwRFlFaTIowTxczQtDObpE1f/S3taB7uwR1EUpx1IJ3s5PKMTrEXyDz0POhfkrUHzgcUYMGcvw0N7dWCcm+fxZ/C1vMgFec+A3LXkDpPFd3NOes6K6mJ1k17pvAXfoqbCcni/g27ATFpkWKRBV8Twc84FNwBMCXZ15egCvpHEgQdrpw1VJKlGmQwP0zGt6obQ3YLKZ0YNRZlcIkRkTMR9uQIxLu2NXPuHQsvWC2gAYG7H+LYXSfrIHQiQzVBWHZ7p89ITjvOB7YAdnTqsNJGhZwZCR4V5nLlbx0MVVnnuiYtToomVRH/1RPZtgK85oq2l1vj+o6PIBFTxqjKaDy6uOc/cKo+oNB8XWocxJrik7Wa3SUTk3T2u6PGH3VQ44zjJvLIaaS4nENEBpdY5LDJf8kAnAeewC0jYFTUonn4foIjW11ZvrQyc8vRngH/zg7bwRwumKJ8vky7YMjy/RSRTN3yEr7G5h8TesxQzJqCtJXEgMRvVA7JOLgrc4A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 595261f1-190c-4eac-da4a-08db2e57a406 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 00:10:16.0144 (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: fZPgTfOKr50TdFN7UEq9F3n3fMU9kdadB1shZBG72R0bZ+Z9/ihI3oQQvzfV6T9dDUJzMCK7CGWa7ejmFBUWBnwRCILlxzz1aySqWf3GkCjqLPYUxlsm2XJGVujAJdEp X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11465 Message-ID-Hash: M2QY6ETJXU6JEMVO32XU6SRYLDVYPSMO X-Message-ID-Hash: M2QY6ETJXU6JEMVO32XU6SRYLDVYPSMO 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: 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 Mon Mar 27 00:10:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 667438 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 53F3EC74A5B for ; Mon, 27 Mar 2023 00:12:37 +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 427F6A4B; Mon, 27 Mar 2023 02:11:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 427F6A4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1679875955; bh=yIrpt4FzGGN8KixYYhJA3cA8A6hNAFM5JVPuzFbE0/s=; 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=myd6q6AKx3c+pFub2egPnMbfIwAA1jUlr8HXEXOZxCJd016YdPXgz2t3JT/NcZFNm PXQuCOshOG1U1Xw4OANBY14fzmcnJLdLbz+32pGYYFFM/YnPZkWpBXqsAQlU97nLtv T1EyMPo1S4HMoSyxH9/Yt/GFACq/deGVI9tBcLsY= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id E19F4F80551; Mon, 27 Mar 2023 02:10:31 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E9A2FF80558; Mon, 27 Mar 2023 02:10:27 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20729.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::729]) (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 E1FB4F80551 for ; Mon, 27 Mar 2023 02:10:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E1FB4F80551 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=dO7NzRtJ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hyy2V0fjSRojPT2aDZiRj4oaRsehEew20kBNBtJIUJd4sG5kZrJCGAf4t9fy3cLhfSTbK6FA5o3/Lb1q7ISuwsrl9hKh4U700buWF8Elw7/6NRvhahrjfE+QGGr2KjIyWD2iuGUOXdWfVzVVLiGJaMSbI0Dt4YN881ippjiUO6PUjBrLBAEvHOu7Nv5UfarQ46vFrC/wcHHdT14tgpg6Q3posIgoGWp6AEWzrDhu2PtdrspR8eegY2xNTZMkPd2OsNQcjv7kokt3b4tsDmjJkLp+UNpFUThsjS8YvpfWPxjXQzLQjJ05XYXqnBfSiIoAp7/atbE+GndN7zI+dvfy3A== 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=1K+UEq1UoEvvYmu6oxtsXU9E2y0ErGBR/B/4rEz12JI=; b=Arn6SgyWSD1IvJx+3qsStSBNKQmcEsR/tsuhfN9RweUldMkqZVsAiEGBN+dqRUHTNvyLzc1YinBg+j6pgenggeFnlWpr+T2i5qcTB/SLYcyGSgtBX8fs8b0KIkc5flWnT5SH2mcZVqo5B7tpstEPA4DS/yBbwFA/QKn9HLytZtAG3DPfdkxqGEi/9tM3lKrBgtWHxWAmjavS9XbAcd4KBUWd7uk83OjGsMwlOfyLJme4hcQ5yPNVV9aYEFNFXnwI8kBuq4Sdjym88zXgoiLaRWIlemLX081weWaEydupxwhJ9jEcMBtVRDkhRKO1X07r+3pE6k7QMQhvnV2JshDuYQ== 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=1K+UEq1UoEvvYmu6oxtsXU9E2y0ErGBR/B/4rEz12JI=; b=dO7NzRtJKMvnMHisczmJFmYai9fnKmNONjRDPtpeBbXBdbEOeLIGwS5TRqTNScqXw8GW7n27ui9jse/YZnNbmSnwJIlstXOt85BzEQVLmbNDRR1E0h8zG/ln8D4gZLkgYMMHFrlhIJKESZD3g3JRffP4n0uYD9HoxktXVBY1FmM= 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 TYWPR01MB11465.jpnprd01.prod.outlook.com (2603:1096:400:402::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.29; Mon, 27 Mar 2023 00:10:21 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::b005:5b0f:6ad8:3eb1%3]) with mapi id 15.20.6222.030; Mon, 27 Mar 2023 00:10:21 +0000 Message-ID: <87jzz36olv.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 5/5] ASoC: soc.h: remove unused params/num_params User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> References: <87r0tb6ond.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 27 Mar 2023 00:10:21 +0000 X-ClientProxiedBy: TYCPR01CA0185.jpnprd01.prod.outlook.com (2603:1096:400:2b0::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_|TYWPR01MB11465:EE_ X-MS-Office365-Filtering-Correlation-Id: 95cba4be-5bee-460a-027c-08db2e57a78a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oMqiGiKE/RXYoqdpP2h+CM+rJGl4e/1AEYMoFkBsAVmi13uJv/owOhf6074g8kxIQuNgxkuvIBl9USkYjFfya96DQ+Ky/UcBUh14GogPgC95a9ItcAoIpnqXY9q52X4jfXwIUg3LgHqOlJ2wOkH3+8lzYkofiBFm2FHCB4VrdAOofAL4xJAoilLdUd7Z3A3aiI+/EA0kMrvq2IyDBdH4aZjnG0EMLcTN3ubCQBoUFvnVm+Dlyz04qTQd5FIbGj5/xMv+/v6O9iqRqoQD5u68YvaGYKxTV1I/RhIxfoNtqQyCsuk0zFgQhPc0VXYaNtlTqsagUcnE/67YwiUBA6UYq20R5ZBO06+6oVcSDUSqIuIHFll/Quh/9A1OuUVeF0Ce3nXecVn5srj1/4korNPrYQb2RqTTo0KxUF40PTxyh+a1wuqalfbJNSVSgLOnHZJkqW4B5SvxKCXz4a170xJJSzyGOrAVXQjCSFVFsMu9jMFOwfnEnhi3b5XGWS4WC+O/V0iNIvoynnD+X7cXlrZMgaIyYSiHdUrfLy2f2NrNcsU0/S3XbZenSmope2xw2xqbb2FDwibIjXL+Ikuttjc2Tv3IPs6h1ZazJsEK8iOWJKN9U7F41b6oWNyVnRP+Ozsa 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)(376002)(136003)(366004)(39860400002)(396003)(346002)(451199021)(83380400001)(2616005)(4326008)(66476007)(66946007)(66556008)(6916009)(8676002)(6486002)(478600001)(52116002)(6512007)(26005)(186003)(6506007)(316002)(2906002)(36756003)(86362001)(41300700001)(38100700002)(38350700002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jW0YD/9I5ZnjJivIM9XtgdJY31Pwpa8IyFLiFtpgHkPbaaYXm/3yvWOWbBMF6CqLIxUGiv6ujk0U8jD9qRAL0xhEythu2vuCWfvKP+7FAY1MeFLxkbKge/U04V1obMj8HYny8Y1eNTckW72DP5P/or/nsJmRRI177MHz98uiPysSSgHttZDZgeO+1Mgh/CHjq+8NlVDxkBqBjtnKhj1S14DFh0a3AsMQQE2eTT4zTgSSL2s4pmfc0sxDdSEF97IOjSe+yekh5Xog9afxBlqDKzRqOJ075fhqi72a1tHfUpsvTifEa7gplQAd1Ia89NpqRmkw7s6wkbjxqN/B1z/JPJEcdpPutcucUuXjE7uic0g/6GSIu1VTEjy0Kq9jUoeXGTVb1Umqq+I7WIJcxC63NhJ5oAYiIwho7oky0V4p6pnqVhqm23SglhHTLvyUK8qkqZq72PWPGWSB4fOzyqR1q45r0DP5C8LRbnd1MGLTDdUK5I5OcFtbrobTvLNmoVYkXBjem5+g//DIq8btaPFCR8krqFi75aKuxASHgmhBHPpoFQyys7xUA30OLYig9ibY6fBFzWPdHFpLWNeqYRr0y5/tzjiI0gy7zeVOqHGjTZ2Eunkt5yh+YJJ4e8CAi3eIW9QCmY5wHUy7OMEc/mbHynE7ud3e6SvqibbAMxWdwrjkqLSKq1AdN08Wjeza2Pmw83x1XmeTeIMsLTqljw4D5xTqbOyZY0BayO+9EGwNLtv8wXqLS6FxOtfqORCGzYDfIBN6pRTK+8y02w9USniWtylWtYFyk4r7Cd9QZygPhTrbtVacJFQXNIQRaj4mRmpoSp9UMqdEQZDEuNtE+pyj1Zh/PfeuBJuC1AuOoVXf09Isnt1sdxc1ZCBQisKd2E3xm+B40SKLC2e77Js6G4Fe91nvE56F3lYoH548IYV0a3i0JtM3dEU3sqmqcAdgDQYWDl09TyaQbNDbwFydfhpMrkfCAqWwjC9u77qe1oxd88wBz5NT7Vmdz10a6m2yrS1v3ZZ9Lqb+Kl4ZsK3/FbwwAud/YslNy2YA8c8oHEGd3KfVQ+PZwR/ZGezPoqYACYi4+e6eAczZc5gAeR0nFSaL0hzBG4ON/eIu2Y25sy6lbyEdu3vHgKCXLfK+mFMfiniqHb6Tn6OdB9Y/uX9KBrUpfqAWJ6l6EAq8RvC95zjB9Z6Fl5bWiwukY2Vjc/G/MXBij34ixOT83BVNa5N2VGUjVmDlZhVJDu0ms1uMQhI9F8QuZ3ROdR3X5YmjKtxvyuykIjsBqfNOrTVyBbrZ1Ey3/xaMNh5twiQeig0H6m8Ah6xjvG1MczhxMpB9FcBxAWbgDo//WGtfxOGgdGIl4gkqj4NjUy5AiOm4rHtMtw3yMl9B9axGcXBh1skp3VsYh4TCWnqf0zwWDuJQ68s4GjFOF9zxQg4GuC5A/C3t+s/t78CV62neQ137cCKePBFRcEL8rB79GAMelkWrrZ8Pu2jkgFiidt7cVqCj22k+vEA17Fr+olBxMA4dpXXddBlBPIBhLfac8HUkFVkILmjS0eEOLE3FGt2fGo61vFioGrfafhd6oFg3wj6j0DSaEgONxoDB3j+8W18aBDWrRmd0Vor3+AlStuXZ+zsO1/qxwoXoxwU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95cba4be-5bee-460a-027c-08db2e57a78a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 00:10:21.2849 (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: 8HO52Zw21QrsNYMT3p3LG6EM0xsDuIBQ9eX1z95Vh1iC8y43WqTCEN48LAUJ3Pu2V8+qB9g4Cwad02iMbJO7pqFyRlLk7aFBGXkJTBLqn9jK1jTErfBfA0jQf1cHv1kO X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11465 Message-ID-Hash: R7WYCOVARD2DJXI3CTYIQOVWIPO4ZMNE X-Message-ID-Hash: R7WYCOVARD2DJXI3CTYIQOVWIPO4ZMNE 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: 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 08fc69cf6b74..371c254aa74b 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 f3450478e20c..2faa0d8d0d8e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2283,9 +2283,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; @@ -2306,14 +2303,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);