From patchwork Tue Sep 26 06:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728198 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 4DE82EE020C for ; Tue, 26 Sep 2023 06:21:46 +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 8F2F5DF0; Tue, 26 Sep 2023 08:20:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8F2F5DF0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709304; bh=xbZOm6gKPqVlAn9Hs8vgpKaHkLrieEcvRhI2Glk0si0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=LRP2qJrYG5qtZoD1kg/T+ZffRYiZLLB+N1WnaKgLfxI63zNOGD4zdeWqLySt2pfRJ akxe2PKVYsT5ZUNCnvM1UoH95z7X49Umn4LupoHxmboRHcTMCxMojFXsYsRR/6MDtp jKgqUBvKR6VCTdmbMRSPPBZPqELQx7m9WuDkNPs0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E490AF80551; Tue, 26 Sep 2023 08:20:23 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A7CCCF8016A; Tue, 26 Sep 2023 08:20:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EE415F801D5; Tue, 26 Sep 2023 08:20:20 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20706.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::706]) (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 33637F80130 for ; Tue, 26 Sep 2023 08:20:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 33637F80130 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=hu/xKU08 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O+uG2MejmsRORBizT62UXy6p4fUSccAIL8gRxIDFFDzNGqQRhV+raHWbLperJfZscgdxZhnLg9z8gtsqLsbwzSiKbiJQv87FVIPKXCFb43OiarEM0A7z4CwPY4V5RL04wiSau19Tyuf4jdWKXKWWJZfdlNXvkf1tT0k3y63H7eZGv1/cyqMaKD/CzgEwfXpA+HUBchx5rlhbrX55zEY4045fVee+X8yrjEVz2u+2Gfxs6IFpPlP0qysP7efA8e04toD48CsM+4AcsPC83yV0lAAYAVWPXwq0+QJXi2S8NP/KArqh8sX2Vxo344ZjzjAfYWmSnCKW731yaGrLDaZKUg== 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=LyM+n00yZU4abyeAvGLn9uFrhW+IrOZkn4uGlaJHGr0=; b=BtGY8xhKCtTOuiQGQMvU4WrON81x7n7rEg7Gvq6NoTzaSzcJxEU1jxAf/C3sIim5GEEMtmaXBF3IPZu0dCMlIh/aDq8ZmR4jwPqg6fpoSRNfg6XPaTmnp/TSj5z4pi/bJPzIyL0VHhJXnKeKjY2VtkPOQNetOF7fj4KGOt2owCfjICyHIkNPozgjuJuiAi0rUMksIPUAd8SmQIzm6slQk3qqv5BfyA0kdO9UhHI0QSFEZOvcNRjANLmBhlneQVTJy9Sukn3hY24LoshKf92y2A/wF1S6HON8a2VjAKkXbI0RTUsMrqtsfgUh1yyJGAopb1Xen94KiIJP15OQD7HWgA== 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=LyM+n00yZU4abyeAvGLn9uFrhW+IrOZkn4uGlaJHGr0=; b=hu/xKU08GMABKXYAyp/ZugG12d4vjvnOGRGZltwg6hmOJdmW+ecsmfxY1hIaGaLpS56DgjiUFGl0WhdEAv8dzDVrLk/pAIbBlYYcaazbYcwWOOte9lJG2d8OlinjmbNNuhc6W/4Z/sg8XEukZ9HtnH9+fMoh55z4nI1e433ZsBo= 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 TYCPR01MB11898.jpnprd01.prod.outlook.com (2603:1096:400:3e3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:20:09 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:20:09 +0000 Message-ID: <87cyy5ihgn.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Richard Fitzgerald , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 01/54] ASoC: soc.h: convert asoc_xxx() to snd_soc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:20:08 +0000 X-ClientProxiedBy: TYCP286CA0037.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::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_|TYCPR01MB11898:EE_ X-MS-Office365-Filtering-Correlation-Id: 226dbe76-0b63-44c5-c054-08dbbe58a209 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KuCicLjWWOaFnbhPgJflXZbesVQQ7Sf6AwPL66y4fBpT+2FLhMjmELNZ6UXtI1wVERvrGTqDSvXbFlpfZZYBw3ipt+G+pimvUrdjq4A9teCdnSCjs3Z4unp2P8FU/SmZ78y+nNI0f7BfmnoEQNK5vCTscybkYXUsQbqOPvZTt74O6CzqXOINxyWxwt1puFuF8UXUSS1bmhNRlgQaBg3gTe4P45ouX6cY0Znh8EgW2t17YCcc713kVlhU4aF/V7Zr+HpmMBeQ58faKEcaB/KlbZouGVRS4gjrwnKDasbd0+u8lgsB/XWFx8gx8bhX9ObxRO8jVUwQO58BGmN7HpDocf7uZJc4+UqJ7RXg+bhm3HjDyACVhbkhH9PpCFInCOW4Xz0K7snYChj4p87rjUJNKFdBWWCupjrep3hmGm2BItZRw4cLPjkhxJR/SzCZOKuLp0SrF8iQYW7Z1xBuGkWeP7hGvTO8dQyMJguLysETLYzNc3t86FDkgVQsHlw6pQFL/V2uzOCIMHCDEX+1Ei9raIk+VMtP2N9tDkcmOYEBNXlYKizsdYfrrOhqA4OP/K6/EIKPTiKLE8dvMvhVKq0H3tYgLc+2VtOyMDgIH0efn2eszm2UvFOHif35XxJoyJHq 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:(13230031)(136003)(396003)(376002)(39860400002)(346002)(366004)(230922051799003)(451199024)(1800799009)(186009)(5660300002)(83380400001)(2906002)(316002)(41300700001)(8936002)(8676002)(36756003)(4326008)(2616005)(66476007)(66556008)(66946007)(6486002)(110136005)(966005)(52116002)(6512007)(6506007)(86362001)(26005)(38100700002)(38350700002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NAQpnwUkZqGwT2n3aJxiOxZFN/WB4pwXSf4haGGnmkmq3fxhNMpsG9l/GdWpCcNCegVjH7z5Hczjl2iQiVLl1P/HiU9PdPfT2O3tvWSSvyqqwKqtON0xSiR9I+QSSxVknuBByD+LxsSLfhMYTd5iBEexqm+8QI8a5rQsmr+qRUDZWMjYRG+T6bCcoqZvVyCRnAgjIzO5qoz0GzIkdJZslKHIETw/AJHD6hSyTYyRQhzcAa2/iOz4THVaQtg5wteBjQmCRclbl8ZQLEyOQ+wsy6t2kXGha92ydHfUuIQKlZHS2mRLBWUIGOuC2iO4QCV75fO8hXJerydpI44vTnwCQjcUiVezz1T+GA7eJnT9fj+9li7jWEtBuGUY4MLiCZDm8zYjT9SicOmGn6OHODFWsC1I8z7rjT5+aMFivpU7O78WXCWDqlQIvZPwB5hwHTBu0hF6zLWdk+rnMBzK+WhjbaXpG2445SzcNwhRJ9EyTfX3FKi6lBQ6kNqdJANHQvcDUxXNaqLVt/Oz0/6ffPuBdbgO6c7VafT+Y9P0fjFQG5YB0hsW+bmAfJWjJ2JkN6LrrFPALOLjo1wbIQrPo9egTyRHoVznL1FfG0cY8q5vMwm1TJFSmlEPJUGOg/oEi2bMd5vQIoVRZ16dNvMqEdtBI74KzfCcFAlJPi58+kJgd2BYkDgXJcaoyz4UklGw683BDqYBUVVYNmoJNNiMc+XVbDt2xkFp2icHsM9cbAqbOSc66RwuqL43b2PijR1uNQHCwjPWbN0lAhbHrcOE9mm39o/AAojhB/i6hug+iFPROXDeNPpSOH4CShvI3Ler2sDHYDAroATT/3640LXlnHoMG5rzZJndPHbWKxvjOUsRRWfDKOD1sLZf66daLhMaxGqwTSN7ByEimgqrfkp4uwle7KrQWANi/9aUJGXZbZs1JHZw7BW7PUqQmkiXLog0lkkKrXNUOmplMRT/5ZFNf3p1+DBSXCUjFQzG1PVbXt1a2OKxgfSkecrIWMfjbXeDavgIG4iBfmwUiVK5fDRYJFUKsByZVQWzQINNh2kjdg/zydBv2nMv186cN5v2xxHqs2Mx/XC8FI3BoP9/qitAYNHPx4AGAugnueKoowSmbEzMxEziY0a28GyKjJYea47hGUMVH93aPAKBhyb1xm3jrTZ31J6mQcOjKvMmMZ7KoPG+jlVMbgUOsE31RWUrDdIpsia+RNe2dAwZwGd/mWiJpd6Ncrx2Nz1tNSSgJ3mtpS98L7r97Ixo/qG783FkdF/YnhQR8moKlyqFx1wUX7n7yhRz8nE/DW4dy48KOMYaqp9Ziuv0jPei8QD1ckcI8CqXVm/XmzbLDDBOhuXZek0qbPIsFB5loCVGgmQKqPlp3NTwyTaWZtOINV7B0jjzwpFV+NT7lPTK4oI++w8ihJ9AA+L308cGTLfTVZL7ehcObjyofF22xjvwwbwMkDh6IuqQfDvPYeHASbeJWhp8gxQmRTNnpiIH0Mi9PSba6eJA3OoRU08vvmZFAJTASm165Z/sA++nMZ+Cj+OmruEZgkbZ1rS6x39WnrqurcMlqBtdbVG3PqTQXSZH+UQFKvrZ+PVzLn/pDYKZyFruIn2e+6ezWHYdo61RRSxHK8vK6D2OTooQlck= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 226dbe76-0b63-44c5-c054-08dbbe58a209 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:20:08.9974 (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: QdADtRZ5i+PwFzveu08MLQbTh7VJTjbDUOZI6aKvLGGAT4XGfuj6+sAzYbXzSHoR5SDVl4SH7nCzN/anC2z2xF1RgXkwXTTp0ZFdRLyq8S/M68GCR+v4EcCVHLy3/nGm X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11898 Message-ID-Hash: O5I76HXIDKHOSLV2O35IVRURKLGRJ6MX X-Message-ID-Hash: O5I76HXIDKHOSLV2O35IVRURKLGRJ6MX X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 using 2 type of prefix (asoc_xxx() vs snd_soc_xxx()), but there is no particular reason about that [1]. To reduce confusing, standarding these to snd_soc_xxx() is sensible. This patch adds asoc_xxx() macro to keep compatible for a while. It will be removed if all drivers were switched to new style. Link: https://lore.kernel.org/r/87h6td3hus.wl-kuninori.morimoto.gx@renesas.com [1] Signed-off-by: Kuninori Morimoto --- include/sound/soc-card.h | 4 ++-- include/sound/soc.h | 42 ++++++++++++++++++++++++++-------------- sound/soc/soc-utils.c | 4 ++-- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h index e8ff2e089cd0..ecc02e955279 100644 --- a/include/sound/soc-card.h +++ b/include/sound/soc-card.h @@ -115,8 +115,8 @@ struct snd_soc_dai *snd_soc_card_get_codec_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd; for_each_card_rtds(card, rtd) { - if (!strcmp(asoc_rtd_to_codec(rtd, 0)->name, dai_name)) - return asoc_rtd_to_codec(rtd, 0); + if (!strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, dai_name)) + return snd_soc_rtd_to_codec(rtd, 0); } return NULL; diff --git a/include/sound/soc.h b/include/sound/soc.h index 81ed08c5c67d..45e005abe03b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -775,37 +775,42 @@ struct snd_soc_dai_link { #endif }; +/* REMOVE ME */ +#define asoc_link_to_cpu snd_soc_link_to_cpu +#define asoc_link_to_codec snd_soc_link_to_codec +#define asoc_link_to_platform snd_soc_link_to_platform + static inline struct snd_soc_dai_link_component* -asoc_link_to_cpu(struct snd_soc_dai_link *link, int n) { +snd_soc_link_to_cpu(struct snd_soc_dai_link *link, int n) { return &(link)->cpus[n]; } static inline struct snd_soc_dai_link_component* -asoc_link_to_codec(struct snd_soc_dai_link *link, int n) { +snd_soc_link_to_codec(struct snd_soc_dai_link *link, int n) { return &(link)->codecs[n]; } static inline struct snd_soc_dai_link_component* -asoc_link_to_platform(struct snd_soc_dai_link *link, int n) { +snd_soc_link_to_platform(struct snd_soc_dai_link *link, int n) { return &(link)->platforms[n]; } #define for_each_link_codecs(link, i, codec) \ for ((i) = 0; \ ((i) < link->num_codecs) && \ - ((codec) = asoc_link_to_codec(link, i)); \ + ((codec) = snd_soc_link_to_codec(link, i)); \ (i)++) #define for_each_link_platforms(link, i, platform) \ for ((i) = 0; \ ((i) < link->num_platforms) && \ - ((platform) = asoc_link_to_platform(link, i)); \ + ((platform) = snd_soc_link_to_platform(link, i)); \ (i)++) #define for_each_link_cpus(link, i, cpu) \ for ((i) = 0; \ ((i) < link->num_cpus) && \ - ((cpu) = asoc_link_to_cpu(link, i)); \ + ((cpu) = snd_soc_link_to_cpu(link, i)); \ (i)++) /* @@ -891,8 +896,11 @@ asoc_link_to_platform(struct snd_soc_dai_link *link, int n) { #define COMP_CODEC_CONF(_name) { .name = _name } #define COMP_DUMMY() { .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", } +/* REMOVE ME */ +#define asoc_dummy_dlc snd_soc_dummy_dlc + extern struct snd_soc_dai_link_component null_dailink_component[0]; -extern struct snd_soc_dai_link_component asoc_dummy_dlc; +extern struct snd_soc_dai_link_component snd_soc_dummy_dlc; struct snd_soc_codec_conf { @@ -1110,8 +1118,8 @@ struct snd_soc_pcm_runtime { * dais = cpu_dai + codec_dai * see * soc_new_pcm_runtime() - * asoc_rtd_to_cpu() - * asoc_rtd_to_codec() + * snd_soc_rtd_to_cpu() + * snd_soc_rtd_to_codec() */ struct snd_soc_dai **dais; @@ -1137,10 +1145,16 @@ struct snd_soc_pcm_runtime { int num_components; struct snd_soc_component *components[]; /* CPU/Codec/Platform */ }; + +/* REMOVE ME */ +#define asoc_rtd_to_cpu snd_soc_rtd_to_cpu +#define asoc_rtd_to_codec snd_soc_rtd_to_codec +#define asoc_substream_to_rtd snd_soc_substream_to_rtd + /* see soc_new_pcm_runtime() */ -#define asoc_rtd_to_cpu(rtd, n) (rtd)->dais[n] -#define asoc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->dai_link->num_cpus] -#define asoc_substream_to_rtd(substream) \ +#define snd_soc_rtd_to_cpu(rtd, n) (rtd)->dais[n] +#define snd_soc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->dai_link->num_cpus] +#define snd_soc_substream_to_rtd(substream) \ (struct snd_soc_pcm_runtime *)snd_pcm_substream_chip(substream) #define for_each_rtd_components(rtd, i, component) \ @@ -1149,11 +1163,11 @@ struct snd_soc_pcm_runtime { (i)++) #define for_each_rtd_cpu_dais(rtd, i, dai) \ for ((i) = 0; \ - ((i) < rtd->dai_link->num_cpus) && ((dai) = asoc_rtd_to_cpu(rtd, i)); \ + ((i) < rtd->dai_link->num_cpus) && ((dai) = snd_soc_rtd_to_cpu(rtd, i)); \ (i)++) #define for_each_rtd_codec_dais(rtd, i, dai) \ for ((i) = 0; \ - ((i) < rtd->dai_link->num_codecs) && ((dai) = asoc_rtd_to_codec(rtd, i)); \ + ((i) < rtd->dai_link->num_codecs) && ((dai) = snd_soc_rtd_to_codec(rtd, i)); \ (i)++) #define for_each_rtd_dais(rtd, i, dai) \ for ((i) = 0; \ diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 9c746e4edef7..941ba0639a4e 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -225,12 +225,12 @@ int snd_soc_component_is_dummy(struct snd_soc_component *component) (component->driver == &dummy_codec)); } -struct snd_soc_dai_link_component asoc_dummy_dlc = { +struct snd_soc_dai_link_component snd_soc_dummy_dlc = { .of_node = NULL, .dai_name = "snd-soc-dummy-dai", .name = "snd-soc-dummy", }; -EXPORT_SYMBOL_GPL(asoc_dummy_dlc); +EXPORT_SYMBOL_GPL(snd_soc_dummy_dlc); static int snd_soc_dummy_probe(struct platform_device *pdev) { From patchwork Tue Sep 26 06:20:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726452 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 0D9D4E8181F for ; Tue, 26 Sep 2023 06:22:06 +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 9A792DF8; Tue, 26 Sep 2023 08:21:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9A792DF8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709324; bh=pZhEvL7K2NJhUdJi2tcRAzlBnVngAYjkGdMtGs8lN/E=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Tcw8HDmpZawKeabkhuJthoDMNnZEM3Xt53Z8yI+P3Q7x5rJl5fUT1hFcKS9xRJyKB K6nsz5o4ByLY7pkzRssT7A1ANzHNNl7UPiHfbQWJtTBJu7Bwxxo/joDPft4Zp2pTqT KS1VpnA/cGX79SzXbFpPBhSX5Y8Uc7Y0D5QmPJx8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9F235F801D5; Tue, 26 Sep 2023 08:20:39 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 0A919F8055B; Tue, 26 Sep 2023 08:20:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 79FC6F8055B; Tue, 26 Sep 2023 08:20:36 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70d]) (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 D64F0F80558 for ; Tue, 26 Sep 2023 08:20:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D64F0F80558 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=j+RWlfLw ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EvuxKG5vRvcXYYtD/8P2KRIC6d6xjtq9FeMVgQ0iEn/ezvsVFhikPAo8OLYCSRaqx2Pom1Wq8q/qHsuQ6IPhh3DAh1C+pH+vodwpfFCZ55VVuAoAdd/2D5amfI+SM1K5hGVPjpcosxkljcsUvMcdHBIuPR/qJCNPafW2eDTX5zvx0twM+C1pFelsk+K3xDfjJGiXbtiQ26ThJr/7He46uDGf2X9jEoO4W0TnN2EXYxojBgmseB2Z7/7QX5N1yO5OTK+IEjn/fHCWZTaxMtzgtWr/edHxb9qxTA43NwP7PX8rUOjTBKW2lDmsUTco8mwpoiYr17m6yfHVbUlPqsmufA== 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=Q2v02ovmHlb9jr+CD6n7OEdY/48ZuKDUIfBkZg7uyBY=; b=NZuSSaA6cRJbZHgbNZ72tkkypSz4kg0sGwlxLI+MkEDLW0GHzmmlr1Mr5MBCjfifbf869trV7X4ZtZo2IlClfSLaRqeRhOtORzdTCpyzIR5nBsihCe9DvLPUIQmGzBMZhuZnBbd7AI7nVnaVNWj5uvzHQiN3CUevVYKU069368A1UxFOUOAaR1w11NU10C/Me81IIOr4LLqTProF/K6fjrCBZpSBHvFAJrM2+BVx1zX5LZVYVioBoEpC0HDZNVz71PiemNOvUHYfM057RHQbJnp5b11xonuiKi9YItBMf8hrTSgKoZQ84FB8rRmnKN19ROLybvWzWmDtOx36ep/rhA== 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=Q2v02ovmHlb9jr+CD6n7OEdY/48ZuKDUIfBkZg7uyBY=; b=j+RWlfLwq8yUtKzIia4OMYaqHJzV1jYwW8EaF8cwGJElFCiLQVcXT058PsjicJONryj2mwjh/PRKRz1EKAqhXoI+XH61fdNa25vMjH2aDP6jcWYU2yaFEoMmk0OLttb4GIY2XjWBW6gZHP88h3Em2Q3ulTZSPmICmgvK68yc/ns= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:20:20 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:20:20 +0000 Message-ID: <87bkdpihgc.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 02/54] ASoC: simple_card_utils.h: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:20:20 +0000 X-ClientProxiedBy: TYCP301CA0037.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e4d9706-f1b4-4f89-ba69-08dbbe58a8ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VYY90edtj07dl2UPlABWGFK616K3vv/Fde3aBWIDxZzDskZ2hLI6uE5UT4fZ1DdWWfra9wMQvjYdp+cylI+t93IkMP4sm3WX8lfSwhqBKYM1fD0NjbcPwWkaU6rWPXo3/pg+jnENaABFVmrSnwS0uXvTpAEqkYLWZQx9vlqNwikaQojrjk+Rz540QoK1jPeN/ZXwIHShB/fSTBs0WfVKVx+YrGYbVL5QkYqCrnXTtfLV4Zk7qxdyyDT0dbYqMfB/f0HiRs7za2Mb6OGjIAmkSK4PmpltdvD9K+k36NugJT9OF7LGdr48zas7wlg/HQ+75rBwUkw4LpdFYC/tSRQ4fwPoRyOCJLYrIQYfFiA6F5dsHAe8GUTQiHOnmT5swLZCf61s/1FgPUGzUX0+F6/U7uPo/VFeWjluzNCg20awB+0G/Y88h9g8gHRlS3DasKPcD4Jfp3APRb4BqIGWCxA7s39hbNoRznc5a7fEFsmj8BmS0uq4wV/kISCJp/4/o47v8/nvd+kX8+c9UAOe4WjwuYoHeriAImFifXeN0wB6RmwKAb7MPJgwhlBaPe4G9yLDyRAbNhEtUtLe4GOxa87MCvJCqdKq90xFwRFaEMmTAkdLuKg7g1U5KsVSyws0JYFrz0cAfoVuFSafn6cVPU56ng== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(30864003)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i/cDI9/dffRNOKEzCtW2rhd0U/j7vBGKwHC3j+V+N6i3TyqUsrFzLgnY9ryaSLXkDDEqRTRlktUte2PIvoxyNzsI7GthyD7mcidhw/xwZ0rpHaRoGRlH/62stCotI5fDqrxFUjpgao3sAchWm1ifaz78+r037u84Hj/jsUcNVWexpzVZ2/M8WnzQ5CVIoajURAoRTlQIBAWK6l8k/HKGJgGNLz5O+JEXVty5FWAye5O4QEXTMyotahWjCAbAptbxilMOsAjqo5LjnhnKlBLWIQF+mvi4/8Wy7/1eWfX3vkDVpY7i1Nz/83Gnr2VLpeQbFonDYl36979Ss3lkvwVohzYn+yC9bJngUoOeYczfzL49/komL8eupA/ouKA2SaQPgKr3h6dHmfy7JNA9k+BOIndWKC0NWfF8SVNNtPZd1Kg0SKJZquwcA6FSTFRkAIaIucnMgliAPaJEbSSNC8vE0JQ65bgtSodqQUOlxwDsUe8ft81RvfHZ4gnZn1Oo++emq0faSlfy5JDr659sGSmkDlmp1pBfvwCzYkf07hK5z7AXF0bdBBD5zfNa6sOHIZqRLaBK3vjX/o8WnfRYlLhEnJTB5vxNf6BWH5gCvdQA3wYbArzhtVzksTis4JuoBF2rw0NDjan9pgaoDhkTrKhph7JgN0/h7Bcc41sR3OrUGoCEydgaoEY3DZRLg5Um+324ZPWcYgHI8+RU6cwlcQ05eAOK/FZsUJL7lcH/PTh+ulZq5NyqGtE7DJWy6PiUETCnTilfd677FzBWqARyjV9q8gV7kl6RwtjgfFE7cansC7M6h+HawccIOFqmcj+V7AOJvC3C5IxwgHbAs/jMitP8rs1d2ZrzqaweJIas/vjNIPpFFnUInfRbRsqzHZi7Voqwoy0792UW5p7U9hbLH7tTNDKKz+bn6Md3aEV4Wj74OKI/mqgVloq8Xqyw+LyBVT4Leuc0qNU2X0CBEBpb6wekeqvogAnYRW2UGST33upgDsd8CHZFrU/LMRqSh8Ml0R/iJ2jgxk23lW8WQcp3II95hWli5Gdk3sqvyV1DFvR7+B1B1PjC2LdDvePK/EBO1swZ/Z8s+F9NUxgxSK5UJe7szCOLA2hUlXaMM03H4Oh72aA9YwDWYufxsX7CYydhsGLxE2QgkxdrxISilYqXZLFOzi2RbGw62xy4UKuNQmw70Jz6K2RfZGwsq7CUN8DIZBBgRR0fMl/U6kzA5bsXvtCq5ZIJw4Dl/174LwOsF80aMQcoj8Z6/mXJzghIY7Q88HwmPbNw+r3pExIhUQbF+rk6QCYMhOquVACmg28OsuTSpoXzCHkSwN7OvbfkskALmoyGdoMhSEVVLWadHGW34JO8aqaHdNhPIuWBaKwJsBSPTyYEbmUufeVyTFbtuoosqguFbuR79g5rXGiDOg3WFgwZs3b0G+Td4UXTyikdIvfptpH/q8vpURX5RYRfkE8w2yg6MSWN/Zj7wC+madiU/n+h9r0Ip9PPL6969NyZV84t4FFz5KaUJHA1FFsLkdnX5Y+24pVssHTJJBU4TwRtMNa0R7nePipxnwvM5B60KHuYijne5322LpUDKel0WlMg9d4kIyfwlXcJYsP24/TrirC3ZGSb+BN2dZ3LNgFho3SKkko= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e4d9706-f1b4-4f89-ba69-08dbbe58a8ed X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:20:20.7010 (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: D7XV4GoDiMAyIsHF+hN6Clw3mqOW7fYylTN5eDbfSM8rHBcS7ZAqloVYc0xJWNaRC9jMsafN5XAnRHfuZMSIjoZCodHhIRs63euOE0qEwFOSHxjTSxd6irNkLTKCRnfB X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: PRYAOVB7JMRS2ORTOVOMB2DIAKYMI377 X-Message-ID-Hash: PRYAOVB7JMRS2ORTOVOMB2DIAKYMI377 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 using 2 type of prefix (asoc_xxx() vs snd_soc_xxx()), but these are unified into snd_soc_xxx(). simple_card / audio_graph drivers are historically using asoc_xxx() prefix too. simple_card / audio_graph are not ASoC framework, so let's use simple_card_xxx_() / audio_graph_xxx() for global function prefix. This patch has asoc_xxx() as define to keep compatible. It will be removed if all drivers were switched to new style. Signed-off-by: Kuninori Morimoto --- include/sound/graph_card.h | 16 +-- include/sound/simple_card.h | 9 +- include/sound/simple_card_utils.h | 148 ++++++++++++++++---------- sound/soc/generic/simple-card-utils.c | 100 ++++++++--------- 4 files changed, 158 insertions(+), 115 deletions(-) diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h index 4c8b94c77b8e..8e2e15dfcb1e 100644 --- a/include/sound/graph_card.h +++ b/include/sound/graph_card.h @@ -9,27 +9,27 @@ #include -typedef int (*GRAPH2_CUSTOM)(struct asoc_simple_priv *priv, +typedef int (*GRAPH2_CUSTOM)(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li); struct graph2_custom_hooks { - int (*hook_pre)(struct asoc_simple_priv *priv); - int (*hook_post)(struct asoc_simple_priv *priv); + int (*hook_pre)(struct simple_util_priv *priv); + int (*hook_post)(struct simple_util_priv *priv); GRAPH2_CUSTOM custom_normal; GRAPH2_CUSTOM custom_dpcm; GRAPH2_CUSTOM custom_c2c; }; -int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev); -int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, +int audio_graph_parse_of(struct simple_util_priv *priv, struct device *dev); +int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev, struct graph2_custom_hooks *hooks); -int audio_graph2_link_normal(struct asoc_simple_priv *priv, +int audio_graph2_link_normal(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li); -int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, +int audio_graph2_link_dpcm(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li); -int audio_graph2_link_c2c(struct asoc_simple_priv *priv, +int audio_graph2_link_c2c(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li); #endif /* __GRAPH_CARD_H */ diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index d264e5463f22..a2f214388b53 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h @@ -12,15 +12,18 @@ #include #include -struct asoc_simple_card_info { +/* REMOVE ME */ +#define asoc_simple_card_info simple_util_info + +struct simple_util_info { const char *name; const char *card; const char *codec; const char *platform; unsigned int daifmt; - struct asoc_simple_dai cpu_dai; - struct asoc_simple_dai codec_dai; + struct simple_util_dai cpu_dai; + struct simple_util_dai codec_dai; }; #endif /* __SIMPLE_CARD_H */ diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index d1a95bc33c56..0639c6df15e3 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -11,18 +11,29 @@ #include #include -#define asoc_simple_init_hp(card, sjack, prefix) \ - asoc_simple_init_jack(card, sjack, 1, prefix, NULL) -#define asoc_simple_init_mic(card, sjack, prefix) \ - asoc_simple_init_jack(card, sjack, 0, prefix, NULL) - -struct asoc_simple_tdm_width_map { +/* REMOVE ME */ +#define asoc_simple_init_hp simple_util_init_hp +#define asoc_simple_init_mic simple_util_init_mic + +#define simple_util_init_hp(card, sjack, prefix) \ + simple_util_init_jack(card, sjack, 1, prefix, NULL) +#define simple_util_init_mic(card, sjack, prefix) \ + simple_util_init_jack(card, sjack, 0, prefix, NULL) + +/* REMOVE ME */ +#define asoc_simple_tdm_width_map simple_util_tdm_width_map +#define asoc_simple_dai simple_util_dai +#define asoc_simple_data simple_util_data +#define asoc_simple_jack simple_util_jack +#define asoc_simple_priv simple_util_priv + +struct simple_util_tdm_width_map { u8 sample_bits; u8 slot_count; u16 slot_width; }; -struct asoc_simple_dai { +struct simple_util_dai { const char *name; unsigned int sysclk; int clk_direction; @@ -32,17 +43,17 @@ struct asoc_simple_dai { unsigned int rx_slot_mask; struct clk *clk; bool clk_fixed; - struct asoc_simple_tdm_width_map *tdm_width_map; + struct simple_util_tdm_width_map *tdm_width_map; int n_tdm_widths; }; -struct asoc_simple_data { +struct simple_util_data { u32 convert_rate; u32 convert_channels; const char *convert_sample_format; }; -struct asoc_simple_jack { +struct simple_util_jack { struct snd_soc_jack jack; struct snd_soc_jack_pin pin; struct snd_soc_jack_gpio gpio; @@ -54,21 +65,21 @@ struct prop_nums { int platforms; }; -struct asoc_simple_priv { +struct simple_util_priv { struct snd_soc_card snd_card; struct simple_dai_props { - struct asoc_simple_dai *cpu_dai; - struct asoc_simple_dai *codec_dai; - struct asoc_simple_data adata; + struct simple_util_dai *cpu_dai; + struct simple_util_dai *codec_dai; + struct simple_util_data adata; struct snd_soc_codec_conf *codec_conf; struct prop_nums num; unsigned int mclk_fs; } *dai_props; - struct asoc_simple_jack hp_jack; - struct asoc_simple_jack mic_jack; + struct simple_util_jack hp_jack; + struct simple_util_jack mic_jack; struct snd_soc_jack *aux_jacks; struct snd_soc_dai_link *dai_link; - struct asoc_simple_dai *dais; + struct simple_util_dai *dais; struct snd_soc_dai_link_component *dlcs; struct snd_soc_codec_conf *codec_conf; struct gpio_desc *pa_gpio; @@ -130,75 +141,104 @@ struct link_info { struct prop_nums num[SNDRV_MAX_LINKS]; }; -int asoc_simple_parse_daifmt(struct device *dev, +/* REMOVE ME */ +#define asoc_simple_parse_daifmt simple_util_parse_daifmt +#define asoc_simple_parse_tdm_width_map simple_util_parse_tdm_width_map +#define asoc_simple_set_dailink_name simple_util_set_dailink_name +#define asoc_simple_parse_card_name simple_util_parse_card_name +#define asoc_simple_parse_clk simple_util_parse_clk +#define asoc_simple_startup simple_util_startup +#define asoc_simple_shutdown simple_util_shutdown +#define asoc_simple_hw_params simple_util_hw_params +#define asoc_simple_dai_init simple_util_dai_init +#define asoc_simple_be_hw_params_fixup simple_util_be_hw_params_fixup +#define asoc_simple_parse_tdm simple_util_parse_tdm +#define asoc_simple_canonicalize_platform simple_util_canonicalize_platform +#define asoc_simple_canonicalize_cpu simple_util_canonicalize_cpu +#define asoc_simple_clean_reference simple_util_clean_reference +#define asoc_simple_parse_convert simple_util_parse_convert +#define asoc_simple_is_convert_required simple_util_is_convert_required +#define asoc_simple_parse_routing simple_util_parse_routing +#define asoc_simple_parse_widgets simple_util_parse_widgets +#define asoc_simple_parse_pin_switches simple_util_parse_pin_switches +#define asoc_simple_init_jack simple_util_init_jack +#define asoc_simple_init_aux_jacks simple_util_init_aux_jacks +#define asoc_simple_init_priv simple_util_init_priv +#define asoc_simple_remove simple_util_remove +#define asoc_simple_debug_info simple_util_debug_info +#define asoc_graph_card_probe graph_util_card_probe +#define asoc_graph_is_ports0 graph_util_is_ports0 +#define asoc_graph_parse_dai graph_util_parse_dai + +int simple_util_parse_daifmt(struct device *dev, struct device_node *node, struct device_node *codec, char *prefix, unsigned int *retfmt); -int asoc_simple_parse_tdm_width_map(struct device *dev, struct device_node *np, - struct asoc_simple_dai *dai); +int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np, + struct simple_util_dai *dai); __printf(3, 4) -int asoc_simple_set_dailink_name(struct device *dev, +int simple_util_set_dailink_name(struct device *dev, struct snd_soc_dai_link *dai_link, const char *fmt, ...); -int asoc_simple_parse_card_name(struct snd_soc_card *card, +int simple_util_parse_card_name(struct snd_soc_card *card, char *prefix); -int asoc_simple_parse_clk(struct device *dev, +int simple_util_parse_clk(struct device *dev, struct device_node *node, - struct asoc_simple_dai *simple_dai, + struct simple_util_dai *simple_dai, struct snd_soc_dai_link_component *dlc); -int asoc_simple_startup(struct snd_pcm_substream *substream); -void asoc_simple_shutdown(struct snd_pcm_substream *substream); -int asoc_simple_hw_params(struct snd_pcm_substream *substream, +int simple_util_startup(struct snd_pcm_substream *substream); +void simple_util_shutdown(struct snd_pcm_substream *substream); +int simple_util_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params); -int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd); -int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, +int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd); +int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params); -#define asoc_simple_parse_tdm(np, dai) \ +#define simple_util_parse_tdm(np, dai) \ snd_soc_of_parse_tdm_slot(np, &(dai)->tx_slot_mask, \ &(dai)->rx_slot_mask, \ &(dai)->slots, \ &(dai)->slot_width); -void asoc_simple_canonicalize_platform(struct snd_soc_dai_link_component *platforms, +void simple_util_canonicalize_platform(struct snd_soc_dai_link_component *platforms, struct snd_soc_dai_link_component *cpus); -void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, +void simple_util_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, int is_single_links); -void asoc_simple_clean_reference(struct snd_soc_card *card); +void simple_util_clean_reference(struct snd_soc_card *card); -void asoc_simple_parse_convert(struct device_node *np, char *prefix, - struct asoc_simple_data *data); -bool asoc_simple_is_convert_required(const struct asoc_simple_data *data); +void simple_util_parse_convert(struct device_node *np, char *prefix, + struct simple_util_data *data); +bool simple_util_is_convert_required(const struct simple_util_data *data); -int asoc_simple_parse_routing(struct snd_soc_card *card, +int simple_util_parse_routing(struct snd_soc_card *card, char *prefix); -int asoc_simple_parse_widgets(struct snd_soc_card *card, +int simple_util_parse_widgets(struct snd_soc_card *card, char *prefix); -int asoc_simple_parse_pin_switches(struct snd_soc_card *card, +int simple_util_parse_pin_switches(struct snd_soc_card *card, char *prefix); -int asoc_simple_init_jack(struct snd_soc_card *card, - struct asoc_simple_jack *sjack, +int simple_util_init_jack(struct snd_soc_card *card, + struct simple_util_jack *sjack, int is_hp, char *prefix, char *pin); -int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, +int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix); -int asoc_simple_init_priv(struct asoc_simple_priv *priv, +int simple_util_init_priv(struct simple_util_priv *priv, struct link_info *li); -int asoc_simple_remove(struct platform_device *pdev); +int simple_util_remove(struct platform_device *pdev); -int asoc_graph_card_probe(struct snd_soc_card *card); -int asoc_graph_is_ports0(struct device_node *port); -int asoc_graph_parse_dai(struct device *dev, struct device_node *ep, +int graph_util_card_probe(struct snd_soc_card *card); +int graph_util_is_ports0(struct device_node *port); +int graph_util_parse_dai(struct device *dev, struct device_node *ep, struct snd_soc_dai_link_component *dlc, int *is_single_link); #ifdef DEBUG -static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, +static inline void simple_util_debug_dai(struct simple_util_priv *priv, char *name, - struct asoc_simple_dai *dai) + struct simple_util_dai *dai) { struct device *dev = simple_priv_to_dev(priv); @@ -228,7 +268,7 @@ static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, name, dai->clk_direction ? "OUT" : "IN"); } -static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) +static inline void simple_util_debug_info(struct simple_util_priv *priv) { struct snd_soc_card *card = simple_priv_to_card(priv); struct device *dev = simple_priv_to_dev(priv); @@ -241,7 +281,7 @@ static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) for (i = 0; i < card->num_links; i++) { struct simple_dai_props *props = simple_priv_to_props(priv, i); struct snd_soc_dai_link *link = simple_priv_to_link(priv, i); - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; struct snd_soc_codec_conf *cnf; int j; @@ -249,10 +289,10 @@ static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) dev_dbg(dev, "cpu num = %d\n", link->num_cpus); for_each_prop_dai_cpu(props, j, dai) - asoc_simple_debug_dai(priv, "cpu", dai); + simple_util_debug_dai(priv, "cpu", dai); dev_dbg(dev, "codec num = %d\n", link->num_codecs); for_each_prop_dai_codec(props, j, dai) - asoc_simple_debug_dai(priv, "codec", dai); + simple_util_debug_dai(priv, "codec", dai); if (link->name) dev_dbg(dev, "dai name = %s\n", link->name); @@ -270,7 +310,7 @@ static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) } } #else -#define asoc_simple_debug_info(priv) +#define simple_util_debug_info(priv) #endif /* DEBUG */ #endif /* __SIMPLE_CARD_UTILS_H */ diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 5b18a4af022f..ecbd26dd7dfa 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -41,7 +41,7 @@ static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data, } } -void asoc_simple_parse_convert(struct device_node *np, +void simple_util_parse_convert(struct device_node *np, char *prefix, struct asoc_simple_data *data) { @@ -62,7 +62,7 @@ void asoc_simple_parse_convert(struct device_node *np, snprintf(prop, sizeof(prop), "%s%s", prefix, "convert-sample-format"); of_property_read_string(np, prop, &data->convert_sample_format); } -EXPORT_SYMBOL_GPL(asoc_simple_parse_convert); +EXPORT_SYMBOL_GPL(simple_util_parse_convert); /** * asoc_simple_is_convert_required() - Query if HW param conversion was requested @@ -71,15 +71,15 @@ EXPORT_SYMBOL_GPL(asoc_simple_parse_convert); * Returns true if any HW param conversion was requested for this DAI link with * any "convert-xxx" properties. */ -bool asoc_simple_is_convert_required(const struct asoc_simple_data *data) +bool simple_util_is_convert_required(const struct asoc_simple_data *data) { return data->convert_rate || data->convert_channels || data->convert_sample_format; } -EXPORT_SYMBOL_GPL(asoc_simple_is_convert_required); +EXPORT_SYMBOL_GPL(simple_util_is_convert_required); -int asoc_simple_parse_daifmt(struct device *dev, +int simple_util_parse_daifmt(struct device *dev, struct device_node *node, struct device_node *codec, char *prefix, @@ -113,9 +113,9 @@ int asoc_simple_parse_daifmt(struct device *dev, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_parse_daifmt); +EXPORT_SYMBOL_GPL(simple_util_parse_daifmt); -int asoc_simple_parse_tdm_width_map(struct device *dev, struct device_node *np, +int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np, struct asoc_simple_dai *dai) { u32 *array_values, *p; @@ -158,9 +158,9 @@ int asoc_simple_parse_tdm_width_map(struct device *dev, struct device_node *np, return ret; } -EXPORT_SYMBOL_GPL(asoc_simple_parse_tdm_width_map); +EXPORT_SYMBOL_GPL(simple_util_parse_tdm_width_map); -int asoc_simple_set_dailink_name(struct device *dev, +int simple_util_set_dailink_name(struct device *dev, struct snd_soc_dai_link *dai_link, const char *fmt, ...) { @@ -181,9 +181,9 @@ int asoc_simple_set_dailink_name(struct device *dev, return ret; } -EXPORT_SYMBOL_GPL(asoc_simple_set_dailink_name); +EXPORT_SYMBOL_GPL(simple_util_set_dailink_name); -int asoc_simple_parse_card_name(struct snd_soc_card *card, +int simple_util_parse_card_name(struct snd_soc_card *card, char *prefix) { int ret; @@ -207,7 +207,7 @@ int asoc_simple_parse_card_name(struct snd_soc_card *card, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_parse_card_name); +EXPORT_SYMBOL_GPL(simple_util_parse_card_name); static int asoc_simple_clk_enable(struct asoc_simple_dai *dai) { @@ -223,7 +223,7 @@ static void asoc_simple_clk_disable(struct asoc_simple_dai *dai) clk_disable_unprepare(dai->clk); } -int asoc_simple_parse_clk(struct device *dev, +int simple_util_parse_clk(struct device *dev, struct device_node *node, struct asoc_simple_dai *simple_dai, struct snd_soc_dai_link_component *dlc) @@ -258,7 +258,7 @@ int asoc_simple_parse_clk(struct device *dev, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_parse_clk); +EXPORT_SYMBOL_GPL(simple_util_parse_clk); static int asoc_simple_check_fixed_sysclk(struct device *dev, struct asoc_simple_dai *dai, @@ -276,7 +276,7 @@ static int asoc_simple_check_fixed_sysclk(struct device *dev, return 0; } -int asoc_simple_startup(struct snd_pcm_substream *substream) +int simple_util_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); @@ -334,9 +334,9 @@ int asoc_simple_startup(struct snd_pcm_substream *substream) } return ret; } -EXPORT_SYMBOL_GPL(asoc_simple_startup); +EXPORT_SYMBOL_GPL(simple_util_startup); -void asoc_simple_shutdown(struct snd_pcm_substream *substream) +void simple_util_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); @@ -363,7 +363,7 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream) asoc_simple_clk_disable(dai); } } -EXPORT_SYMBOL_GPL(asoc_simple_shutdown); +EXPORT_SYMBOL_GPL(simple_util_shutdown); static int asoc_simple_set_clk_rate(struct device *dev, struct asoc_simple_dai *simple_dai, @@ -424,7 +424,7 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai, return 0; } -int asoc_simple_hw_params(struct snd_pcm_substream *substream, +int simple_util_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); @@ -494,9 +494,9 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_hw_params); +EXPORT_SYMBOL_GPL(simple_util_hw_params); -int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, +int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); @@ -518,7 +518,7 @@ int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_be_hw_params_fixup); +EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup); static int asoc_simple_init_dai(struct snd_soc_dai *dai, struct asoc_simple_dai *simple_dai) @@ -609,7 +609,7 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, return 0; } -int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd) +int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd) { struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); @@ -633,9 +633,9 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd) return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_dai_init); +EXPORT_SYMBOL_GPL(simple_util_dai_init); -void asoc_simple_canonicalize_platform(struct snd_soc_dai_link_component *platforms, +void simple_util_canonicalize_platform(struct snd_soc_dai_link_component *platforms, struct snd_soc_dai_link_component *cpus) { /* @@ -651,9 +651,9 @@ void asoc_simple_canonicalize_platform(struct snd_soc_dai_link_component *platfo if (!platforms->of_node) snd_soc_dlc_use_cpu_as_platform(platforms, cpus); } -EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform); +EXPORT_SYMBOL_GPL(simple_util_canonicalize_platform); -void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, +void simple_util_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, int is_single_links) { /* @@ -668,9 +668,9 @@ void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, if (is_single_links) cpus->dai_name = NULL; } -EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_cpu); +EXPORT_SYMBOL_GPL(simple_util_canonicalize_cpu); -void asoc_simple_clean_reference(struct snd_soc_card *card) +void simple_util_clean_reference(struct snd_soc_card *card) { struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link_component *cpu; @@ -684,9 +684,9 @@ void asoc_simple_clean_reference(struct snd_soc_card *card) of_node_put(codec->of_node); } } -EXPORT_SYMBOL_GPL(asoc_simple_clean_reference); +EXPORT_SYMBOL_GPL(simple_util_clean_reference); -int asoc_simple_parse_routing(struct snd_soc_card *card, +int simple_util_parse_routing(struct snd_soc_card *card, char *prefix) { struct device_node *node = card->dev->of_node; @@ -702,9 +702,9 @@ int asoc_simple_parse_routing(struct snd_soc_card *card, return snd_soc_of_parse_audio_routing(card, prop); } -EXPORT_SYMBOL_GPL(asoc_simple_parse_routing); +EXPORT_SYMBOL_GPL(simple_util_parse_routing); -int asoc_simple_parse_widgets(struct snd_soc_card *card, +int simple_util_parse_widgets(struct snd_soc_card *card, char *prefix) { struct device_node *node = card->dev->of_node; @@ -721,9 +721,9 @@ int asoc_simple_parse_widgets(struct snd_soc_card *card, /* no widgets is not error */ return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_parse_widgets); +EXPORT_SYMBOL_GPL(simple_util_parse_widgets); -int asoc_simple_parse_pin_switches(struct snd_soc_card *card, +int simple_util_parse_pin_switches(struct snd_soc_card *card, char *prefix) { char prop[128]; @@ -735,9 +735,9 @@ int asoc_simple_parse_pin_switches(struct snd_soc_card *card, return snd_soc_of_parse_pin_switches(card, prop); } -EXPORT_SYMBOL_GPL(asoc_simple_parse_pin_switches); +EXPORT_SYMBOL_GPL(simple_util_parse_pin_switches); -int asoc_simple_init_jack(struct snd_soc_card *card, +int simple_util_init_jack(struct snd_soc_card *card, struct asoc_simple_jack *sjack, int is_hp, char *prefix, char *pin) @@ -793,9 +793,9 @@ int asoc_simple_init_jack(struct snd_soc_card *card, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_init_jack); +EXPORT_SYMBOL_GPL(simple_util_init_jack); -int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) +int simple_util_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) { struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_component *component; @@ -842,9 +842,9 @@ int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) } return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_init_aux_jacks); +EXPORT_SYMBOL_GPL(simple_util_init_aux_jacks); -int asoc_simple_init_priv(struct asoc_simple_priv *priv, +int simple_util_init_priv(struct asoc_simple_priv *priv, struct link_info *li) { struct snd_soc_card *card = simple_priv_to_card(priv); @@ -956,9 +956,9 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_init_priv); +EXPORT_SYMBOL_GPL(simple_util_init_priv); -int asoc_simple_remove(struct platform_device *pdev) +int simple_util_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); @@ -966,9 +966,9 @@ int asoc_simple_remove(struct platform_device *pdev) return 0; } -EXPORT_SYMBOL_GPL(asoc_simple_remove); +EXPORT_SYMBOL_GPL(simple_util_remove); -int asoc_graph_card_probe(struct snd_soc_card *card) +int graph_util_card_probe(struct snd_soc_card *card) { struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); int ret; @@ -983,9 +983,9 @@ int asoc_graph_card_probe(struct snd_soc_card *card) return 0; } -EXPORT_SYMBOL_GPL(asoc_graph_card_probe); +EXPORT_SYMBOL_GPL(graph_util_card_probe); -int asoc_graph_is_ports0(struct device_node *np) +int graph_util_is_ports0(struct device_node *np) { struct device_node *port, *ports, *ports0, *top; int ret; @@ -1011,7 +1011,7 @@ int asoc_graph_is_ports0(struct device_node *np) return ret; } -EXPORT_SYMBOL_GPL(asoc_graph_is_ports0); +EXPORT_SYMBOL_GPL(graph_util_is_ports0); static int graph_get_dai_id(struct device_node *ep) { @@ -1066,7 +1066,7 @@ static int graph_get_dai_id(struct device_node *ep) return id; } -int asoc_graph_parse_dai(struct device *dev, struct device_node *ep, +int graph_util_parse_dai(struct device *dev, struct device_node *ep, struct snd_soc_dai_link_component *dlc, int *is_single_link) { struct device_node *node; @@ -1129,7 +1129,7 @@ int asoc_graph_parse_dai(struct device *dev, struct device_node *ep, return 0; } -EXPORT_SYMBOL_GPL(asoc_graph_parse_dai); +EXPORT_SYMBOL_GPL(graph_util_parse_dai); /* Module information */ MODULE_AUTHOR("Kuninori Morimoto "); From patchwork Tue Sep 26 06:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728197 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 DCF13EE020C for ; Tue, 26 Sep 2023 06:22:10 +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 5B8A1E7A; Tue, 26 Sep 2023 08:21:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5B8A1E7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709328; bh=OkgacE2MIFdYq5q3dRtZTEo6ZVVpFtdhg9sSX0yXucg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=JSoQFSrVHkDhXXB6gBM5CPhpgRwCuKt3JK+bnLlQWVdGo9v9IqlPJ2/3hox94xj8+ MikPSQ05SQ7mREDKyjmuV5Of5sXACxV3xuU5yuiK58jDHn2sSjLw1HfyUEkiltEcsN 070pGSe1zuXytuhE9g+N+6dFVVAdamso8CSj3tbE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B632BF80588; Tue, 26 Sep 2023 08:20:52 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 55B5AF8057D; Tue, 26 Sep 2023 08:20:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D27E0F8057C; Tue, 26 Sep 2023 08:20:48 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20728.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::728]) (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 CB1F2F8055C for ; Tue, 26 Sep 2023 08:20:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CB1F2F8055C 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=oo9o8hsc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZ+nZLlXvItxDOG6a8vasmT5iUD1WR1jhH5XXa3HDQNOc9oAfxLxBz28GUByme5MWXpwOzt81lLVOT5Xb++LDYs/faDNrYy78f/eq4/CGyQNPU8X6Dm46bnTmMwHBqdWS7VOqW21/00IGca9TptZRXMu+zW4eHkjvJxBB6+Q6iqqyqA+krXS2lT3iuquvMbzRTrfKZBPpHVXZmC9qsyu955GDGWSB6KiF9rTkP2hlkp4ZzRlZ7zDu52E0er3Dkts/WsfJKZufj5iRctfjV2c8i6SpanZT8XxhDp/76h0rdByAZ/XX3PYO8LS43/orEd5l8DC7x09cwMpzMJkIqTqqQ== 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=ng3UjHwPESLSdPE2RNGYiV/thDZL9hgYgYkNQaxVhCE=; b=FXNHwthZ36n9jy10UFJs1Pnt4mJoaKlzDelYhuoE3YJHfONsLAq8GaiiRAtGp6FYcC4C6XGipNXArNcHTTqJmVCDRRdGLGOSXlcKpuBK23y6+PyTxt/0RuVOEr8pIWJJIr1Rkip1q9Y1+MdJpou6I7Vq5ChymBW7nYR4arKWuY7eo7uRjFxIkl5jSC5UNiUPTvPnTGb0/G5uwhBCxg7xZ7FfcBY1uSUGhposgGrbH3G7gS97t6qm5Ra7MbMm05yZS/9U2ZchZd0QbCHvJe+TDUq6GQ/XFJ0w9/qkGWI27AfGEGvuN/O7Tkf0p8TtMVHSi55DZ8KFhetM+16v4BzJKQ== 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=ng3UjHwPESLSdPE2RNGYiV/thDZL9hgYgYkNQaxVhCE=; b=oo9o8hscx8venOR4nKtEDlBgR3O7XnJ96dahYCo/5NWWV63VTVGfUY2W3TVUOTAi1shcr7KRzcIFpc18evL6FFdzSvkFOOlHXR8c235nIHJAgMzFGaqnXLvz63ksN2SGLflzzL+5svgqw9Nuueh8SqVqBcjqyHmHdA+sI20zB6c= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:20:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:20:33 +0000 Message-ID: <87a5t9ihfy.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Lad Prabhakar , Liam Girdwood , Mark Brown , Takashi Iwai Cc: Takashi Iwai , alsa-devel@alsa-project.org Subject: [PATCH v2 03/54] ASoC: sh: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:20:33 +0000 X-ClientProxiedBy: TYCP286CA0114.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 98175454-b36a-4e4b-ead5-08dbbe58b0d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gaFQSmK4MQyWwQZ5FS9N9+dqn/yAJQKd91vtZXo8Dmt/oMi0Q+Oc+XyKrJaDpEixYs2ZcRl56dMSplq44spqn3QfQcwAdfP7kJQBcMapB33dh1pCYMPe7f61VswjPc3QZdBu+Z2g3Pb8Nxc/qevljk4jXoutXeqs9b6GJMyh6R3HuyaDmLaYTATlbyG6Qk+m0br/GY6gOExHJ/i9nwNv3dygCpCm1rhOqAXTQ0QnRx/yzZjFNinpqACOxk48T30qrrhwuznk7aajlOT1cevbsG1TnEPxESObo8SoQd1yDDGauh0zrNLEJToYfG+OEXheR54JhXLkGcGEOVoeKHQvzNoz2+gyfI+N0RYcEaxGzuy+wXffoc55sIpjAvcuSlr0Vfm/zIy3stKUG673RJAsg9ovnDSMupW9W3zntpok1QIAQEUIfKJsQRlzgmV2Nm8GE9go4kcDlGwU8dmpx8oQjFVsrGDxF9axBe107oJF3gQmOl6ifMWIZc2EiT169UlWxwjhGHrJbYBoRAFAYDGXBSZG2qwFP0BIKVSz8hVnhC1ZMOotXfIbM5AiSuHByHgiBwCGYCHh+vvT1Y5d+MROflZzZ63LUey/x/BVMLI+b5dhxmKO5hYMPhu8PG6VIes8WxQ+P4YZvktVsoBe2RnE0Q== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d0zLM1c3XuZkyfFGRFYq/ef+LIs3HCb4+i0nf5yWVf5xLTHmi57U4itv4FRQl3DsLyf8HbIcrUmcdl62WbWuG+YUTwtPTUMqR6RZmxrJSbRX5xGBYIaYEyBegtec6AzppudcPwGzxu6/0XrTW5TMIrIQ79Yyp+kmatcjchj/e2ihG9+uAavihEin4x3yui0YBJtQ+OopXKCu/6gFvzt3oaUzUhOe5d/LjvujzpFg4nPr9CR6+HQ0eHtrB/iiaS5FZ9W4qW+ZFX99pH79uih0KHJLY8FxUrHjvgNtiOGiA84AyTGalsLdzGyMoP3PE6cnpGQOAQvkdrogw4GrPLzW65k+hQJStxErE6VDCpJpq3Dpt2XWBoxkszzHkOymignIwBXhKtLVjdH7p/tBlNHNXSgLsGLbKix/pa1G8baFYWQGb/7Q0szzwb6WkxId6w9T8+nEPmfLMrr7oOePS+Oy2rxXGWcf9gUwZRpwlLLCBB39mXSNs5ZVOP3NM+TzLEooG7668hgmC99hhxnOioxbEhrYm9YdNK3+fk62j7u0IqDeUEHdphpfC4tZ5E/6QJvxKiaI4u6oGL/C+aJFYLWAa5o3r80CAs7/nHzt6jJKV+f4MzeEIZBSsrfPSMelhurHvtE/YwxeGuIecUbggPJnQuZLCZ6DUQyFgk6FXpV+QWIhJA70Jb+3uBRyiyJM5NWWahT3SAMHv9vTjKRRmxzysUJ7HFeEqQsKoep5Z6yCHruYAHz4zlyxjEIjz7rCy9ujVMFTpxbPacrbbRrvxamITbmCjKr6YJleXpgNL6C6mFcTef8Tu8ECIjxN9RY43+IHrIEHic1mIqNVaREUJBN9IdIFxLnrTI7edD2jvyo7oKTk1IzXFr2D2dSQK6+6/43gksMm8Mtr0TuvBCPtcAaL5LKlrrFbSpLvIe0us5O9cRMqSZvFboeejxPsoOnTr2+F3aG5chVDigvD+Smy4TSgb/JUSiRKVL2kL/XA581B4yADpHYurUwxTuOxqx04K9xzLd89BzJC41jp7chHgMKZBsxHNugjA41YAP3iQfNKaZYcWVR+4dWY0nWMHiXxy2afdCUlavAyQ8UPGMKkP3IopLHrsuclXSnuaU5Ux2/8QFS356R9LAEJ/GpZACWlunVbUcH7rSIlkKmnKNq0Xn5yrU/C7rVTs5mAI18gnMXDZML9g9fO+t6tn7JnkrPbR1c7rZv556undYAE28Eu1wRcZOsOAUiAaS3+gaqCQlz5K+GMqkM/7Wi7UlJ8hdjD1WFUJkkYDOcy0PvbFPIIXR2da1ncknP91SCZ2HnsKIlX5aZilgn2WQwWzedB86urjNzkx0esGMJQqw8bNEqEFgZ4XeV30JD8JCfW1fx2dvKOM/ChDVll/7YJNHbqXN8eZLrM+bU28m6Z+ILM2uQOcHW7E7p0W4C/D6DkRUVt4qY1H8UjfiJB4XzHLPkoghDCM2Kj9DCRp8Kj3UBdvFABtyyjlQM0JJV0Nj6ResNxBuoUdzNqTu0Wgk/vkXvj5ZzrL6CPbieJ5V788dNVerE2q0SMcKHLHrZQoIJWxHHEAF6oCvnZIBCgkRsd/Vv3EL9p29xBjBtgtlBT3NR+fJZUtlYSGYry4gtRNP2W5MliU/WDCfg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98175454-b36a-4e4b-ead5-08dbbe58b0d7 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:20:33.9078 (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: 76O6u/YgzJmZlwQSWspSe5pmiwBFj1onp/pdk4YkM7DcKM17YtBg9oamvFlekeaKQDRPs32xCuEE95FZTA+i/Zjf7tYPa60sAjQF/bicJgxVKJ/pIpCPo/81xbfH/AHc X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: JINU66S6345LXT76QABAX3NPDNBYJESI X-Message-ID-Hash: JINU66S6345LXT76QABAX3NPDNBYJESI X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/sh/dma-sh7760.c | 28 ++++++++++++++-------------- sound/soc/sh/fsi.c | 4 ++-- sound/soc/sh/migor.c | 10 +++++----- sound/soc/sh/rcar/core.c | 6 +++--- sound/soc/sh/rz-ssi.c | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 121e48f984c5..9e26df823b76 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c @@ -118,8 +118,8 @@ static void camelot_rxdma(void *data) static int camelot_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id]; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int ret, dmairq; @@ -132,7 +132,7 @@ static int camelot_pcm_open(struct snd_soc_component *component, ret = dmabrg_request_irq(dmairq, camelot_rxdma, cam); if (unlikely(ret)) { pr_debug("audio unit %d irqs already taken!\n", - asoc_rtd_to_cpu(rtd, 0)->id); + snd_soc_rtd_to_cpu(rtd, 0)->id); return -EBUSY; } (void)dmabrg_request_irq(dmairq + 1,camelot_rxdma, cam); @@ -141,7 +141,7 @@ static int camelot_pcm_open(struct snd_soc_component *component, ret = dmabrg_request_irq(dmairq, camelot_txdma, cam); if (unlikely(ret)) { pr_debug("audio unit %d irqs already taken!\n", - asoc_rtd_to_cpu(rtd, 0)->id); + snd_soc_rtd_to_cpu(rtd, 0)->id); return -EBUSY; } (void)dmabrg_request_irq(dmairq + 1, camelot_txdma, cam); @@ -152,8 +152,8 @@ static int camelot_pcm_open(struct snd_soc_component *component, static int camelot_pcm_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id]; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int dmairq; @@ -174,8 +174,8 @@ static int camelot_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id]; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; if (recv) { @@ -192,8 +192,8 @@ static int camelot_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id]; pr_debug("PCM data: addr 0x%08lx len %d\n", (u32)runtime->dma_addr, runtime->dma_bytes); @@ -240,8 +240,8 @@ static inline void dmabrg_rec_dma_stop(struct camelot_pcm *cam) static int camelot_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id]; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; switch (cmd) { @@ -268,8 +268,8 @@ static snd_pcm_uframes_t camelot_pos(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id]; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; unsigned long pos; diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 1051c306292f..d0931f4c9976 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -406,9 +406,9 @@ static int fsi_is_play(struct snd_pcm_substream *substream) static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - return asoc_rtd_to_cpu(rtd, 0); + return snd_soc_rtd_to_cpu(rtd, 0); } static struct fsi_priv *fsi_get_priv_frm_dai(struct snd_soc_dai *dai) diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 7082c12d3bf2..5a0bc6edac0a 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -45,8 +45,8 @@ static struct clk_lookup *siumckb_lookup; static int migor_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; unsigned int rate = params_rate(params); @@ -67,7 +67,7 @@ static int migor_hw_params(struct snd_pcm_substream *substream, clk_set_rate(&siumckb_clk, codec_freq); dev_dbg(codec_dai->dev, "%s: configure %luHz\n", __func__, codec_freq); - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), SIU_CLKB_EXT, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), SIU_CLKB_EXT, codec_freq / 2, SND_SOC_CLOCK_IN); if (!ret) @@ -78,8 +78,8 @@ static int migor_hw_params(struct snd_pcm_substream *substream, static int migor_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); if (use_count) { use_count--; diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index b30e78cd7478..dd256bf7cdd4 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -690,9 +690,9 @@ static void rsnd_dai_stream_quit(struct rsnd_dai_stream *io) static struct snd_soc_dai *rsnd_substream_to_dai(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - return asoc_rtd_to_cpu(rtd, 0); + return snd_soc_rtd_to_cpu(rtd, 0); } static @@ -1574,7 +1574,7 @@ static int rsnd_hw_params(struct snd_soc_component *component, struct snd_soc_dai *dai = rsnd_substream_to_dai(substream); struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); /* * rsnd assumes that it might be used under DPCM if user want to use diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index fe79eb90e1e5..f5f102d878c7 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -158,9 +158,9 @@ static void rz_ssi_reg_mask_setl(struct rz_ssi_priv *priv, uint reg, static inline struct snd_soc_dai * rz_ssi_get_dai(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - return asoc_rtd_to_cpu(rtd, 0); + return snd_soc_rtd_to_cpu(rtd, 0); } static inline bool rz_ssi_stream_is_play(struct rz_ssi_priv *ssi, From patchwork Tue Sep 26 06:20:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726451 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 BA937EE020C for ; Tue, 26 Sep 2023 06:22:21 +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 E657FE0F; Tue, 26 Sep 2023 08:21:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E657FE0F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709340; bh=ePtwWAzaQSDRMPkQJqThVJATn+XDbco3CaYJMBtFfo0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EWpYqV3ukNjxrlXwStYNfk5edTpSsL7U0tgEd0r1utd0sXcCJqPUTwnKwLi7sh1Va YwL1S2R6LYNls7z9Pgt0BmNxDug14c+V+ZaWFeN6C7iWoY4GSDO0jHlKUXp+pXdN7f +1QG4TSsQmjWjAVV5zL1tHmWiUskbPQQ8suUp6G8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 587DCF805A8; Tue, 26 Sep 2023 08:21:00 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DE7B3F80571; Tue, 26 Sep 2023 08:20:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1D388F80580; Tue, 26 Sep 2023 08:20:56 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72c]) (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 A53C0F80571 for ; Tue, 26 Sep 2023 08:20:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A53C0F80571 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=W1Eap+9M ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XG/X5Nhx/cqWBQe5Rc6yxVy9yYb1yqm6swDpqMMfCWGAZNDfyb9op3RcV80nWBZZQGd180EamVoRTgeUOqgAvToBukWEjbjYq37NIKwdXwHho4NOkpM8XNfut2NXUdnWT/u5qowzzFQzwK8DDecYXw4UBG0ZuwP+Vexk6+pO896MyL/JvC1ic1UfKDWGB4K1USHhmVUC8MhpilMuPccXQaOqLHBKHqW6/MH+ex5qDQk2K9GaFi7uzpeRQR7u81qOhryM6aLakRA67lBEeauqq1pZinzBCVrFIvsAGsPbJzhvU+RqBQWuvB9M4U2qAOGfe2oQJ9PdmwLAY6BVz30zrg== 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=6JD6q9HmtdD0KL3f6LNrfVck2CSTBjPrphF1LXAQvL8=; b=cfhZBx1zgQpSFWKiwa+KM0ftom88RzHpjLhY995yZjZFYVz9BkFnoY5EYKw2+poqfMbk4X4H76SpTrGhGz6HF1GqgLulKzgsjQ8a6az/Yj/bsWFWNw8dPZbuFDbVLxqYYGcK99mAbPB+rV62lqjUObKjuA0O3reBO7e24U+XmmYFn5UBgimCYECMY2XDkrxXTcSvcO8KFGDt565ai9eOH0r/TWIW0UNBXiVbjzKVN/u20ojLhkra4fF9G7ZwA5+XqAv9R8Lpgy0CvADe19nDYMNgql0lCT8Rm8ltFbZbKYw8+u7x3IfrU8xIYxd0RyLdLCbK2nmneDw/0BOBToNdKw== 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=6JD6q9HmtdD0KL3f6LNrfVck2CSTBjPrphF1LXAQvL8=; b=W1Eap+9MifUiNE4lFGDALLsIsbN6LwzG3bS5lRXztgOBz7J34VjWJ7CgqsveJgOax8yacRKrU3jWKe+lJ9qdjezjVRFo5l1MXtt+uiT44nfTo6YNg0ceBXBxA+Gf0Fgf+GT9ldJBDUzE3sdyucfNvN4ZrVI9fsWcwa3UxFIG6og= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:20:45 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:20:45 +0000 Message-ID: <878r8tihfn.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Arnd Bergmann , Jarkko Nikula , Jaroslav Kysela , Liam Girdwood , Mark Brown , Peter Ujfalusi , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 04/54] ASoC: ti: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:20:44 +0000 X-ClientProxiedBy: TYCPR01CA0139.jpnprd01.prod.outlook.com (2603:1096:400:2b7::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_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 9259813c-56d8-4a01-8b1a-08dbbe58b75c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HFN1Gw03XPz5cC8m4F/k/Hc1DJpS8RLrEslNHnP00g0231K8gzVGjbm9vryqTEpN+vZFJVpSodOSZwUyT6G4lqPb56Zr8SSSDkRhsnuw2Kn1o5tvodPOoQN7DkYcQca+taTnORXAeQIPkKBLzeCInDZroyR7zcTey8pmTWHX4Z/5w6184vSu7Xc0vPD/KqpIfJ+g6FxsMAmm8DfdPdqyoPxjlZyPIwx+BkNF0Sfnni3KfonU779dJi58LcXwRLnt+JR1vvWvXbXKpDeJy4zbvqk1thbatmjz7imZk0TMlsI15EQ+C7sUnLFBYaw3oHGI8Syh3PG8FOFjX1s8Q2hxaWE1l+FnYCWSmljgNdDpWWTZlFdvBrC/phw/N3DGiGGtuF3Uh5X72cvkoVDcwD8OYdpJnO6Z7a6d/Mb2HiXr+qsOCt84H86Es4DDvyfzYD/XeArASq1G7WHgNIsrehtF7F0k7g7KxKPZ+/PnQzLeHzw7NyfMHpEe5r9jaHCDerDWdUUcajNpOvm1b06Fj6yx/AJcuYqjBanXrad/mOhgdJCioSJ2uIkBR5ZW47my3wcIoxyZO24qxwwf0zqB0PUCuVB1aeFDtN0Zw1UlkAVaIdtS4wIv+X+e/Pkyfr8+/QvWS8+zd71UoM7sMQ/ld7cYkQ== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(30864003)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jdzc6p+SaKvmwgXCi7oc5ZAuv+zDAlWICPpRjobETturhU5Zr+suLhfLKL5As7jgC8u4/ggdPYoO78zVs3RBwT6teVnKEPj6fMjszkMWLhcHkPrhaTnP9OyZCKxNUXNFPBKh24M3DkWMdSxq5ICoN45tyX+eEJQP3rTwsadbTaioTI4/w5F2vBTv0EKRI12WHNtx2hdS9vK4YmU63K84zGfI01kSWYxpUI3ipoTrZyDOjn4wERkppWLmewRhQLEzK0PxabXx8O+EMmakjluvhOcECmI9cBl2oISoEdSwrp24ED5lMBAE3fX+LRX/z8S750HJe6Wsdw42uXWgglPhcJZBbR/04HSAPuyQrveBnz/rgBTqawVJ31cA2/BX0AgML2CqFsqYWrlhj67Ew0PCx4uGUIHHznQVvDu5a1ycZA+iEFhB4KBaISHSiJDf60jq0GTfdmDBhQ8d6sWJqwmocyvdgLeKZau1R9pq1wp6XRSv4gDOzkdyxHr7OqeoEOrWGe1duksFIqIEdEjq/CLEPe9WE2/l77wc0A6eHSfUkyotbMu58WkWxsy+fmiBJjibmoqZzJZCrWd0IxXwjis3ppAvix1QYBu3GDGKqqdGGQas+Qc1WqkiTjOc3W0ezCEuk7bMxSim/cttuEty6sU1p/rUMCG8irQvd/q86xf739ITtIzPdGCB4tynKMeE6pKCBCz3aID0wczBsxTIdGGDCSbu7boRTQCJJKY82XM7jjQqmaSXidxImezHwPsiP7znz1uQgpG702Mch0VImDoaS0uDwSy2T6h/c7+OFeki3D8ERGWZ5rVPGmLjb5FXl8ptKrljCNc5Ea66H2EJvPmdCMuw+734dedgOdw329XSjxbFZNJtHnMjSxWOl8k0ZjDn8AiC4Z58ED3IYFb4WZTqdxizDhaAkx/JwtdsLExX4YgnyTD0LZsY3XCFVM+HctUcnEI5xKaMVunxtaRH6gWCtSWiqJwbfgdkCTzRcO9KanySdzyaSbcQOjtjNO3x3T/v/1f3XUrrgWRWQgx/acJ6doZdr571a4u0WCeyIYi9ccv1u+8KwrMFHhOiMTxEjEmhTrXyfzpNLPUIGDOH7wsyiJQK9bvIAZ8GS4pS+athr1kX9XEjS5n1ggoxBlITCelKn/jiuRASYUfodjoIv/s4q4wFz1rALlkNZ2VFLcAdiI0DjIv0bLCrmrH1XoAVPKypqy3yCI7x/7tCqwEUxdB9KWudOPuge0tMrOqe2Sr5EcIykWLhjM5rqTz8o8Ykiu6YmnE8DJy4NlLCuxH8AIMq3whkDS5PtQIUXaiUCXfiIqCn5WueCVUOp1i6AfnRY3qu9Q5hKFM7S1m5K3j5UdCWv/Ac08F3oblyV4mURE/+5w6mFtWWeYTxXQnmFH5pvlxaBOHkYZGu5/doCWLg8hHVCMAFbcPibxtmcrV0JXhHELu3bcWF3CbZYAJlvTt92lb6eztfYBph9Tt7Rv0L3z8oczlDgeaRCsidA6L9Z4yD2xRIot6QoQCZQVdcB0w4Ejl3kqRxtVhjkFZ4hnt7RGwIVaRCUestQDU3OCRBncVmj4izXPBlEeiySAAoBi+Vj03a/VbRL70NVs0YJo6wP6odhardWCGyuSALSGX2+eIlsYY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9259813c-56d8-4a01-8b1a-08dbbe58b75c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:20:45.0672 (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: tT+N8sTCCca87WHHzAGbx5GYXRH0CbW7jU7wufgEimcRGY6Qvwnz+J+SH+ZxEyDOWV1q1rab9pZQ+1C+0rr0li1RyNsTRdas0vmariVK55NDr1f9CUV/KGOANjV7Lifu X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: GR6NXDIR35XVLVB4KYTPQSUIH2AWCJLV X-Message-ID-Hash: GR6NXDIR35XVLVB4KYTPQSUIH2AWCJLV X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/ti/ams-delta.c | 4 ++-- sound/soc/ti/davinci-evm.c | 10 +++++----- sound/soc/ti/j721e-evm.c | 12 ++++++------ sound/soc/ti/n810.c | 6 +++--- sound/soc/ti/omap-abe-twl6040.c | 10 +++++----- sound/soc/ti/omap-hdmi.c | 2 +- sound/soc/ti/omap-mcbsp-st.c | 2 +- sound/soc/ti/omap-mcbsp.c | 8 ++++---- sound/soc/ti/omap-mcpdm.c | 2 +- sound/soc/ti/omap-twl4030.c | 2 +- sound/soc/ti/omap3pandora.c | 6 +++--- sound/soc/ti/osk5912.c | 4 ++-- sound/soc/ti/rx51.c | 6 +++--- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index 371943350fdf..687c1d969285 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -460,14 +460,14 @@ static void ams_delta_shutdown(struct snd_pcm_substream *substream) static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_card *card = rtd->card; struct snd_soc_dapm_context *dapm = &card->dapm; int ret; /* Codec is ready, now add/activate board specific controls */ /* Store a pointer to the codec structure for tty ldisc use */ - cx20442_codec = asoc_rtd_to_codec(rtd, 0)->component; + cx20442_codec = snd_soc_rtd_to_codec(rtd, 0)->component; /* Add hook switch - can be used to control the codec from userspace * even if line discipline fails */ diff --git a/sound/soc/ti/davinci-evm.c b/sound/soc/ti/davinci-evm.c index 544cb3da50eb..ae7fdd761a7a 100644 --- a/sound/soc/ti/davinci-evm.c +++ b/sound/soc/ti/davinci-evm.c @@ -28,7 +28,7 @@ struct snd_soc_card_drvdata_davinci { static int evm_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *soc_card = rtd->card; struct snd_soc_card_drvdata_davinci *drvdata = snd_soc_card_get_drvdata(soc_card); @@ -41,7 +41,7 @@ static int evm_startup(struct snd_pcm_substream *substream) static void evm_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *soc_card = rtd->card; struct snd_soc_card_drvdata_davinci *drvdata = snd_soc_card_get_drvdata(soc_card); @@ -52,9 +52,9 @@ static void evm_shutdown(struct snd_pcm_substream *substream) static int evm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_card *soc_card = rtd->card; int ret = 0; unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c index 6a969874c927..b4b158dc736e 100644 --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -251,11 +251,11 @@ static int j721e_rule_rate(struct snd_pcm_hw_params *params, static int j721e_audio_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct j721e_priv *priv = snd_soc_card_get_drvdata(rtd->card); unsigned int domain_id = rtd->dai_link->id; struct j721e_audio_domain *domain = &priv->audio_domains[domain_id]; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; unsigned int active_rate; int ret = 0; @@ -309,12 +309,12 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream) static int j721e_audio_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct j721e_priv *priv = snd_soc_card_get_drvdata(card); unsigned int domain_id = rtd->dai_link->id; struct j721e_audio_domain *domain = &priv->audio_domains[domain_id]; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; unsigned int sysclk_rate; int slot_width = 32; @@ -376,7 +376,7 @@ static int j721e_audio_hw_params(struct snd_pcm_substream *substream, static void j721e_audio_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct j721e_priv *priv = snd_soc_card_get_drvdata(rtd->card); unsigned int domain_id = rtd->dai_link->id; struct j721e_audio_domain *domain = &priv->audio_domains[domain_id]; @@ -403,7 +403,7 @@ static int j721e_audio_init(struct snd_soc_pcm_runtime *rtd) struct j721e_priv *priv = snd_soc_card_get_drvdata(rtd->card); unsigned int domain_id = rtd->dai_link->id; struct j721e_audio_domain *domain = &priv->audio_domains[domain_id]; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; unsigned int sysclk_rate; int i, ret; diff --git a/sound/soc/ti/n810.c b/sound/soc/ti/n810.c index ed217b34f846..6c72c2a50dec 100644 --- a/sound/soc/ti/n810.c +++ b/sound/soc/ti/n810.c @@ -84,7 +84,7 @@ static void n810_ext_control(struct snd_soc_dapm_context *dapm) static int n810_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2); @@ -100,8 +100,8 @@ static void n810_shutdown(struct snd_pcm_substream *substream) static int n810_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int err; /* Set the codec system clock for DAC and ADC */ diff --git a/sound/soc/ti/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c index 805ffbf89014..fb8727a74436 100644 --- a/sound/soc/ti/omap-abe-twl6040.c +++ b/sound/soc/ti/omap-abe-twl6040.c @@ -45,8 +45,8 @@ static struct platform_device *dmic_codec_dev; static int omap_abe_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_card *card = rtd->card; struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); int clk_id, freq; @@ -77,8 +77,8 @@ static const struct snd_soc_ops omap_abe_ops = { static int omap_abe_dmic_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret = 0; ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_DMIC_SYSCLK_PAD_CLKS, @@ -166,7 +166,7 @@ static const struct snd_soc_dapm_route audio_map[] = { static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_card *card = rtd->card; struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); int hs_trim; diff --git a/sound/soc/ti/omap-hdmi.c b/sound/soc/ti/omap-hdmi.c index a3663ab065ac..29bff9e6337b 100644 --- a/sound/soc/ti/omap-hdmi.c +++ b/sound/soc/ti/omap-hdmi.c @@ -370,7 +370,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev) return -ENOMEM; card->dai_link->cpus = compnent; card->dai_link->num_cpus = 1; - card->dai_link->codecs = &asoc_dummy_dlc; + card->dai_link->codecs = &snd_soc_dummy_dlc; card->dai_link->num_codecs = 1; card->dai_link->name = card->name; diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c index b047add5d887..901578896ef3 100644 --- a/sound/soc/ti/omap-mcbsp-st.c +++ b/sound/soc/ti/omap-mcbsp-st.c @@ -475,7 +475,7 @@ OMAP_MCBSP_ST_CONTROLS(3); int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); if (!mcbsp->st_data) { diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index fdabed5133e8..bfe51221f541 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -720,8 +720,8 @@ static int omap_mcbsp_init(struct platform_device *pdev) static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream, unsigned int packet_size) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); int words; @@ -885,8 +885,8 @@ static snd_pcm_sframes_t omap_mcbsp_dai_delay( struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); u16 fifo_use; snd_pcm_sframes_t delay; diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c index d7d9f708f1fd..2b97f2e4f185 100644 --- a/sound/soc/ti/omap-mcpdm.c +++ b/sound/soc/ti/omap-mcpdm.c @@ -533,7 +533,7 @@ static const struct snd_soc_component_driver omap_mcpdm_component = { void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd, u8 rx1, u8 rx2) { - struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); mcpdm->dn_rx_offset = MCPDM_DNOFST_RX1(rx1) | MCPDM_DNOFST_RX2(rx2); } diff --git a/sound/soc/ti/omap-twl4030.c b/sound/soc/ti/omap-twl4030.c index 950eec44503b..a3ad1a2df1c7 100644 --- a/sound/soc/ti/omap-twl4030.c +++ b/sound/soc/ti/omap-twl4030.c @@ -38,7 +38,7 @@ struct omap_twl4030 { static int omap_twl4030_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int fmt; switch (params_channels(params)) { diff --git a/sound/soc/ti/omap3pandora.c b/sound/soc/ti/omap3pandora.c index a287e9747c2a..712e8ae5e804 100644 --- a/sound/soc/ti/omap3pandora.c +++ b/sound/soc/ti/omap3pandora.c @@ -31,9 +31,9 @@ static struct regulator *omap3pandora_dac_reg; static int omap3pandora_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; /* Set the codec system clock for DAC and ADC */ diff --git a/sound/soc/ti/osk5912.c b/sound/soc/ti/osk5912.c index 2790c8915f55..5f718f9ec1e5 100644 --- a/sound/soc/ti/osk5912.c +++ b/sound/soc/ti/osk5912.c @@ -38,8 +38,8 @@ static void osk_shutdown(struct snd_pcm_substream *substream) static int osk_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int err; /* Set the codec system clock for DAC and ADC */ diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c index 322c398d209b..d966c008be4d 100644 --- a/sound/soc/ti/rx51.c +++ b/sound/soc/ti/rx51.c @@ -90,7 +90,7 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm) static int rx51_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2); @@ -102,8 +102,8 @@ static int rx51_startup(struct snd_pcm_substream *substream) static int rx51_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); /* Set the codec system clock for DAC and ADC */ return snd_soc_dai_set_sysclk(codec_dai, 0, 19200000, From patchwork Tue Sep 26 06:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728196 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 8A151E8181F for ; Tue, 26 Sep 2023 06:22:57 +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 BBB22DF4; Tue, 26 Sep 2023 08:22:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BBB22DF4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709375; bh=KNVFpJJxdr6ofi3CMTVQmGTyJZEIlKErKwljSFoMFuM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=iQch1p4D7eTlaz3VxTxcSvAg8h+f1HIcRNiTkpCaJS4u+qckck/qTJtrVnONsWkf3 lamGUSEL4ZmjgDYJWEqTbOPicaMvB7hIFIYP5kov1C/Lx4NKkqDWC/Ef5ALfrf5Jym 7luLbV5KvyHxfKzzC93GX4LI+VLQn8BrdQd+Zzxc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 81323F805B3; Tue, 26 Sep 2023 08:21:10 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8682CF80571; Tue, 26 Sep 2023 08:21:09 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E959BF805AD; Tue, 26 Sep 2023 08:21:06 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20720.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::720]) (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 BDF66F80571 for ; Tue, 26 Sep 2023 08:20:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BDF66F80571 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=hPGDVM5Y ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D2pQT6+MXN9lLAErDsg5od1jpJy6L7L6xqbVrMF5iji/is0uZDXeLhgtbZYBmGp3dn2THWS0dGY+/jizQAYMxMJxBMGQUJkEikAXCoYiOdcSKvp5JLFGZmYTXQ/UKxy801cgSz1FgsD16Mr5jN6knH4x2czff3QVViTciicfLq6DE9gfs/CrLSOqkkNyEIl23aA9OY0H+CAqjEbAPkYjIYjU7d1zmbOSgkaG1eXBSHLP+q3KwrecnqA5Y6z7Fx1Lzvc2Ij6Yv3s61ReC+k7jblrS1bNC6ijCCJoQkw8g0agYJs9Yuqt6GMHb9cVSqOGqj4LOZJbGRlleo5DLh4v96A== 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=kdHg4tssfIOdzM98RRJLJtEDue65CI8ERFfm3w3Rn2k=; b=czaOj5jCy2M7uePDgh0582/iYKLxUKnN20ZZVHtwMprCaInwutkz/b1JZkltnIVMOTR1F9eZsgXmnvaJoN+u1cJVFgOPzwBotY24qCi1EDw854Vfhunu8XZvP0FpYHiez8N9AYVQbVjT5Qrmc6ohvMW6VadqM9f+l03pFUj8mBXj/1rd/ZzcvCh5PCeuznG02LV/c/Jk7GO22RdDIqSN5DIzlOLj8VMWyZDY9lcbXoRWRYdpuHB6vJHDh8PgRaqUc/PzmxvXQ2lcunIGZiQdumgzd5LVat2vFnO97sGvb09vJzVUFRbZ16W/YT6CQUhbTdAonMLdKjMTCrl6CBMI5w== 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=kdHg4tssfIOdzM98RRJLJtEDue65CI8ERFfm3w3Rn2k=; b=hPGDVM5Y3x7Se7y3Hx0gVp2S6fTcH/MgJTHmcQsTnfFEaJPwvc9ito+TjgesmUrjgXkZISyzqz/eJb5vCKd5w+9V75ogp97fPAXwyzpgi55rBQJ0o90WUXgZioudHoqVa+XbGOhOGUzK3sv9iceZWRefYFimTe0gFEqRuv1pG4g= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:20:53 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:20:53 +0000 Message-ID: <877codihff.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Daniel Mack , Haojian Zhuang , Jaroslav Kysela , Mark Brown , Robert Jarzmik , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 05/54] ASoC: arm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:20:53 +0000 X-ClientProxiedBy: TYCP286CA0064.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::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_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 9735e19a-69a8-44be-217d-08dbbe58bca4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lD9vF2nvZ7lOr3eR+7opupUQJFBtxcI8g6CN4wcuxvpJQvhzFBCot090dYjLVg6dA72DVL2EepgaNftYRvdiK14Kf4x2k/8Y0Rau2dfOkPtjnYdSr908geLTeRQMsHv8JXLdXEfqhUMWPXpex1MJ93qSOx5RZwIkQhR2D91xQaNHcLWLWsfnJZGJJ8AeN/HMELekVCwgBa75+ztxYjdlYxJOi2EMcvKBJ3yM+ISLz9cDtgSgCjsiHTx1TiHHON53tyhFj6L5WWifOAJxRWVD6crXOUcTyyCkW3N7KKLyn863VWSU5SbulLvwEHsqAdxEn+qaCYDPja+UXUYw2A4kcrDgb5n133Y2gXiVLOMq0liOaSruVk4NOJ+YtkkPTeRAOoyVp2Zuam0ANbMhAJiphbR+mf9a/qqk9zb4hj2z5RmbrMbJMVDj0fFNDtqa2iEdpGyH877gvjRIh1VyhfrgS/nr44kfojovjEge9m9a/N8IWNPrgmhsJF2KOp443hQJO8tpGmYtRhMzkad/dMaE2Gj053qhENgB+ycyO+EDyAEmwdSO5CSUww7v767lZycERIEYiakOdBBOS6E4HXN00t+Ivwpg7GBtuLlOtGHBKGAMe690UNcsk1S6nQxL999yJVthOBCWtYtP8E3Jgp4U285gv7quFjiBlQDd3rbknCo= 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003)(41080700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lwKPs7fuGwp+8sDk5mkjCWICTfbioVPdJMc8LPg4GDUtMHM/51zv56jH7Fynv+AHLU+TLJJa3/RBqVlWd7SnW6x+tpMeqAohPFvB+8hAoqWevsJ7uLYlH5oL6zcVJW8HsCDs+EgyGSQjgb9qFOqj1ZhFVG3LK0oP89tEnIQ8njnDXqedTPT9bWjSn/ByxumfqW5181Z3kD5mGgp6BxQ8vnCCHzyQ2UZzU+SIzLN5g2sABo4IzOZWVjZG4oDzRwVxFT9yJmXLaEl8AwULJpF3Qi8sFEu3943iIOqTfYCQGdgvzYP9wD9ZAmO1RqUV3ZNvA5wob463Irin+qjZP5oiFAYqbixOR9C4MqJsQMzSp1ZIx2gCQ4OMusyCBad+qr6mSKNCWHc8ED2RJychefmI5uYj7FALb99xQAGWPk9uYpp+INa+HgIzPwuXWA12oh0Q8U8gE2uIRWjeSYNwH+21cUMAAhWnNqb9JdJIOaKLMpN2JIrLqeRtmUs3ufrm1jJmY/s7q9SaXTYdYE8L2baXYGkyzKLlCbAFoUgNJHOM65jnc0uAWGeWsjqFDIIqeCYl836KWOmo4ZM4ZXKyWl3qeyeSy4Nut8dWwJbgppN8gBw3yewn6vaBFWsmCuTTQ9GXlEFYCx4h6aL9l8LZYbPnzw3fjOSRFz2TR43QDpiFHZDM4Kj8enq2BsHlWlTexUX8IiuS4L/E9cjk97kxhXxnydM9oL6uLrqzEhhy0bahU5NPKHSwcrsUAHAulIYYPWdgPw9nO0Z1+zp4orGr6fO+k0Fk6oee9jrvop27E8I+5fR6HdhDAn81Z9/DFVeoP07Kkh3S13S1amd39q6nC2bz3Qcao8DLOuU5upKuAiZlAOrJd3DWYuNHOunOi5Cp6NySOoBTE2qD45N0asLCPyTShGXH7B1JkNCIHO/2fYjttg6vQoG7C2cqusENHRGjyVgPlvIf0+evsCqkfTs8cmJA2NuVlSvTdaqoJ/4qvGAmRlUAfIvEazZo4t6BIuvEDbj4bw1bJ9UJ2BiNaw4lXuLuthr8w3ZPW1cYIM7AXKfHo57wCEoZ+vL/eFnq94YwnqhefA/U+GmJ/nqEMS8KyO2jSOzzyNqC39s6nGCeS9oZQD8+enS55KeOBHflvMcld2lTBW0zdPcsHwun1eWxFLkOAhoubI1LKQ6nAIPIvscaKjG21RA1809mqo1cXPEKrvTteXtt0OjTj4Ky5hvWpbNTeTjCNJHoe1DcEkTXw+lBnl1UjuO7qkyD2lMhsjdUTEV19XY/IneQEb5xhJD3tKr6R9C8LVn6v0kH1O2E/8i20fiwcApq6IsTSP/qW4z2zKllpy9bOQnpZzW+1nKEzcVQv/ySB8+eEYd9GLv1Dj7B7v7XEuT6c+iL/CH1KTsgm9KYwoZKFeqLJrOKdMHsljAeFzRJ5y1FEmrrI/0nPyQ1XgNe9aY95NbhXi8kqambJwLgRttot6TXXnxgY5V7CEKhYseGt9BNGZxUXoFXdbGcVEMrAmkHT3Z9SZutkeVGmUaDHcHqAq/93WTJm3H9/hXTSZUAeN/vFgw/3V535KFplP7Q3/XP4peDh1gI3L62qR6kYFsaZMYsaIyxR6Hnm7pNXinF3998esXkOACDiaPLfxk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9735e19a-69a8-44be-217d-08dbbe58bca4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:20:53.5724 (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: 679IFz7cf4ei9f0c38jSwXrLfElmQSBiDRX6gxh5B203ttSud7Gn3M0RUkQMN8voV4Z1+Cj/+72U4Oh8h3u6fuy+XRLHY6k2Tx58H21ONbhmQom/4evgf1nQvYb3vlAF X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: DEUOUDR3XTUHYHT6QPBGSI2ZK2XE6BLU X-Message-ID-Hash: DEUOUDR3XTUHYHT6QPBGSI2ZK2XE6BLU X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/arm/pxa2xx-pcm-lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 0a48805e513a..51d2ff80df16 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c @@ -38,7 +38,7 @@ int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, struct dma_slave_config config; int ret; - dma_params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!dma_params) return 0; @@ -47,7 +47,7 @@ int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, return ret; snd_dmaengine_pcm_set_config_from_dai_data(substream, - snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream), + snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream), &config); ret = dmaengine_slave_config(chan, &config); @@ -86,7 +86,7 @@ int pxa2xx_pcm_open(struct snd_pcm_substream *substream) runtime->hw = pxa2xx_pcm_hardware; - dma_params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!dma_params) return 0; @@ -111,7 +111,7 @@ int pxa2xx_pcm_open(struct snd_pcm_substream *substream) return ret; return snd_dmaengine_pcm_open( - substream, dma_request_slave_channel(asoc_rtd_to_cpu(rtd, 0)->dev, + substream, dma_request_slave_channel(snd_soc_rtd_to_cpu(rtd, 0)->dev, dma_params->chan_name)); } EXPORT_SYMBOL(pxa2xx_pcm_open); From patchwork Tue Sep 26 06:21:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726450 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 6CAF4E8181F for ; Tue, 26 Sep 2023 06:23:01 +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 74320E86; Tue, 26 Sep 2023 08:22:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 74320E86 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709379; bh=JuPDrA5V+0dCyXtI2haWaEByqLHGvFCT/8S5pgNGZDc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=FkxoqF3utiZ6cSyhO2pSDtsoRDn9Orr3rAHzRAVzjyHd6wosQMKyvjyuJt4bg2SuD bGWdaZJq+Xxzakn6WCNIVwvkUaCb0E0cwf7lbbn6piIKzhO+iU8hiWUTroT9GoDoBA pJiuYGGwT5ciGkImlTGWdk+eYGk0jK9ribhAjFvU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C0CF6F8057A; Tue, 26 Sep 2023 08:21:17 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 04AF2F80290; Tue, 26 Sep 2023 08:21:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 26CAFF805B5; Tue, 26 Sep 2023 08:21:14 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20720.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::720]) (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 73C8DF8016A for ; Tue, 26 Sep 2023 08:21:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 73C8DF8016A 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=RBAM+8E0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MKqeU400ijtuze48gcyS9W3dkT0q8hGwjw5iKxKuqNU9G84E2pGX93UTI7toMcriv/oKw8wHbfKgMPiTbk46Z5CHGJr17G3htBCAVY3dvwvyz4yUub8Np7Kj2h+hc7+04p2jx3tYKATTD7hrxa2KbHp/sVYP3hrF5Y94Q/BZFUTDXOI9bSfTs+9p8X9nn9U8UpjbdtuWB0nNgVHUHpfPIsR8LZcZbIF3CexEume8G+7S8XE7h+Js3tcCqhbKT14GMEnt5021fi4JsVfqNrxALTEF3FmHN2fotjOCOajSywxtjZ/CRNAj89CXNTFmpsSqYpL2IQjtJ++cA7KdvZ7iqA== 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=vRPLzbl0ueWE5OebSDN2vn6ZkOw3tHiUvzktvGKHsOw=; b=MEFgu2jfawMbnBMttHRYERAnS9hrLoLEAGkU+40PmUc+A8aXA8OdC1foTKUCmdLAPLGOppsDGSQFCisbWxZsr0NHEpKVrChy2AUnGKMnvhTo3HfHpT88d1cDy3Ye8hrx/23/BpykjP0A4zg+QVf1CU3A/7xnA7bECnVPMlttgfY17wVTn3vILfxgzMcySAyOHxlS74XXoiA2RLI7g50pjbvqTHdtTiPwPG+o8Xv7GrTl9olKZ22U5AZRbvCZBLf1/Z+wdwNiW5QGjR4xuZBLTnDJashst1mzdVycvW2g1wvuHiTZtGZ+QvE4D2PxS2sn2I9PAUJ+JhLgm5J6CCHX0A== 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=vRPLzbl0ueWE5OebSDN2vn6ZkOw3tHiUvzktvGKHsOw=; b=RBAM+8E0pb5/jgZistfRSa+YOwmx/89cNSSbLHDfh0R4PKhUzCds8TcyMtk9tXdnjtSOhRhZdO+yywrMm/R1kTqB0wdhEaVp51RRxAHtx6jYTt45s5vwKnLOkpVPxbSEnTcfPPtEWQBDyJGbvI5lNW9K47oup40w6AWvxyMnL30= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:01 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:01 +0000 Message-ID: <875y3xihf7.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Alper Nebi Yasak , Jaroslav Kysela , Liam Girdwood , Marian Postevca , Mark Brown , Syed Saba Kareem , Takashi Iwai , Venkata Prasad Potturu , Vijendar Mukunda Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 06/54] ASoC: amd: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:00 +0000 X-ClientProxiedBy: TYBP286CA0038.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::26) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 653aa3c2-86a6-4a5e-f565-08dbbe58c0fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bS+sid46941/S0TZGWtlUA/NlbklToEFmcQhJh57Y6R2MRZmWY3AYuBMWcYOPq3hsvunCo/5rV94+no2FoBC82JXC4XAk6l6OsPke/CyfSyySmEKRVl1G6UyCtCz23bkAG4eccV1jjFk9/cvx9V8hwUHSCL+jCurcaYVBVaYAsft2Q/ITNOPPZkgdPCwAwaw1LKUD8y56nbbg8SfNfgqHqpjzBkbdyVuG1zp1IuU9t/rLo/lgropo1uckQDhIKOXpAOE5hJuQ+3HXyf4aethMySipSMNG4xv/XoJitG03KpSIlO2ZsT+RI/X7z0lcbNeI6NsYcPt4KiaM+p8+VzYmqzSG2pjj5QSt+xM3vcA1BoRIgHqVVAJKHuVYRWwPFUgVzcctpWwXdSgf/cd0t1r+iundobxl5/rTPtfQopNmHSbj0XWEq0K5aDv729vGU969+VgMINidx3xgz2I9w8sEfISIR829i6mthkg8/ovyZ8iixNv1M1Rs9L5k0Rhwn3VjOASHlFm0oLb0pFM7/wRd1xNvGQxjReA1F5MJ5J+t5l6r1oEkkFJOsbWzkXQS5m2/MRCn23Gv+g1VaMs1/kqOMZl6Zo7zwT/mq1TH2IrXeZiXBQX/BeJxeGi+HX0pZLQGXqcILX+7su+YhmwNq2p696re1LdxL7Iz+fdBlz8j0o= 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(921005)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(7416002)(5660300002)(316002)(30864003)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RJoG0s2/7KyGv2LUcFlRRiVKWz/zCawgSK35WM3geXBhatth5RmyLKf3NVHiduLcTx42PM+cDgbb0IcCxb52jR0LigdlQN6eg2lxB1ESOvLLEcMeEx0ch+xGnK3rOZ2CSDWTNMPpsgiKULxHTEUMlDNcLOXjfeIK1keEb2e0nDWDta7N8sgIm0PWJ1m6MXxLG8R24qKsemxn2SsKMcSiFyr0kKcy2QdFPXPu8GB6E+s0nePpyHQhQCDqHrKBQ3+brMAcCEQnYpe/zzhAY+wG3y0GKVJjVmGiztzIL5S3Bpih8vmaiYPOrkaW9Pm7zXsYU54ixK3xvEN2LbTpZy5hJJS+fHVBKwff3I+IAYJc0hPKHtjlUlYip9PWBeKGt31EsUvEFJpJcoAFECkV07pO0wfqj7prneH4EKFnBbixPEr0hMSxda23z9Z4DYgCo63wf8Y0wQ8V64Yt98jNdxTNb/Vjivt+wxrIt0jNT1Gd+sjMznoxFmQ+Zo05nekwk2w8kdjdoCQgqFgjYvkjOzZTwvMW80A713nE53ooEH2zAKvSa+BIgBsgBfY5xPRX8wIv0wM7bKlmeQyaqo4GLLPLFUcKkCUQ3TxGM46Jg2/VvkyB4UVNENWiwkmmrw3Z7t3OwvCKYU4lWS06VvTpeXOW8Ss0UjhCjZdY38bE9WVr8XDJvcJitg3jFZ8vZsDun1bQ8Tk//t68xrEpdTPb5wQbk6bxLRCV5NKqr+7+YKqmFEXsRVFyzmSv7XuJNUHpNHbPiD9oxy31O9W6M3s6+69fNEqVvAWQWT/7EdH6x8yp2QAVBVHJcmw97ZYjeVaGVEvmLexBzLcIwYjMrIq0Dd46qC/3pkRpUKGgBOvyk3pRAGAb65KIZzgZ4VsqHBNzdlI2651FrCTUuN5dfc+SSAxyV1m28VNZGjh2qgXKBvUjVCBCI0vKutsoeJBfoTgHvoi4Ct4gODevKzbKNSBfcCxMhCKCKVBq0ShDkGRy+7DeK7s9/+CJYKZJwstxugfnSfQYDpbo7y1DXbabIsma49MrA3skhiHKaLc+oJGXx8GOx+Pkgyg6W0hzGU2VtoSp8+zly1eqWsNozSw+JENlx2OdwcYibON9eVHAsxL/LHN8Wcft7+gITmoRx2PCXcM/X1G9fWs2BwtnLSkglljQh7rszFQUdHb8xrHQI+HGpeyr7KCVZVhlivwO+J/SbEI8WosCPLHalkqWj2IgRihlP9ghUQ4JDB+U6sq3Q1ioNXbzDCNA56MeuGBzP80nGiMWmpF2ig4mybfUWNtVg0jMYuerUVsu2qPcQ7sUmABpvJnZF4XwQBoDbr97WYANejFIlzxgSiDWe6lKTgzwljqMAbnYb6PdoMwOY+bgM15hvE0KdL6uMMjZjFNoark0RjU4mIGZ1GcL92BY3ISEV59mA7fLpoVaZgHjWN+PAAAPDVOaDWXOXY4rIkWDophS5unXVxlywo3RqDi+YhwcIRPkBzzZGoyj1+r6juuPxtKup6PGNSBAP4XEjAH0t60b7VzrYSUrVKlj8/A0ciBUpWZ9F/ehp0mpAt78d4drxVNy6x5/h6QNu9TKaWWFeZVCiH5/CD2nmlaM4DHyilEIZZqXK1RgTTzr5kfZE49YI98XsUMKHnQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 653aa3c2-86a6-4a5e-f565-08dbbe58c0fa X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:01.0312 (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: H/AumAagnNHYxHYl058XrTCQwsVT8cwZth2iKWjDt3TbpNpTxWno5mh8wNOz5XqoE6dfcN1i5cmOBBI8xDH0LSVDg34y7bRbWUlSC1M0lZq6a8jzr9vwVX7DwcSpMOkB X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: YRMOSNP2YBWRH6QK76SDVG3D3E5YMY7R X-Message-ID-Hash: YRMOSNP2YBWRH6QK76SDVG3D3E5YMY7R X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/amd/acp-da7219-max98357a.c | 28 +++++----- sound/soc/amd/acp-es8336.c | 6 +-- sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/amd/acp-rt5645.c | 6 +-- sound/soc/amd/acp/acp-legacy-common.c | 8 +-- sound/soc/amd/acp/acp-mach-common.c | 54 +++++++++---------- sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 6 +-- sound/soc/amd/acp3x-rt5682-max9836.c | 12 ++--- sound/soc/amd/ps/ps-sdw-dma.c | 2 +- sound/soc/amd/raven/acp3x-i2s.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +-- sound/soc/amd/vangogh/acp5x-i2s.c | 2 +- sound/soc/amd/vangogh/acp5x-mach.c | 12 ++--- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 6 +-- 14 files changed, 76 insertions(+), 76 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 9e3133bec2b1..84f3d65ba52e 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -54,7 +54,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name); @@ -106,7 +106,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) static int da7219_clk_enable(struct snd_pcm_substream *substream) { int ret = 0; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* * Set wclk to 48000 because the rate constraint of this driver is @@ -134,7 +134,7 @@ static int cz_rt5682_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; dev_info(codec_dai->dev, "codec dai name = %s\n", codec_dai->name); @@ -191,7 +191,7 @@ static int cz_rt5682_init(struct snd_soc_pcm_runtime *rtd) static int rt5682_clk_enable(struct snd_pcm_substream *substream) { int ret; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* * Set wclk to 48000 because the rate constraint of this driver is @@ -245,7 +245,7 @@ static const struct snd_pcm_hw_constraint_list constraints_channels = { static int cz_da7219_play_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -266,7 +266,7 @@ static int cz_da7219_play_startup(struct snd_pcm_substream *substream) static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -288,7 +288,7 @@ static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) static int cz_max_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -309,7 +309,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream) static int cz_dmic0_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -330,7 +330,7 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream) static int cz_dmic1_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -357,7 +357,7 @@ static void cz_da7219_shutdown(struct snd_pcm_substream *substream) static int cz_rt5682_play_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -378,7 +378,7 @@ static int cz_rt5682_play_startup(struct snd_pcm_substream *substream) static int cz_rt5682_cap_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -400,7 +400,7 @@ static int cz_rt5682_cap_startup(struct snd_pcm_substream *substream) static int cz_rt5682_max_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -421,7 +421,7 @@ static int cz_rt5682_max_startup(struct snd_pcm_substream *substream) static int cz_rt5682_dmic0_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -442,7 +442,7 @@ static int cz_rt5682_dmic0_startup(struct snd_pcm_substream *substream) static int cz_rt5682_dmic1_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index 5e56d3a53be7..e079b3218c6f 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -62,7 +62,7 @@ static int st_es8336_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_card *card; struct snd_soc_component *codec; - codec = asoc_rtd_to_codec(rtd, 0)->component; + codec = snd_soc_rtd_to_codec(rtd, 0)->component; card = rtd->card; ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0, @@ -111,10 +111,10 @@ static int st_es8336_codec_startup(struct snd_pcm_substream *substream) int ret; runtime = substream->runtime; - rtd = asoc_substream_to_rtd(substream); + rtd = snd_soc_substream_to_rtd(substream); card = rtd->card; machine = snd_soc_card_get_drvdata(card); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); ret = snd_soc_dai_set_sysclk(codec_dai, 0, ES8336_PLL_FREQ, SND_SOC_CLOCK_IN); if (ret < 0) { dev_err(rtd->dev, "can't set codec sysclk: %d\n", ret); diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index d41df316da58..b857e2676fe8 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -849,7 +849,7 @@ static int acp_dma_hw_params(struct snd_soc_component *component, u32 val = 0; struct snd_pcm_runtime *runtime; struct audio_substream_data *rtd; - struct snd_soc_pcm_runtime *prtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *prtd = snd_soc_substream_to_rtd(substream); struct audio_drv_data *adata = dev_get_drvdata(component->dev); struct snd_soc_card *card = prtd->card; struct acp_platform_info *pinfo = snd_soc_card_get_drvdata(card); diff --git a/sound/soc/amd/acp-rt5645.c b/sound/soc/amd/acp-rt5645.c index c8ed1e0b1ccd..72ddad24dbda 100644 --- a/sound/soc/amd/acp-rt5645.c +++ b/sound/soc/amd/acp-rt5645.c @@ -57,8 +57,8 @@ static int cz_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { int ret = 0; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK, CZ_PLAT_CLK, params_rate(params) * 512); @@ -83,7 +83,7 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_card *card; struct snd_soc_component *codec; - codec = asoc_rtd_to_codec(rtd, 0)->component; + codec = snd_soc_rtd_to_codec(rtd, 0)->component; card = rtd->card; ret = snd_soc_card_jack_new_pins(card, "Headset Jack", diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c index ba58165cc6e6..217b4c89b975 100644 --- a/sound/soc/amd/acp/acp-legacy-common.c +++ b/sound/soc/amd/acp/acp-legacy-common.c @@ -80,8 +80,8 @@ void restore_acp_pdm_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *soc_runtime; u32 ext_int_ctrl; - soc_runtime = asoc_substream_to_rtd(substream); - dai = asoc_rtd_to_cpu(soc_runtime, 0); + soc_runtime = snd_soc_substream_to_rtd(substream); + dai = snd_soc_rtd_to_cpu(soc_runtime, 0); /* Programming channel mask and sampling rate */ writel(adata->ch_mask, adata->acp_base + ACP_WOV_PDM_NO_OF_CHANNELS); writel(PDM_DEC_64, adata->acp_base + ACP_WOV_PDM_DECIMATION_FACTOR); @@ -192,8 +192,8 @@ int restore_acp_i2s_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *soc_runtime; u32 tdm_fmt, reg_val, fmt_reg, val; - soc_runtime = asoc_substream_to_rtd(substream); - dai = asoc_rtd_to_cpu(soc_runtime, 0); + soc_runtime = snd_soc_substream_to_rtd(substream); + dai = snd_soc_rtd_to_cpu(soc_runtime, 0); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { tdm_fmt = adata->tdm_tx_fmt[stream->dai_id - 1]; switch (stream->dai_id) { diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index 8f968c12e54a..9def77bfc608 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -117,7 +117,7 @@ static int acp_card_rt5682_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int ret; @@ -172,10 +172,10 @@ static int acp_card_rt5682_init(struct snd_soc_pcm_runtime *rtd) static int acp_card_hs_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; unsigned int fmt; @@ -206,7 +206,7 @@ static int acp_card_hs_startup(struct snd_pcm_substream *substream) static void acp_card_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; @@ -220,8 +220,8 @@ static int acp_card_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; unsigned int fmt, srate, ch, format; @@ -342,7 +342,7 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int ret; @@ -402,8 +402,8 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; unsigned int fmt, srate, ch, format; @@ -573,7 +573,7 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream, struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int i, ret = 0; unsigned int fmt, srate, ch, format; @@ -737,7 +737,7 @@ static int acp_card_maxim_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned int fmt, srate, ch, format; int ret; @@ -928,7 +928,7 @@ static int acp_card_nau8825_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int ret; @@ -980,11 +980,11 @@ static int acp_card_nau8825_init(struct snd_soc_pcm_runtime *rtd) static int acp_nau8825_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; unsigned int fmt; @@ -1142,7 +1142,7 @@ static struct snd_pcm_hw_constraint_list constraints_sample_bits = { static int acp_8821_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int ret; @@ -1204,10 +1204,10 @@ static int acp_8821_startup(struct snd_pcm_substream *substream) static int acp_nau8821_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; unsigned int fmt; @@ -1358,7 +1358,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->hs_codec_id == RT5682) { @@ -1395,7 +1395,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->hs_codec_id == NAU8825) { @@ -1425,7 +1425,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->amp_codec_id == RT1019) { @@ -1457,7 +1457,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->amp_codec_id == MAX98360A) { @@ -1537,7 +1537,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->hs_codec_id == RT5682) { @@ -1578,7 +1578,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->hs_codec_id == NAU8825) { @@ -1606,7 +1606,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].dpcm_playback = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->amp_codec_id == RT1019) { @@ -1641,7 +1641,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].dpcm_playback = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } if (drv_data->amp_codec_id == MAX98360A) { @@ -1669,7 +1669,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_codecs = ARRAY_SIZE(dmic_codec); } else { /* Use dummy codec if codec id not specified */ - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].num_codecs = 1; } links[i].cpus = pdm_dmic; diff --git a/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c b/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c index 7ce15216c3f0..6cd3352dc38d 100644 --- a/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c +++ b/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c @@ -69,8 +69,8 @@ static int acp3x_es83xx_codec_startup(struct snd_pcm_substream *substream) int ret; runtime = substream->runtime; - rtd = asoc_substream_to_rtd(substream); - codec_dai = asoc_rtd_to_codec(rtd, 0); + rtd = snd_soc_substream_to_rtd(substream); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); priv = get_mach_priv(rtd->card); if (priv->quirk & ES83XX_48_MHZ_MCLK) { @@ -272,7 +272,7 @@ static int acp3x_es83xx_configure_mics(struct acp3x_es83xx_private *priv) static int acp3x_es83xx_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_component *codec = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(runtime, 0)->component; struct snd_soc_card *card = runtime->card; struct acp3x_es83xx_private *priv = get_mach_priv(card); int ret = 0; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 28ad5f5b9a76..d6cdb6d9fdd6 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -54,7 +54,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name); @@ -126,7 +126,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) static int rt5682_clk_enable(struct snd_pcm_substream *substream) { int ret = 0; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* RT5682 will support only 48K output with 48M mclk */ clk_set_rate(rt5682_dai_wclk, 48000); @@ -194,7 +194,7 @@ static const struct snd_pcm_hw_constraint_list constraints_channels = { static int acp3x_5682_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp3x_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -212,7 +212,7 @@ static int acp3x_5682_startup(struct snd_pcm_substream *substream) static int acp3x_max_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp3x_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -228,9 +228,9 @@ static int acp3x_max_startup(struct snd_pcm_substream *substream) static int acp3x_ec_dmic0_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct acp3x_platform_info *machine = snd_soc_card_get_drvdata(card); machine->cap_i2s_instance = I2S_BT_INSTANCE; diff --git a/sound/soc/amd/ps/ps-sdw-dma.c b/sound/soc/amd/ps/ps-sdw-dma.c index 6230d1b12225..9b59063798f2 100644 --- a/sound/soc/amd/ps/ps-sdw-dma.c +++ b/sound/soc/amd/ps/ps-sdw-dma.c @@ -222,7 +222,7 @@ static int acp63_sdw_dma_open(struct snd_soc_component *component, int ret; runtime = substream->runtime; - cpu_dai = asoc_rtd_to_cpu(prtd, 0); + cpu_dai = snd_soc_rtd_to_cpu(prtd, 0); amd_manager = snd_soc_dai_get_drvdata(cpu_dai); stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 4ba83689482a..e7f2a05e802c 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -80,7 +80,7 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, u32 val; u32 reg_val, frmt_reg; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); rtd = substream->runtime->private_data; card = prtd->card; adata = snd_soc_dai_get_drvdata(dai); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 9538f3ffc5d9..3a50558f6751 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -215,7 +215,7 @@ static int acp3x_dma_open(struct snd_soc_component *component, int ret; runtime = substream->runtime; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); i2s_data = kzalloc(sizeof(*i2s_data), GFP_KERNEL); @@ -252,7 +252,7 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, struct i2s_dev_data *adata; u64 size; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); card = prtd->card; pinfo = snd_soc_card_get_drvdata(card); adata = dev_get_drvdata(component->dev); @@ -327,7 +327,7 @@ static int acp3x_dma_close(struct snd_soc_component *component, struct i2s_dev_data *adata; struct i2s_stream_instance *ins; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); ins = substream->runtime->private_data; diff --git a/sound/soc/amd/vangogh/acp5x-i2s.c b/sound/soc/amd/vangogh/acp5x-i2s.c index 773e96f1b4dd..7dbe33f4b867 100644 --- a/sound/soc/amd/vangogh/acp5x-i2s.c +++ b/sound/soc/amd/vangogh/acp5x-i2s.c @@ -95,7 +95,7 @@ static int acp5x_i2s_hwparams(struct snd_pcm_substream *substream, lrclk_div_val = 0; bclk_div_val = 0; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); rtd = substream->runtime->private_data; card = prtd->card; adata = snd_soc_dai_get_drvdata(dai); diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index eda464545866..de4b478a983d 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -92,7 +92,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, static int acp5x_8821_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret; /* @@ -144,7 +144,7 @@ static struct snd_pcm_hw_constraint_list constraints_sample_bits = { static int acp5x_8821_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card); machine->play_i2s_instance = I2S_SP_INSTANCE; @@ -165,7 +165,7 @@ static int acp5x_8821_startup(struct snd_pcm_substream *substream) static int acp5x_nau8821_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct snd_soc_dai *dai = snd_soc_card_get_codec_dai(card, ACP5X_NAU8821_DAI_NAME); int ret, bclk; @@ -197,7 +197,7 @@ static const struct snd_soc_ops acp5x_8821_ops = { static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card); struct snd_pcm_runtime *runtime = substream->runtime; @@ -215,7 +215,7 @@ static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream) static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int bclk, rate = params_rate(params); struct snd_soc_component *comp; int ret, i; @@ -334,7 +334,7 @@ static struct snd_soc_card acp5x_8821_35l41_card = { static int acp5x_max98388_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card); struct snd_pcm_runtime *runtime = substream->runtime; diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c index 587dec5bb33d..491b16e52a72 100644 --- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c +++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c @@ -209,7 +209,7 @@ static int acp5x_dma_open(struct snd_soc_component *component, int ret; runtime = substream->runtime; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); @@ -245,7 +245,7 @@ static int acp5x_dma_hw_params(struct snd_soc_component *component, struct i2s_dev_data *adata; u64 size; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); card = prtd->card; pinfo = snd_soc_card_get_drvdata(card); adata = dev_get_drvdata(component->dev); @@ -322,7 +322,7 @@ static int acp5x_dma_close(struct snd_soc_component *component, struct i2s_dev_data *adata; struct i2s_stream_instance *ins; - prtd = asoc_substream_to_rtd(substream); + prtd = snd_soc_substream_to_rtd(substream); component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); ins = substream->runtime->private_data; From patchwork Tue Sep 26 06:21: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: 728195 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 46DB7EE020C for ; Tue, 26 Sep 2023 06:23:18 +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 64FD6DF5; Tue, 26 Sep 2023 08:22:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 64FD6DF5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709396; bh=G8eGHCerx35KVsAG5Y998vZvBZQB9cA4sFQRB2ZU3qs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hx8AEwNa8m6KGMl8zU0I0rb2O1HS7UhPTAEAVU8Ko0J/c/FBe2lmN6VxVg+o1XOoD 8m+bbQd7iEMVHCjjExdlhw5WkXX1NnAlqhuhDEGFdQK4bghJokoUDlr5y2xpj8G1Np USPq07WQBCVjLMYx1BQrsZubYdN9hfLFKv9mZKco= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1AA8AF80578; Tue, 26 Sep 2023 08:21:21 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 63A0FF80579; Tue, 26 Sep 2023 08:21:20 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4C856F8016A; Tue, 26 Sep 2023 08:21:16 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20714.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::714]) (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 AB943F805AF for ; Tue, 26 Sep 2023 08:21:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AB943F805AF 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=E/QAZQIO ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=if4wwIa5lNpkG9+W3oFp2gEEKyER0X4PxE6qgQLA7Y6xnW+5ecRf01N11/NfbbGjCbI9MISiJB/aUjwwcMm0rIPfHRguROS4tLXZxCBBKudo8sOJ98ZeLpz6LBAiUZzA6EGoQaocwZialWPNUt0EEHG9+mOKiOlCFRdzs5g5t7aWCN9MLP1QUXS21d8pFwBBhnibP9cSbb7nKKgIoEasF45CzHoYRV1G4art3KmUoVYAQVQk03ic1Ha6A2PZTfFEkxbfPJrqDYkI2M1ZGBSE9thHViqGgA0HqH+6+kVeIHLbfMkWDjYBxy9xvzgHAdxqgsyCWGwcmqkFxIKPaaE4SQ== 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=SkiYa7Eqxre0/TQocTDA6MJjCHEUTuXMOSQThgJhQUY=; b=MZy9e659/dqWsrNGpax+Tf+2DdWxl0kPUy+55y34kDhqftsRMPcuk9mhF3Ngax3OB0uFqSpjLEOmIKyFn8gSS+t+dRPWXdOfz80ebzDy1NmmZsBIIqpz/zXp93P+t7d4/gFr/wJLrIQhEPk9IqdVyFvQTAWmy7jF7m/txDJ9o7yGbAh+KYUH7p4Y0w7Hm9eub97SBSLdFRSFBSZAcFPtPcqWFyJkAkZvImTuZ5rsQFTNnVW1MkkcVSizJ+WOZlFOBQn25aEo/7OU0CMoqtYgfFluEl2F7P7vUzyKpUcHA+lTyY+i4//QK7Ve9+QxU7jhntQpXhNBc4+6crNyyrB1NQ== 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=SkiYa7Eqxre0/TQocTDA6MJjCHEUTuXMOSQThgJhQUY=; b=E/QAZQIOdwdNxT3Edh+ykYW5C3JpqUuY7ieI6DwNlXZJ3C1KQRGpek/60802flbFO72krVTVK8lj2EhoXueubppGDT864ep2SQCnQ4JKjeqPQLJ95UVE6zZ8RFN5nj7KordBvM4zLxg7stNDMNY6DO/mTkO4AuQX99WdkIfvN8M= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:07 +0000 Message-ID: <874jjhihf1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Ray Jui , Scott Branden , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 07/54] ASoC: bcm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:07 +0000 X-ClientProxiedBy: TYCP301CA0045.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 17212d6a-0faa-4d48-465d-08dbbe58c50a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WUiiTOFuwLHDxC7hLYhdmtQX1SKP40o+rt5keJi6kDja21KSV48tdTT+0pz8iyhmk+54PdAbycbMGPUnpg+2d4SXAw9GGxB6PtxBO21oeA2KA4asx/xqyr90B/Q9DqPswugYhZ+geFJYFNlYOi4spJEVEA7JFnwTQOxi8pIDMiUxu0D9v90v7TI6NMxTvYELqZd6wtRk70zGacZRybYh1kqvr4CKOAQObT18dkACyMIpiw3RNdgJCEr5qkakcaaYbVH0TZxR92EhFA2k/gz/NqxQasmH1p//2Jrgz6leZEWOZIFwEdwfHw95RdeobENPmj+c4Dt2qJZB3LIHuuBPDh9SxGiaEoarCh4cog3XsuPvln8aXHKQYu2ofwsoQxXr1RMzQaKim+1AUbyUTVmxx9t6lc1B/npxID2sW2w8hSiRk5N5jLEz+lx16lECHXdLAGmvjn6Vqj6/allT+TXPVFKX+T2SRmbC20fQB+AERudwqJZCEFVREOAbZ2jReIKXH+pI7rcGamFXkEx59AqQJNapCBMI3pmXp2XseMX4s1hIqeUIATft1jX38OSvEniWiSLgPDswY2gggOMvpcSKh0Vc2nb8es4YPbS82QTj8wR0MVglNGivfapgHo1SEAM1U28fA7XHBe9pQpDHoTi49Q== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DBxas3H0KAECYZSGQ+tKCidXxioUc+gWCjPG27oVWe3sWjYNHnkGIOQdayqMFLqt6xI1JuPiWU6/AmhZYS/GEmpc66hUkZyj3mB/6DeCwRfxE5m61P1Fod9qpmIbh6G+M+bRSB8NPbBs9DWRgy+G4j/03GoOUIXlJMX5PXG9f5yaH+KGRfIeuIoKUi7m81etmBtVGJgJul3FvqKiysL5JUa/XPPKLhkKj/Qavbh40IBtykaAa0uosWT3bjJXF24sKXSli1TqF8tWgHpUVPbrmDY5hR47RAbPQoTfMXVPAXHIA1kV17j1mn2SrS7OiyS0Y1UQIKwQLglhy+LpUPTv9+aj+kXKCYP3kTc5c/jqVXVJ7PN/YwsfM0F2lrLYxFoP4N1wTvt0wQ84vH3rrCRHW0aA9Hz1Qpnu1gtxzazIIxkw/Zyp3vmd+aOjAkal29IHIb18BAAhQPpbUec4Ev0BJYkUbXeip+sy2sL7Wj6AcmFPhthkD5U7m7z+16Vhp2io3Xh7N9Ruw68IeeCMLH3krwlIaiQfrblsWwaNsFTAkmbbgcZytbT5lvTIk3Z73VAN43bufUIoQCGRBXQjj/ff+AKVyaxNwF4pSgPaK4j9eVI0szMzOIP23CcmeOA/L3s8GLlC1DIj8+sCt4zZ8jpBL/14WYqVEFWc4qe71R7JmRESI/8hRN5Z+QUbqrhWkxKsczBSdvGEz/EDmxuPyOb5Y8Kr5Pb4s/2LOhMQOH2Ku2X2Ra78FPH0rE8XOe2oLJDwdLHkP6KmoTFld9/JxenYGmGlSS3cWJbv9jdxl2jfb0D04qDUFlO8n9VRfEfT/WqD85zlKbFzEFOf3UiHqrUcXFSG8lsx/VIEoeFq6il5E/brBtpAilu5fot+yJt/maVCyZNxkWnzH+HNjrzHPEVfsLUe8D2kgcuwSncVM2LcTXNl+cI+moVTqfDr8zKGDHGE4q8HZWysDzRmtRlUXeU0Y/EvjuEoKo+ebCddukj70Jm+/6p35aLrICzBYFXFexi4BGKeCJ4Mr8ra4itlXI/ioYx1oef5YKCJ0hQvbzR4Hf0EJT87GlCc4nmvjVc3enQJ8DKVoMVn/zoyNJaS9TF8FCoxPnFW4sdbVcD3T5L9s00eiTdTdYZdsDg92HWpsbmoYeO3cxB+elWioMFWFZP/3GLigSl5XqYLo3yv8TBwcUyGWLAOovEwL1Zgr9OWCTL7xX8F4Hpmc2mDX9Qp3D+JJazzT4W5kWh4Oxl86xAbi7Zip7cr8aQEYbSwFLOo4omV2Hg9n6MG7/IbhSDkav9XXtXLSniW4ILfk+nbVGyjZ0G8WHqv7K+yXqfuasbNHqlKRewHsYRcqtGBPWrlQGHWfuRyxzDB2IIaeWcbUBKjshxO9+s9BTtBm76Whd3F4z/z2S0j+WPOed64K/On4LxHGrqrK+HRp4xgzOrfbJct6WPvvgf9S7vCL8N50H+Gbf0rTiPoctDvJxmVeVlSO03NIq+Qqpw2x9OhosblxADouAcG0GM6O22wso2p799iFRpsVW3XnY5H+d/Gi4cqlbcMrFt+XVPsLeCNjq1BXuOCtl+k1obc2EpXUesBs1EpDZhOpDnFkSbPmpmZwBvXfFoSAc5/MdtnR0gxg9daxctijJA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17212d6a-0faa-4d48-465d-08dbbe58c50a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:07.8608 (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: Xt5kpk4W4qSpAgXfr+McDJXTJrv/Y91lVVzic+VgK7O3sy6CjKdKAWgDfzsrftbtx23VgLDTq9UPeM3kk2e+7ZoZst9UeUEdvfXOXQGrMxV6gUHz5cv+TJQxQrZY1TGj X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: OWCSFUCGVUU4SWD43VXCSCMUBKVHGKXW X-Message-ID-Hash: OWCSFUCGVUU4SWD43VXCSCMUBKVHGKXW X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/bcm/bcm63xx-pcm-whistler.c | 28 ++++++++++++++-------------- sound/soc/bcm/cygnus-pcm.c | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sound/soc/bcm/bcm63xx-pcm-whistler.c b/sound/soc/bcm/bcm63xx-pcm-whistler.c index 2c600b017524..018f2372e892 100644 --- a/sound/soc/bcm/bcm63xx-pcm-whistler.c +++ b/sound/soc/bcm/bcm63xx-pcm-whistler.c @@ -46,13 +46,13 @@ static int bcm63xx_pcm_hw_params(struct snd_soc_component *component, struct snd_pcm_hw_params *params) { struct i2s_dma_desc *dma_desc; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); dma_desc = kzalloc(sizeof(*dma_desc), GFP_NOWAIT); if (!dma_desc) return -ENOMEM; - snd_soc_dai_set_dma_data(asoc_rtd_to_cpu(rtd, 0), substream, dma_desc); + snd_soc_dai_set_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream, dma_desc); return 0; } @@ -61,9 +61,9 @@ static int bcm63xx_pcm_hw_free(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct i2s_dma_desc *dma_desc; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - dma_desc = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_desc = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); kfree(dma_desc); return 0; @@ -77,8 +77,8 @@ static int bcm63xx_pcm_trigger(struct snd_soc_component *component, struct bcm_i2s_priv *i2s_priv; struct regmap *regmap_i2s; - rtd = asoc_substream_to_rtd(substream); - i2s_priv = dev_get_drvdata(asoc_rtd_to_cpu(rtd, 0)->dev); + rtd = snd_soc_substream_to_rtd(substream); + i2s_priv = dev_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)->dev); regmap_i2s = i2s_priv->regmap_i2s; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { @@ -144,11 +144,11 @@ static int bcm63xx_pcm_prepare(struct snd_soc_component *component, struct i2s_dma_desc *dma_desc; struct regmap *regmap_i2s; struct bcm_i2s_priv *i2s_priv; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; uint32_t regaddr_desclen, regaddr_descaddr; - dma_desc = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_desc = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); dma_desc->dma_len = snd_pcm_lib_period_bytes(substream); dma_desc->dma_addr = runtime->dma_addr; dma_desc->dma_area = runtime->dma_area; @@ -161,7 +161,7 @@ static int bcm63xx_pcm_prepare(struct snd_soc_component *component, regaddr_descaddr = I2S_RX_DESC_IFF_ADDR; } - i2s_priv = dev_get_drvdata(asoc_rtd_to_cpu(rtd, 0)->dev); + i2s_priv = dev_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)->dev); regmap_i2s = i2s_priv->regmap_i2s; regmap_write(regmap_i2s, regaddr_desclen, dma_desc->dma_len); @@ -250,9 +250,9 @@ static irqreturn_t i2s_dma_isr(int irq, void *bcm_i2s_priv) if (int_status & I2S_RX_DESC_OFF_INTR_EN_MSK) { substream = i2s_priv->capture_substream; runtime = substream->runtime; - rtd = asoc_substream_to_rtd(substream); + rtd = snd_soc_substream_to_rtd(substream); prtd = runtime->private_data; - dma_desc = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_desc = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); offlevel = (int_status & I2S_RX_DESC_OFF_LEVEL_MASK) >> I2S_RX_DESC_OFF_LEVEL_SHIFT; @@ -298,9 +298,9 @@ static irqreturn_t i2s_dma_isr(int irq, void *bcm_i2s_priv) if (int_status & I2S_TX_DESC_OFF_INTR_EN_MSK) { substream = i2s_priv->play_substream; runtime = substream->runtime; - rtd = asoc_substream_to_rtd(substream); + rtd = snd_soc_substream_to_rtd(substream); prtd = runtime->private_data; - dma_desc = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_desc = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); offlevel = (int_status & I2S_TX_DESC_OFF_LEVEL_MASK) >> I2S_TX_DESC_OFF_LEVEL_SHIFT; @@ -352,7 +352,7 @@ static int bcm63xx_soc_pcm_new(struct snd_soc_component *component, struct bcm_i2s_priv *i2s_priv; int ret; - i2s_priv = dev_get_drvdata(asoc_rtd_to_cpu(rtd, 0)->dev); + i2s_priv = dev_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)->dev); of_dma_configure(pcm->card->dev, pcm->card->dev->of_node, 1); diff --git a/sound/soc/bcm/cygnus-pcm.c b/sound/soc/bcm/cygnus-pcm.c index 8f488f92936b..2d1e241d8367 100644 --- a/sound/soc/bcm/cygnus-pcm.c +++ b/sound/soc/bcm/cygnus-pcm.c @@ -197,9 +197,9 @@ static u64 cygnus_dma_dmamask = DMA_BIT_MASK(32); static struct cygnus_aio_port *cygnus_dai_get_dma_data( struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); - return snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(soc_runtime, 0), substream); + return snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(soc_runtime, 0), substream); } static void ringbuf_set_initial(void __iomem *audio_io, @@ -343,13 +343,13 @@ static void enable_intr(struct snd_pcm_substream *substream) static void disable_intr(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct cygnus_aio_port *aio; u32 set_mask; aio = cygnus_dai_get_dma_data(substream); - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "%s on port %d\n", __func__, aio->portnum); + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "%s on port %d\n", __func__, aio->portnum); /* The port number maps to the bit position to be set */ set_mask = BIT(aio->portnum); @@ -571,7 +571,7 @@ static irqreturn_t cygnus_dma_irq(int irq, void *data) static int cygnus_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct cygnus_aio_port *aio; int ret; @@ -580,7 +580,7 @@ static int cygnus_pcm_open(struct snd_soc_component *component, if (!aio) return -ENODEV; - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "%s port %d\n", __func__, aio->portnum); + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "%s port %d\n", __func__, aio->portnum); snd_soc_set_runtime_hwparams(substream, &cygnus_pcm_hw); @@ -608,12 +608,12 @@ static int cygnus_pcm_open(struct snd_soc_component *component, static int cygnus_pcm_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct cygnus_aio_port *aio; aio = cygnus_dai_get_dma_data(substream); - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "%s port %d\n", __func__, aio->portnum); + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "%s port %d\n", __func__, aio->portnum); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) aio->play_stream = NULL; @@ -621,7 +621,7 @@ static int cygnus_pcm_close(struct snd_soc_component *component, aio->capture_stream = NULL; if (!aio->play_stream && !aio->capture_stream) - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "freed port %d\n", aio->portnum); + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "freed port %d\n", aio->portnum); return 0; } @@ -629,7 +629,7 @@ static int cygnus_pcm_close(struct snd_soc_component *component, static int cygnus_pcm_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct cygnus_aio_port *aio; unsigned long bufsize, periodsize; @@ -638,12 +638,12 @@ static int cygnus_pcm_prepare(struct snd_soc_component *component, struct ringbuf_regs *p_rbuf = NULL; aio = cygnus_dai_get_dma_data(substream); - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "%s port %d\n", __func__, aio->portnum); + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "%s port %d\n", __func__, aio->portnum); bufsize = snd_pcm_lib_buffer_bytes(substream); periodsize = snd_pcm_lib_period_bytes(substream); - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "%s (buf_size %lu) (period_size %lu)\n", + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "%s (buf_size %lu) (period_size %lu)\n", __func__, bufsize, periodsize); configure_ringbuf_regs(substream); From patchwork Tue Sep 26 06:21:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726449 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 A8115E8181F for ; Tue, 26 Sep 2023 06:23:36 +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 CEC53E75; Tue, 26 Sep 2023 08:22:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CEC53E75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709414; bh=8wPfKqbGcKhcG5faeL3QqTjAgfQj2lP+UHNgiImYG9U=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=SOKGXAXTNoQ+qgCXfHf/M3jMZPv6QnBzVVn/yhM1PnfFv9aafMQiWniF4aJb3i+4E nRBwMAUjrnabI64rDIw/geXhW6BxSZcrxGpK2afoh5VvN4H43jPhBK+mc7qeuho1W0 VKsKSjYONPEVQVMy8iRBRQjysQ02DcI+g72Ti95I= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A9867F8055B; Tue, 26 Sep 2023 08:21:28 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id C0078F805BE; Tue, 26 Sep 2023 08:21:27 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BA449F8057D; Tue, 26 Sep 2023 08:21:24 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20707.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::707]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EB2E2F8055B for ; Tue, 26 Sep 2023 08:21:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EB2E2F8055B 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=JB09rH4E ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A7uLVIXKnD6umyvM6JVTFyT7Gh6dzVKbS0fgzX7/0bDZGhO+Y+eC3J7zPfnub1lP1UTWr/jMvaFjnb65/guZTZicJlVgJMj5vutRuPwHDaEMxt+R4EeL9g4vw2Lt/qwZuMNJmwR8PNB6gvsBahdlzNe4MSgz5nunrHuOZ1Rzyiw16x0c/DPwg6thMMorMKsx6P4HuUPJLAlnw/YEGLQ8eMXNzX8+w+qcGUjKaPnKKlC4/4/hb4sBKp4bTFfBmTPU8IHNcEIOWBGbo4fujr3N5cwA9Bqa5Dwr/x5kwztT6cEIK78cyaazfXfXkWccFETmkvOmROGw7VtjxFiIOjDIDw== 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=1AmmrThevE/c2Tti9o6Hge+7KYCu0udMgkKq8fIwe58=; b=b/lzvDQ7/86q50X8WmR16bJaQ4yty214drPIs3ngp0QXL2Smo3JtjrQ/KOHFy4npeUEtVlXgPlwJErnf0wYKOAaXIzPiLy679fnPBJBbDrkTbBr4GENmgtaJLEoYOWRCLqGkW0fZcwNoKc41qdDZvatRRbLZZzvexNLwqG5ViArFSa40JlY0+2uM+jVsti/GwmnaOyOyokJb8/rT6fDtI9T660TT+xMI2Zp8kz6qVOfSPoHBSqdpPv8R0EB2VunyPLd2bgPDdaZR9J6/fZyOpJ0oVWMCgpwMkw6i9CO9eYR+BPbN16HxvbF/h2TclsM2M2O0d+OQ+mV0h5tZguAY3w== 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=1AmmrThevE/c2Tti9o6Hge+7KYCu0udMgkKq8fIwe58=; b=JB09rH4E6FxPaGAXwBZbXU44Luxr6NR/8s/55y047Bfg12Cjocw2bZxXykUjnYnkZhSW1zW8hDzVkyHLvUFpizf5sBPgDJliUXoy1PZrWXcSQu7pGs7TScyXXUaLutaTYLdLoEY6bXBX3vF+wVRJVX6azZklPHNdUl1LjGHgYT8= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:14 +0000 Message-ID: <8734z1iheu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 08/54] ASoC: dwc: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:13 +0000 X-ClientProxiedBy: TYCP286CA0214.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 046e8508-9a55-495c-aeba-08dbbe58c8ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /nCfi3fa2ozzZwsGD6ePu/7i7W7YVJPt3ZQ/+kBaKAmXUQXuA0rObayFInRLBbxE0pAbcCas/rOOmLetY0mYQBOwO/KgA+ObKt3Dl0OH3mqonjqs1dDwW6OB26+q/BnKpz/PiTbQasyMW/OGrr171XIwFooChkJuqbb9a6Vx0lhc+DrJa7SZDEsxLc2nrLeGkFiP4rr9zfAyu4yHQ58yVDddoObtqbI4euhe8Iq4UeQt27etXKH/g2DlKuOkl5QyOXbc3PZM5dBOSKzZNwPrpD/ZL3OJBHaf6Frs7uUwhuMIop4hnO109wiUcv+GrdQwBRl0VOe3IIGCQM4h5x7GFxjLajk8ixI7fyDC8VtlEn7k8Vd3tKDafIFZvp718mwujKtPSDoLl7qpQDuAJnF9z6sD2eXc0Vb9pO26reJPGUyHwbz5RvJFr+JKOpDeug9LOJ0oOzlMJE9k2tQnmPAHNF5BgmFyui/STbDfgGECQiFLjU3YbtnY1wQR7j3j5W/eqx6VwW8t4EYyCQj/HeWi1ib/Zh7zzDuKBU2JjaB7gLI8bwCJa1Gzt6EXgaOX5Go7F6DHnrwFDcLxjHcIsM7vmY9nmslr5JNPK4eiEPvIlvaQnozZl7nyjiF5RQOd86rHnS6BK8cZ/LkYxDgKoqCgNA== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gNNruB3uX5m8x/TSoowGx47D8mcv/hnrQ2pLc56AhH0FcdzVH1q/9SxoTt32VDqBp8jntO2wU6kJd8JskiT9qN4EMpgf2BMTr4KVFxPW83kktc/e/lOTjNe6tANOEyjGOaYrQTDVgTmes7TQmIUnx5ZwzOx1+jsrucWEo4y3rwdFLF7KetnS+7uUJ0wBqwtTKxxOK1LDOWOhsJ3lNwxcptNedK2/oVnoIOMagSWoqjDMEwFeeVuJbqws83ThcCwwwe07rQBLGQ7Nha0FsUTSGD9KektUTiwuxvNmEbzJv0rzY9aYrTqBv5wH9esriP2C+Dy5WaMEPpI8KFjaTVFXd5icWdpd8A6ppJ8J6FzuGpU/EpE2/4AF5XS300Wld/9IGLPtx9tBEi4TgZsnpRUcH68CdeHrhW83fjpAuA0D8qSiC6lbd/tm34wLLdXY3YqAtf1Vv2QfVoITt2Uj0uxQuI8keZdqZXpwzzzNcwj0DqKZ0OEcHHiX26dagtOWoGSQkDm6n2efhtk9338uLqTc/JTMHQ9K6/l8e1mqiUGnXk5DZj2+TrPrzOEst8uI5xOZUglX3ZdeUJlkozPvetE3DoHG4mYwVJR7NurwYHEPpLBicOXTs6YqoOX4zqqraGxd0pDlI1pmGwrYXM27Gp641b8ogniyYOiCJXo4KXrtVshS7nSYDpnUiKZtHyeP7QCdYRSf+47bez+scgOJqhMFM/Xuj1IGcrquzJxrMmBQh43Xf1js3FhroVbXwSNy0LPTFjmdk28OMgloOPYIXanTPXan/M/q5wRttlI7zgGxxajVXOWIo4LrxaUQxtWDLutwfDIMSf3Ehz6K+F7xxGdS7Kpu6ojlyg6DpZDmee8YnrD91kEfN0kHj/JBTauYyi8HJ8pAyS2ph34fhyqY+waZG+NILAaAokZPABrf0fgAureqNRHFl+T1pNN8AgXaaHcA4SLgKIa4RlJStCxbISy2n66tbRnm0OI7MqGJw2iWShY1vnNW+GjMeknniM5xTnR5gK7cu41E8SRMm8CCAFCwU8umLgV4y7Ev7avzwpTOPPwrD1OJZKHYe78wE6Syieaz/eE+oyUp2ItoIRdzlc+yaECwoLyKW0OBwcsmIEoiM15sCiIPmDqy+gP2YQ2WHxnUUZukhYjlCVsseTZF6UBBnF/5Nl3nrGah2VV76bkpClgRP+uoQTwzzeW6Rg2oUuueofWkOV7FoAikiNGh0RPbi6SOKPsT0VOdbCWKTlDm7YgQAAnU/wcadNJ/08KSd6jq6PPkD5J7iZ9vhoHyciblwAMyDIKRXPgIZZLU+G4hdldRCgifDz2i+mKZx3QQHuobOzgz/NYnAX9xnmyphQ65fCp7gXzvz1J4b7X1PjYQazPjRvoGXYcpdjKGYW/ErXzWqVAGG53wqaJSRU8QuXMXXiEAWoYNjKWFwWT/6aSeKlgjZ16CdCSTIA9FfrHC9DcHat+SIUGvrLdQS4kfFhMRUAmVlZtElr+t7uC6zyDTBAavhUIn3uEX8C2RUGzRQYfx6cmeDl5l73RxHNguiXyJbzCRXPUTvSWOftol7rhCQWz5h/l1NfNsJ+kBC2Ch2vXLKBdrgMv817Pk/Gs9+e9WI98kTgFw3kI9UIG4tu/CS84= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 046e8508-9a55-495c-aeba-08dbbe58c8ee X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:14.1527 (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: +An4QBk0O4HWVkk11Q3jwdvFHv5G9ZXh5WqCfzIPcr/k+VlLVLJJ2wBAUnPTUZVsj1vHKFHLlmu8mbBGnXZr/+qNvuD9z1e03HkPG7f4OIZ773ZsS0CxkNKP637Zf9l9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: 7QEOQTAAFMKQVCC7MNCO7F72HTIC3V62 X-Message-ID-Hash: 7QEOQTAAFMKQVCC7MNCO7F72HTIC3V62 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/dwc/dwc-i2s.c | 2 +- sound/soc/dwc/dwc-pcm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 22c004179214..2ff619a29655 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -235,7 +235,7 @@ static int dw_i2s_startup(struct snd_pcm_substream *substream, struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai); if (dev->is_jh7110) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *dai_link = rtd->dai_link; dai_link->trigger_stop = SND_SOC_TRIGGER_ORDER_LDC; diff --git a/sound/soc/dwc/dwc-pcm.c b/sound/soc/dwc/dwc-pcm.c index f99262b89008..a418265c030a 100644 --- a/sound/soc/dwc/dwc-pcm.c +++ b/sound/soc/dwc/dwc-pcm.c @@ -139,8 +139,8 @@ static int dw_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); snd_soc_set_runtime_hwparams(substream, &dw_pcm_hardware); snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); From patchwork Tue Sep 26 06:21: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: 728194 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 9FC91EE14D8 for ; Tue, 26 Sep 2023 06:23:53 +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 A7BF8DFA; Tue, 26 Sep 2023 08:23:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A7BF8DFA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709431; bh=t7iLePbfYDfCGKCSfh/zuhDw9C6laFMbzkhE94lHbzE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=AtrHcHUqniyksqAiIKXpnr2rlzWo9WjamigdEhvy1Uxk2g0a7EUwrXlFRHwJ0rf3M /0OKFCDseMUTXyjodChJf8K4r2TYrbMnbrlujNq/K2KFgGmiVCGJgerUum8hNgJBsG 8IUMrGayEONzawTnbyqDzCqWAb4RWiOQ/QqolmFs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DBFFBF8056F; Tue, 26 Sep 2023 08:21:43 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 26846F8058C; Tue, 26 Sep 2023 08:21:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5E379F805C6; Tue, 26 Sep 2023 08:21:39 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70e]) (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 DE2F4F8058C for ; Tue, 26 Sep 2023 08:21:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DE2F4F8058C 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=ZQA0igjh ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PQqpC7Q5Q/bX9oEszj0O/CuRkO0qSpTByF14xbQMlx8Y2GMP/+WF/R29z0JAnuOb7DD8bdMdistkodJJf7u8OXZGdm4ehFX8TqJf1rbyiIN9aALTNN4Scci7AG4eJeVvhFID1D9zgjHvKgp9/OxSp/du0q06qoDeMOus7EUgc1Ba4XAJNCeVmZ4JVo6lmM+gkOyRLR4F2z/u6bo966t8Fktx3zIwbMFJshhlrI74RxS4kTVDZr66exqsYP14bRdXRxiN9xcJKuQ9mQdmOpS2pJx1/dbKcISZfMB0LC7sUQV5zHLkXxiFRmPW/j9ZrORAaVCopmLko1+LtdCdWIxn9g== 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=JopzloPYfZlYQ8ffrBoM/ZzI6QxI/nLP5M9Ed2E4Srw=; b=Akvd+H72tKCSiXSIfRlvPpTFkN0TIH04ElIv0EqQs2utlIFulTbcDzN7gQz6IpmjXdaHZc59kCWWm6g8PZKw1FUEwzKv4++5PfRq262QLi4ULG2Tao02g7v+tZjnAwvWhXoDMoZzzXUoNl3xrckm2BiNpvu9YhR1h0Kudy2lPYFMHxUhFC5nVaOot5daDKJrpvAqnIqR3SQO+T804Th60jJV4mInlOouaCUc+Q+tHJ/06HWfEB1hh+N5zCz4YJYOntW+g0SuF8IiiwEf8O9/RR/6upB6uws91Ha7xFwoqeW/hYp2eYNfyiLjQ1AmQjdAoMOsRCnAWI0uXZuorw2cPg== 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=JopzloPYfZlYQ8ffrBoM/ZzI6QxI/nLP5M9Ed2E4Srw=; b=ZQA0igjh8ZmbrfErK5gw6wRz629ozEyALo4BuqbANs3786eLxuywPHxV9bWPfklTRhcjcOe6bzlIBZYSmoEwgtwYlVBaOvOSl+2kWUdT9dRLIEi5sOJG27QpowVzsfcGVyJnr8Km7oPIotK4llu2VqTQwYcPNz2TdAcz0sXStM4= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:22 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:22 +0000 Message-ID: <871qelihem.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Sascha Hauer , Shawn Guo , Shengjiu Wang , Takashi Iwai , Xiubo Li Cc: Fabio Estevam , Nicolin Chen , alsa-devel@alsa-project.org Subject: [PATCH v2 09/54] ASoC: fsl: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:21 +0000 X-ClientProxiedBy: TYCP286CA0047.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 30dbeca4-f383-4a47-ca7f-08dbbe58cd91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m4ZLEswf9fA/jwBL+hERnFoxs5AJU2DP+hsO9pnUOPQyMilaDP2m9PpDKu/KiRY2pzzeCUgXA5zQVCOECoalQLFNOCKVmGv26s+RlRisYybsxO1PVr6CYa3h/iasA1NR6rLfd61wn1uk7Xz7k1d0pQ8LhMfGL8TD7C9YTPGJH7c+f6iR2oByjrj53BZhpgfFZ/EIztIABAe9En0fInP7ZtYLW4dmkQ0GdIVsgPRElRhNNnjlH3TzsKHphFlEkXQiWRDFzxLE95YJUj0FtjLWEShEV9WF2oLJZwHoLlulPYYJjO5EQfvhtr+/JvczLgFp1Cs9EcvUM8GVFaExhn3o1rSn+XacVYbIu7doUgV1OS2jMXAg2jzkeMWUJvBKYBEDrCPjZWv9Yrxa/eUfIkbaVabimbanX6omkqquVnWYhPQqKv4dKTIG3Av9voKL7vRAteixfWVsvYIL9YQRMgKOtoK/lusmyQ1geZ7abYWeSLoqYkxDmXXV798g2ehyVRexQlt20wvP8FLejh8Han/U7rQGHK7dgLl9Ss7MEdT/m9R15ormS8fDy4Yb1AvrLSwXMU1gJwewbhUCRCM/hDytkvlhXPJfY2IgPzChbfc0wmoPIlmSdo061SxxNSC6TRhrRmES+Uu4wg8qZqaoVO79iQ== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(54906003)(2906002)(8936002)(8676002)(36756003)(4326008)(7416002)(5660300002)(316002)(30864003)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BdNfuvqkTmQUDlnfrtxmrtqW4HTRQWXjW97Bp9kcVKs9InRw4ihFJHBC430ZfH09pulSxFgEPqXkxsVpEegOQtZWaM2IwZi2NMlWxbpKgjyWL4Tyc1DUALFPmu2w5tyfLvcc5eZBzijBO1qSujPzG6eP/BZL8ytqxaRNk/fPSlYq00R4MbG/ojp3iQVBCtsfnUyWW4qlCEJ2McGF1CqA5RgaPDIulh05q4vx9Azun6Hjig+S12PCv+D5q/Q18JFDxlAD9vOOVblOj1SjqTm9bDg3w3Ie2CgTnxvVs+EPlKxFzl0iZCFuz0hMMxQ4ySyZK8rrkDSkNvyhGkMjA4Lmw+5TpfoSHtPDEsMvS/hJ+FUQOqChKe8nXPBFVihfJmpsapz/RxXjf9QKYIpqZxuxuCgk92+iUlD5j1mVhdcaLZnAyjzsjL0P4MdpS+eSGuovF3tr2jiv7Nt17ocZthN2TW1vrEbe0snIeTULQoyBDWhpaYyYnmcryp6P8qyqLGr4wm6LQiHEfCdvK/wAuX/TUPVMt4VN9tJiLCjggnOy9SEVSDYtv03BrbCEhqd3/Mr46dFKIKUe7XFcesKEtSYWWzYUVkYOPyUEIowV2LJARWVOpHLrhn6rz4wl+8XoM+cjz6zi53xmi5YanlGRThxf6uNZkGsX/hyy822cMYIljb1mA+QyNvGqVUwxJeT5aNgV91uk3sFrBEPZEhE2/o2qFQcH+vM2TnEKrD0T1ciy7lBndfMOsB2J77fG1EfbnWwBSKWamd2i65gxzPVRcHyN/wHzOo8GVRTrlj2nMRztNqTheIkMuGbCVxULTXWLEBYEuP0B0CtBTemJ3uUlyIdzFhp4OH10j7p7AAL5/NHMrPaMFibcW/o5hEH+CRnX+8vSeOKjxYaLic4Kwt1/DMxfsiTtnPIw4T2VCNRlMR7pedcpCRCBhCDVl4ApMpQWy8p25f+awD6aQ9DvwiwdajtaMPsj3VfJNBg92Sx+EmOoVlJ46eRDnNk3KbvIC1aah49dCrfWaxnosoIrWlNuK+wn+rPjjpB+exPmrBQa5vhuTkl45rZ4zLHdM3Lw5p5GkU1ydtfUO8ia+RIeYS2fj906Tu607VKVAEKzfAeJv3UfRXBai/ASQICzXhknjCzUfb09LSJCGd/KWI8HmvrMvcF1fz0aa7E20isOl896aPp0J2YFJLUJf2hl61BaU/UPi81ILmloaJmg7/ZRto/9TGCvid1BjpbqYxpCC35/vztuLPmD+oTFweSnWu7E87KAlQyFkHNIAqYQ+QsJ/nFS58JKdLbAiktt6qK4N9cqxiW6ulQ1u9KIPNMCG4jWIyX+q4q1yCNzb90wRaZsvnKEfYCxWEeBErpMyJ1I6Ir959UfiLRj7hZG41wmWSbwYLr6cgeD7MyT0vvucgPGQHbVd4bJVVvheFHv9YzUqNU96DGq0SkqCXq/ww3MsZQ0jyETgQPu4jLIkzO73V3DCeKcAi261faSgdegyFI424n+2eHvenAvoPAATXTsPQqJ7HRrplV2qff1t2wXHewMuND+cqHzeeM8EsK8E6aseYHnF+MTJ0sViW/EruVmYpN9MhV/3D0unYm41098gFigQCi1G1+0PnjUiBt/VyImVTL7+u9ap1I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30dbeca4-f383-4a47-ca7f-08dbbe58cd91 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:21.9792 (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: D9vCJjD1SKTTTXABIdGU3UHxCTuC7RwCn4yy3EBsEP4iMMjp5q+k3z0jaDAgqJLYQAuXzI1GWagV57RSPFgd2Pyv786oaBNoEWzqFFK2xgs8Jb18bKamwvd68wITv1M/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: CJTO33NOBIWYKV5VTXV5PGSR4KMSQB2N X-Message-ID-Hash: CJTO33NOBIWYKV5VTXV5PGSR4KMSQB2N X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/eukrea-tlv320.c | 6 +++--- sound/soc/fsl/fsl-asoc-card.c | 28 ++++++++++++++-------------- sound/soc/fsl/fsl_asrc_dma.c | 10 +++++----- sound/soc/fsl/fsl_dma.c | 2 +- sound/soc/fsl/fsl_spdif.c | 20 ++++++++++---------- sound/soc/fsl/fsl_ssi.c | 16 ++++++++-------- sound/soc/fsl/imx-audmix.c | 18 +++++++++--------- sound/soc/fsl/imx-card.c | 6 +++--- sound/soc/fsl/imx-hdmi.c | 4 ++-- sound/soc/fsl/imx-pcm-rpmsg.c | 14 +++++++------- sound/soc/fsl/imx-rpmsg.c | 4 ++-- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/imx-spdif.c | 2 +- sound/soc/fsl/mpc5200_dma.c | 18 +++++++++--------- sound/soc/fsl/mpc5200_psc_i2s.c | 4 ++-- sound/soc/fsl/mpc8610_hpcd.c | 6 +++--- sound/soc/fsl/p1022_ds.c | 6 +++--- sound/soc/fsl/p1022_rdk.c | 6 +++--- 18 files changed, 86 insertions(+), 86 deletions(-) diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index e65a85feba78..63f1f05da947 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -30,9 +30,9 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, 0, diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 76b5bfc288fd..5b31c12a56f9 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -94,8 +94,8 @@ struct cpu_priv { struct fsl_asoc_card_priv { struct snd_soc_dai_link dai_link[3]; - struct asoc_simple_jack hp_jack; - struct asoc_simple_jack mic_jack; + struct simple_util_jack hp_jack; + struct simple_util_jack mic_jack; struct platform_device *pdev; struct codec_priv codec_priv; struct cpu_priv cpu_priv; @@ -167,7 +167,7 @@ static bool fsl_asoc_card_is_ac97(struct fsl_asoc_card_priv *priv) static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; struct codec_priv *codec_priv = &priv->codec_priv; @@ -184,7 +184,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, return 0; /* Specific configurations of DAIs starts from here */ - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), cpu_priv->sysclk_id[tx], + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), cpu_priv->sysclk_id[tx], cpu_priv->sysclk_freq[tx], cpu_priv->sysclk_dir[tx]); if (ret && ret != -ENOTSUPP) { @@ -196,7 +196,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, if (!cpu_priv->slot_num) cpu_priv->slot_num = 2; - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, cpu_priv->slot_num, cpu_priv->slot_width); if (ret && ret != -ENOTSUPP) { @@ -212,7 +212,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, else pll_out = priv->sample_rate * 256; - ret = snd_soc_dai_set_pll(asoc_rtd_to_codec(rtd, 0), + ret = snd_soc_dai_set_pll(snd_soc_rtd_to_codec(rtd, 0), codec_priv->pll_id, codec_priv->mclk_id, codec_priv->mclk_freq, pll_out); @@ -221,7 +221,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, goto fail; } - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), codec_priv->fll_id, pll_out, SND_SOC_CLOCK_IN); @@ -250,7 +250,7 @@ static int fsl_asoc_card_hw_free(struct snd_pcm_substream *substream) if (!priv->streams && codec_priv->pll_id && codec_priv->fll_id) { /* Force freq to be free_freq to avoid error message in codec */ - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), codec_priv->mclk_id, codec_priv->free_freq, SND_SOC_CLOCK_IN); @@ -259,7 +259,7 @@ static int fsl_asoc_card_hw_free(struct snd_pcm_substream *substream) return ret; } - ret = snd_soc_dai_set_pll(asoc_rtd_to_codec(rtd, 0), + ret = snd_soc_dai_set_pll(snd_soc_rtd_to_codec(rtd, 0), codec_priv->pll_id, 0, 0, 0); if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to stop FLL: %d\n", ret); @@ -503,14 +503,14 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card); struct snd_soc_pcm_runtime *rtd = list_first_entry( &card->rtd_list, struct snd_soc_pcm_runtime, list); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct codec_priv *codec_priv = &priv->codec_priv; struct device *dev = card->dev; int ret; if (fsl_asoc_card_is_ac97(priv)) { #if IS_ENABLED(CONFIG_SND_AC97_CODEC) - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_ac97 *ac97 = snd_soc_component_get_drvdata(component); /* @@ -883,14 +883,14 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) /* * Properties "hp-det-gpio" and "mic-det-gpio" are optional, and - * asoc_simple_init_jack uses these properties for creating + * simple_util_init_jack() uses these properties for creating * Headphone Jack and Microphone Jack. * * The notifier is initialized in snd_soc_card_jack_new(), then * snd_soc_jack_notifier_register can be called. */ if (of_property_read_bool(np, "hp-det-gpio")) { - ret = asoc_simple_init_jack(&priv->card, &priv->hp_jack, + ret = simple_util_init_jack(&priv->card, &priv->hp_jack, 1, NULL, "Headphone Jack"); if (ret) goto asrc_fail; @@ -899,7 +899,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) } if (of_property_read_bool(np, "mic-det-gpio")) { - ret = asoc_simple_init_jack(&priv->card, &priv->mic_jack, + ret = simple_util_init_jack(&priv->card, &priv->mic_jack, 0, NULL, "Mic Jack"); if (ret) goto asrc_fail; diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index 05a7d1588d20..f501f47242fb 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -130,7 +130,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, { enum dma_slave_buswidth buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES; enum sdma_peripheral_type be_peripheral_type = IMX_DMATYPE_SSI; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; struct snd_dmaengine_dai_dma_data *dma_params_fe = NULL; struct snd_dmaengine_dai_dma_data *dma_params_be = NULL; @@ -156,7 +156,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, for_each_dpcm_be(rtd, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *substream_be; - struct snd_soc_dai *dai = asoc_rtd_to_cpu(be, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(be, 0); if (dpcm->fe != rtd) continue; @@ -173,7 +173,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, } /* Override dma_data of the Front-End and config its dmaengine */ - dma_params_fe = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_params_fe = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); dma_params_fe->addr = asrc->paddr + asrc->get_fifo_addr(!dir, index); dma_params_fe->maxburst = dma_params_be->maxburst; @@ -330,7 +330,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component, struct snd_pcm_substream *substream) { bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_dmaengine_dai_dma_data *dma_data; struct device *dev = component->dev; @@ -375,7 +375,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component, goto dma_chan_err; } - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); /* Refine the snd_imx_hardware according to caps of DMA. */ ret = snd_dmaengine_pcm_refine_runtime_hwparams(substream, diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 963f9774c883..c4bc9395dff7 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -200,7 +200,7 @@ static irqreturn_t fsl_dma_isr(int irq, void *dev_id) { struct fsl_dma_private *dma_private = dev_id; struct snd_pcm_substream *substream = dma_private->substream; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct device *dev = rtd->dev; struct ccsr_dma_channel __iomem *dma_channel = dma_private->dma_channel; irqreturn_t ret = IRQ_NONE; diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 78d9dfbe6548..d42cc2f55baa 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -502,8 +502,8 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, enum spdif_t static int spdif_set_sample_rate(struct snd_pcm_substream *substream, int sample_rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct spdif_mixer_control *ctrl = &spdif_priv->fsl_spdif_control; struct regmap *regmap = spdif_priv->regmap; struct platform_device *pdev = spdif_priv->pdev; @@ -605,8 +605,8 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, static int fsl_spdif_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct platform_device *pdev = spdif_priv->pdev; struct regmap *regmap = spdif_priv->regmap; u32 scr, mask; @@ -647,8 +647,8 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream, static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct regmap *regmap = spdif_priv->regmap; u32 scr, mask; @@ -701,8 +701,8 @@ static int fsl_spdif_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct spdif_mixer_control *ctrl = &spdif_priv->fsl_spdif_control; struct platform_device *pdev = spdif_priv->pdev; u32 sample_rate = params_rate(params); @@ -736,8 +736,8 @@ static int fsl_spdif_hw_params(struct snd_pcm_substream *substream, static int fsl_spdif_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct regmap *regmap = spdif_priv->regmap; bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; u32 intr = SIE_INTR_FOR(tx); diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 079ac04272b8..ab6ec1974807 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -634,8 +634,8 @@ static void fsl_ssi_setup_ac97(struct fsl_ssi *ssi) static int fsl_ssi_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); int ret; ret = clk_prepare_enable(ssi->clk); @@ -658,8 +658,8 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, static void fsl_ssi_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); clk_disable_unprepare(ssi->clk); } @@ -890,8 +890,8 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, static int fsl_ssi_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); if (fsl_ssi_is_i2s_clock_provider(ssi) && ssi->baudclk_streams & BIT(substream->stream)) { @@ -1107,8 +1107,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; switch (cmd) { diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index 0b58df56f4da..b2c12e4ed5bf 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -43,7 +43,7 @@ static const struct snd_pcm_hw_constraint_list imx_audmix_rate_constraints = { static int imx_audmix_fe_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct imx_audmix *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_pcm_runtime *runtime = substream->runtime; struct device *dev = rtd->card->dev; @@ -72,7 +72,7 @@ static int imx_audmix_fe_startup(struct snd_pcm_substream *substream) static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct device *dev = rtd->card->dev; bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; unsigned int fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF; @@ -84,13 +84,13 @@ static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream, dir = tx ? SND_SOC_CLOCK_OUT : SND_SOC_CLOCK_IN; /* set DAI configuration */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt); + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), fmt); if (ret) { dev_err(dev, "failed to set cpu dai fmt: %d\n", ret); return ret; } - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), FSL_SAI_CLK_MAST1, 0, dir); + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), FSL_SAI_CLK_MAST1, 0, dir); if (ret) { dev_err(dev, "failed to set cpu sysclk: %d\n", ret); return ret; @@ -100,7 +100,7 @@ static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream, * Per datasheet, AUDMIX expects 8 slots and 32 bits * for every slot in TDM mode. */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), BIT(channels) - 1, + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), BIT(channels) - 1, BIT(channels) - 1, 8, 32); if (ret) dev_err(dev, "failed to set cpu dai tdm slot: %d\n", ret); @@ -111,7 +111,7 @@ static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream, static int imx_audmix_be_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct device *dev = rtd->card->dev; bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; unsigned int fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF; @@ -124,7 +124,7 @@ static int imx_audmix_be_hw_params(struct snd_pcm_substream *substream, fmt |= SND_SOC_DAIFMT_BC_FC; /* set AUDMIX DAI configuration */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt); + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), fmt); if (ret) dev_err(dev, "failed to set AUDMIX DAI fmt: %d\n", ret); @@ -247,7 +247,7 @@ static int imx_audmix_probe(struct platform_device *pdev) */ priv->dai[i].cpus = priv->dai[i].platforms = &dlc[0]; - priv->dai[i].codecs = &asoc_dummy_dlc; + priv->dai[i].codecs = &snd_soc_dummy_dlc; priv->dai[i].num_cpus = 1; priv->dai[i].num_codecs = 1; @@ -274,7 +274,7 @@ static int imx_audmix_probe(struct platform_device *pdev) return -ENOMEM; priv->dai[num_dai + i].cpus = &dlc[1]; - priv->dai[num_dai + i].codecs = &asoc_dummy_dlc; + priv->dai[num_dai + i].codecs = &snd_soc_dummy_dlc; priv->dai[num_dai + i].num_cpus = 1; priv->dai[num_dai + i].num_codecs = 1; diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 356a0bc3b126..f71b3c134001 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -291,7 +291,7 @@ static int imx_aif_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_card *card = rtd->card; struct imx_card_data *data = snd_soc_card_get_drvdata(card); struct dai_link_data *link_data = &data->link_data[rtd->num]; @@ -607,7 +607,7 @@ static int imx_card_parse_of(struct imx_card_data *data) plat_data->type = CODEC_AK5552; } else { - link->codecs = &asoc_dummy_dlc; + link->codecs = &snd_soc_dummy_dlc; link->num_codecs = 1; } @@ -655,7 +655,7 @@ static int imx_card_parse_of(struct imx_card_data *data) snd_soc_dai_link_set_capabilities(link); /* Get dai fmt */ - ret = asoc_simple_parse_daifmt(dev, np, codec, + ret = simple_util_parse_daifmt(dev, np, codec, NULL, &link->dai_fmt); if (ret) link->dai_fmt = SND_SOC_DAIFMT_NB_NF | diff --git a/sound/soc/fsl/imx-hdmi.c b/sound/soc/fsl/imx-hdmi.c index b6cc7e6c2a32..e454085c6e5c 100644 --- a/sound/soc/fsl/imx-hdmi.c +++ b/sound/soc/fsl/imx-hdmi.c @@ -35,7 +35,7 @@ static int imx_hdmi_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct imx_hdmi_data *data = snd_soc_card_get_drvdata(rtd->card); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_card *card = rtd->card; struct device *dev = card->dev; u32 slot_width = data->cpu_priv.slot_width; @@ -70,7 +70,7 @@ static const struct snd_soc_dapm_widget imx_hdmi_widgets[] = { static int imx_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct imx_hdmi_data *data = snd_soc_card_get_drvdata(card); int ret; diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index bb736d45c9e0..fb9244c1e9c5 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -229,8 +229,8 @@ static int imx_rpmsg_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct rpmsg_info *info = dev_get_drvdata(component->dev); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev); struct snd_pcm_hardware pcm_hardware; struct rpmsg_msg *msg; @@ -284,7 +284,7 @@ static int imx_rpmsg_pcm_open(struct snd_soc_component *component, static int imx_rpmsg_pcm_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; @@ -317,7 +317,7 @@ static int imx_rpmsg_pcm_prepare(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev); /* @@ -462,7 +462,7 @@ static int imx_rpmsg_pcm_trigger(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev); int ret = 0; @@ -516,7 +516,7 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev); struct rpmsg_info *info = dev_get_drvdata(component->dev); snd_pcm_uframes_t period_size = runtime->period_size; @@ -595,7 +595,7 @@ static int imx_rpmsg_pcm_new(struct snd_soc_component *component, { struct snd_card *card = rtd->card->snd_card; struct snd_pcm *pcm = rtd->pcm; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev); int ret; diff --git a/sound/soc/fsl/imx-rpmsg.c b/sound/soc/fsl/imx-rpmsg.c index 3c7b95db2eac..e0c416a2eff8 100644 --- a/sound/soc/fsl/imx-rpmsg.c +++ b/sound/soc/fsl/imx-rpmsg.c @@ -34,7 +34,7 @@ static int imx_rpmsg_late_probe(struct snd_soc_card *card) struct imx_rpmsg *data = snd_soc_card_get_drvdata(card); struct snd_soc_pcm_runtime *rtd = list_first_entry(&card->rtd_list, struct snd_soc_pcm_runtime, list); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct device *dev = card->dev; int ret; @@ -92,7 +92,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev) /* Optional codec node */ ret = of_parse_phandle_with_fixed_args(np, "audio-codec", 0, 0, &args); if (ret) { - *data->dai.codecs = asoc_dummy_dlc; + *data->dai.codecs = snd_soc_dummy_dlc; } else { struct clk *clk; diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 26c22783927b..3c1e69092d2f 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -30,7 +30,7 @@ static int imx_sgtl5000_dai_init(struct snd_soc_pcm_runtime *rtd) struct device *dev = rtd->card->dev; int ret; - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), SGTL5000_SYSCLK, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), SGTL5000_SYSCLK, data->clk_frequency, SND_SOC_CLOCK_IN); if (ret) { dev_err(dev, "could not set codec driver clock params\n"); diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 44463f92e522..1e57939a7e29 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -38,7 +38,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) */ data->dai.cpus = data->dai.platforms = comp; - data->dai.codecs = &asoc_dummy_dlc; + data->dai.codecs = &snd_soc_dummy_dlc; data->dai.num_cpus = 1; data->dai.num_codecs = 1; diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index 901497810020..866a533fec83 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -107,8 +107,8 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream) static int psc_dma_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct snd_pcm_runtime *runtime = substream->runtime; struct psc_dma_stream *s = to_psc_dma_stream(substream, psc_dma); struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; @@ -209,8 +209,8 @@ static int psc_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct psc_dma_stream *s; int rc; @@ -237,8 +237,8 @@ static int psc_dma_open(struct snd_soc_component *component, static int psc_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct psc_dma_stream *s; dev_dbg(psc_dma->dev, "psc_dma_close(substream=%p)\n", substream); @@ -263,8 +263,8 @@ static snd_pcm_uframes_t psc_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct psc_dma_stream *s; dma_addr_t count; @@ -282,7 +282,7 @@ static int psc_dma_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { struct snd_card *card = rtd->card->snd_card; - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_pcm *pcm = rtd->pcm; size_t size = psc_dma_hardware.buffer_bytes_max; int rc; diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 413df413b5eb..22bde475e935 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -38,8 +38,8 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); u32 mode; dev_dbg(psc_dma->dev, "%s(substream=%p) p_size=%i p_bytes=%i" diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index ea2076ea8afe..a635e08f14ce 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -98,14 +98,14 @@ static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card) */ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mpc8610_hpcd_data *machine_data = container_of(rtd->card, struct mpc8610_hpcd_data, card); struct device *dev = rtd->card->dev; int ret = 0; /* Tell the codec driver what the serial protocol is. */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), machine_data->dai_format); + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_codec(rtd, 0), machine_data->dai_format); if (ret < 0) { dev_err(dev, "could not set codec driver audio format\n"); return ret; @@ -115,7 +115,7 @@ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) * Tell the codec driver what the MCLK frequency is, and whether it's * a slave or master. */ - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), 0, machine_data->clk_frequency, machine_data->codec_clk_direction); if (ret < 0) { diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 0b1418abeb9c..db09e8366944 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -121,14 +121,14 @@ static int p1022_ds_machine_probe(struct snd_soc_card *card) */ static int p1022_ds_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct machine_data *mdata = container_of(rtd->card, struct machine_data, card); struct device *dev = rtd->card->dev; int ret = 0; /* Tell the codec driver what the serial protocol is. */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), mdata->dai_format); + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_codec(rtd, 0), mdata->dai_format); if (ret < 0) { dev_err(dev, "could not set codec driver audio format\n"); return ret; @@ -138,7 +138,7 @@ static int p1022_ds_startup(struct snd_pcm_substream *substream) * Tell the codec driver what the MCLK frequency is, and whether it's * a slave or master. */ - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, mdata->clk_frequency, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), 0, mdata->clk_frequency, mdata->codec_clk_direction); if (ret < 0) { dev_err(dev, "could not set codec driver clock params\n"); diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c index 4d85b742114c..2d7350204095 100644 --- a/sound/soc/fsl/p1022_rdk.c +++ b/sound/soc/fsl/p1022_rdk.c @@ -127,21 +127,21 @@ static int p1022_rdk_machine_probe(struct snd_soc_card *card) */ static int p1022_rdk_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct machine_data *mdata = container_of(rtd->card, struct machine_data, card); struct device *dev = rtd->card->dev; int ret = 0; /* Tell the codec driver what the serial protocol is. */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), mdata->dai_format); + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_codec(rtd, 0), mdata->dai_format); if (ret < 0) { dev_err(dev, "could not set codec driver audio format (ret=%i)\n", ret); return ret; } - ret = snd_soc_dai_set_pll(asoc_rtd_to_codec(rtd, 0), 0, 0, mdata->clk_frequency, + ret = snd_soc_dai_set_pll(snd_soc_rtd_to_codec(rtd, 0), 0, 0, mdata->clk_frequency, mdata->clk_frequency); if (ret < 0) { dev_err(dev, "could not set codec PLL frequency (ret=%i)\n", From patchwork Tue Sep 26 06:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726448 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 1F3BCEE020C for ; Tue, 26 Sep 2023 06:24:09 +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 5E0C8E8A; Tue, 26 Sep 2023 08:23:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5E0C8E8A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709447; bh=jgNFtKHkdErYxCZQ1r+k/5cOm1HXpmR5K5JttCVttuM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=cN30pJChwztmqWNvWuBsqZjBUdREkNhpBFo4O7OHo2p5LhYNghOIgMGg/Oziaf/Wr WDvT3sVlfjrxdCiByIrakj/kvJDbHzDULOFpT3ZwP+FmLUzvQTdLdxoPx3LITkKgBC RNfvA7WX+l8rXGNMtew49UhhRaDhYSZfS6VmpTk4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA8E4F80564; Tue, 26 Sep 2023 08:21:45 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BD130F80564; Tue, 26 Sep 2023 08:21:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3C18CF805C6; Tue, 26 Sep 2023 08:21:40 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70e]) (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 93E7DF805C5 for ; Tue, 26 Sep 2023 08:21:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 93E7DF805C5 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=Fl83vUq7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d244LBpN+xcqi4AWN3iLodK4wG4GAnCyA60xLPjqkoXGe8qAScMu2CEbcOOgRkA+jS1EJOxt8Bv8YFMNFrRBAX+BINYwapvCVgD8dZ2CzrAMlceJLDYwyjk/XsSP17A5LiZcHf7pdFTZytcQ5r775j6qkUHW4bkf+/TgLgAz5Kd7G7OMbrQgSf/9TnRfATlEyUJRWTDSkvCPvYxPGxEF7ZEv99W/YJr43gDaca/ZL3KUNwXxfo05/Do6wIM/neGHDIXwiybi2GMHEHjtOSVa7kvLxFrE+Bl4ypF/G3nttHHIp9vTgTugyE7hG12BSdlRnQcoir3/Wtya5Z2dY2+EJg== 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=P6ctewlhnV6MC0z4WQvKY7BRsPdcJqkjqAdCkCiwm/Q=; b=URcJU7x2W2EKIV2yy7dEYZY/iMxU+htc8/SGgYCpNe4WnCIDwxOti2600J/moqmoG6uEGVEhfsQ5OcYeqy4cZThTj0qnT0GqhixvcELBbfzXdvHMN+Imqix+48lA+HVASTpdCsiilNFlJ64GOB8OfnnWFDm+05IJ01alnCHjdmOxV9AheHHU9z1BMs1UJRSi1S67Fkd8hZEo2oj76tBtK8/YEN7rQag5jrFhqB3vY2YzEef/EXSqciYWPjj4Vyg4WZQ7dLPKgHhPAQTSQ6KG0/WXq1yTHWhgnQ7tqllvQZFpbbm0EEkbc4Ghxf/MIuG5z3C8AYa1Taz4YIS8XIgu7A== 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=P6ctewlhnV6MC0z4WQvKY7BRsPdcJqkjqAdCkCiwm/Q=; b=Fl83vUq7bHpmn6qaEe/WRWO4JVlJovklXTcJh/4vKf0mnwXvvjfSrKkdUDybFBnhQ4V7Vvi/OnY8qHxbHvNtJeptUH0diEwbFqJr9TdZn4nRHlozuR43vOsvlI7HZBsyrmBD35uIqGxhpckomoz9q7S1EqCKugoIJ2RgCp/n8EY= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:28 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:27 +0000 Message-ID: <87zg19h2u0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 10/54] ASoC: img: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:27 +0000 X-ClientProxiedBy: TYCP286CA0060.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: cff80939-6f1b-493f-507f-08dbbe58d10d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KGTyIRwJAUFtfMxHUiea8T/bd3GU1vhwbnEgLm60fqGHUEBRotC1k01j0xQBfdkNJsq1fCMfHar8cZCjARdGr9mhgVFxnN6cEL+tSVdiVyBCXSDFCLHQpGKoVUc/tfyaHwwLy79D/ionzBM788ruy2HgN8bXEnBohDyzIZBT/ce9Fwutdy/9Ldbprz8eyzIw6nCXwCepPIXc2wejJxNgA2QUokNd8PtKZS5amAF/AUqe4zFJ9MWDBmOyHbYHeGybF79bjdZwh/ACAPafhfOHsfvM7WyE5uYeO5PZbBgw/c3EAT5tJzfKXKEMmUlAI0tyllXuKUPQZcGce79NQ7ajBSq8FYXItrXu0Aoe1gdOq+p5KqVFL/cyxGohpoVLv821pPFvwYfWm4KFLjYxJCvQ9n3KSO6xbBoAWnWPr4nlfU442Js+EIwOUDpQKlOjY4rfPwyu2m37Ctb++Yj/GSbdMQw3pdGiiOoNaw1+y+EBa+GW9xJdRuu0wav2pfgA3ehpHiQREEOBSiwDg0Fia4ckwsSgeslQO08DuIk/ClYXk/s7t0Sc3yN/K/iNT7dOuA5nPPD8pY33U2mPXdfstJJlbkrtxgfjjw4yiM5o/CjRbpe2vwWE51IKhwSld+lQpLU7zyIGW/2KB2k4lDkiqjmYHw== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JC4Hm0B6BTUcjAR9F0sGt0uuqiUBflwE8avtKrbncxwUpX/PzZiOhXKhYh8ttUNES4qf1LrxoRzGc3/AUshKA1WpV4gT4Bcy6v7B4aMb8dVCr8FaoJ88cHJorZUvPsqXYv+SECmNpkskTcJewLtvtv2ceCurCRYNNJT+Pyd0IPLwXb0cbrci439cAhaleVCzH0oIJCkZROGJWUyjryohGxmsJSP4RxBy7catFY2l4cOXfRmgOBRlXEt+GATtzFLgA3ZKw2UICgShhMAsug9z+m44M2NobCcS8NoEq1ANppn1IVBNKfdYY+2+vJmhHMoCSaMLzltq3qC6kiyLYZt3+ImR7iQKRcyDH3Qd32jrijV5Fl2TtwtJqR/FepXubc1Fx4VnwNGkXJ/dtCSR2wOB+UWqfiXBNMn7QR0wNkhtiJ9rkWENJw5C7rm4bvZ63rnNuaMMv1cQvGhIGzJatJTlsBMYxI49dMIaM0S2WRGUe8vBW6c7tivXjMq+jZ8F8I6yDREai5es4E/z523vNzfAio/eIp3SttXgLbA0VM3dkZBDOacv0oFe7SAg1BmXHqipjkOMeNu9N2/Z5dF5Wwtd3MLjWyqxMHPVcqALMAEHJeo7DQJfNtAz1gp97mSm2BOWz5nk9DhnBJfZQtpNv3mShFUuqQuO6km3uqnbwu2uDyOpUE7KeOlcHYYvCXtahGq0dafq/UMdbKZKlswYdSg3eIgtEWVRvrLt+GGnMbFYtUGN4aktk4xI35lQmGSjVWh02Gx/AHs+IR/RZKRgooWYKFRmf/T5sN5G8hI4nsD/U+rnPepPB3QZ0YqOrFIR7UKXQ0xyslbkBawLLI7hepGK8okzw7i4xdYzLHC/KbxgDtg50ysd8KPaPURVuVraA54QtzsbPXMBMYBFNaukf27AmxljvEuqEDaQ9o/5qQjhtjSjUvUsC3O1kZc92MD+x2rt+i4vD2jzUuQ0/WctpRtk5cZyts722mV8FeFpOTIFV3tUdhkrsRk9eI7F5FWvAZbOzDkfEmQVxiW9hY3+efzqUL28JAU6oQ/az9DLpnAnPVLEruiJWYfIB7foJtwu0Wa3jjXUCcsxJeI3stz0cPkbSYUa7Aaf4ZKi2BzssCXUmp97uG8MEDb+aS688FGa+orF1sMOOwTwfRZLZhvBlq2+xTO4i623keOLIjW7YIbh266R7A72eZUffDOU/ruCMf3r/RJQUp/T41VLlhblXd1mFUt2uUOwJfarf2LutaozYhIjuuQMjWZu4Thw84uOI2aTQZ8AttoN7Zk6jwbtSEXjBW/o3ShAPeg4v75kgkPnaKYfzdhuwqHxmzXe+E2yp/+DygwI4In3qplnwrxlARsx1UlpxdB5k8evgg453v6BwdKEkyO12dV729kWgtZesjblEYixpOJa2obhYdZnnNWwfNKmOZmBgU1iLR7wxDIxxsOPeQbrCvY2bNvN9JbQrrkWuxF+qQTDwym7j03FQZy+8uCp00S9/C+ZZLjX+Z14tA5e0u9zlnBYUw87YsoHScTlS0urhOVMf2FvsJ4lRSNZxqm3/gSwa6SLAXOFVk7DQ7zYko3I1FKV9q5sDlMK7NfMZV2c1uHt+NH6FjVe3fFX4UatY6L6K01Bdp1HR445A34= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cff80939-6f1b-493f-507f-08dbbe58d10d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:27.8138 (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: V4WhiDS6BpN/4rfARpJ0X+B4ZMOFaBHZVInFKJ9zMx8UkjkFb61zbDVTHg+wMN8XOg6Vn5OGwp6wr5dWDnvNq70oxwJ/KlxZz7MdRQIY49x8q2ihhJxgBbYZEu1mNCFO X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: XB3FQ3T2VJGXGF6AEZHDMJ2MIULDQ5EK X-Message-ID-Hash: XB3FQ3T2VJGXGF6AEZHDMJ2MIULDQ5EK X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/img/img-i2s-in.c | 2 +- sound/soc/img/img-i2s-out.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c index b6b6339c164b..dacc29fcf24b 100644 --- a/sound/soc/img/img-i2s-in.c +++ b/sound/soc/img/img-i2s-in.c @@ -399,7 +399,7 @@ static int img_i2s_in_dma_prepare_slave_config(struct snd_pcm_substream *st, struct snd_dmaengine_dai_dma_data *dma_data; int ret; - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), st); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), st); ret = snd_hwparams_to_dma_slave_config(st, params, sc); if (ret) diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c index 41ea5ba52181..f442d985ab87 100644 --- a/sound/soc/img/img-i2s-out.c +++ b/sound/soc/img/img-i2s-out.c @@ -405,7 +405,7 @@ static int img_i2s_out_dma_prepare_slave_config(struct snd_pcm_substream *st, struct snd_dmaengine_dai_dma_data *dma_data; int ret; - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), st); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), st); ret = snd_hwparams_to_dma_slave_config(st, params, sc); if (ret) From patchwork Tue Sep 26 06:21:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728193 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 74982E8181F for ; Tue, 26 Sep 2023 06:24:21 +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 D0F99DF3; Tue, 26 Sep 2023 08:23:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D0F99DF3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709459; bh=wbqiXJe5oy5XqNaX8YhwRU25YrkdshuXYkeC4tHIs6E=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=V3HIguD3qEg4f5WipXDjPC3JNAd6XwsOUiiE4j3YJBzrsjfPv2QnLwtjiNWShP0MU bv91bO1zwZlwZn7Bxf0OlU3avySZKgTlu8WwYBfIEv8x6Obwiu6AlHjRogvGIUziLU THmrJRr2pYkE1ujZcwm8SlJAwBA3p2F7dF+sZVfc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D2BFBF805E0; Tue, 26 Sep 2023 08:21:47 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 2566BF805DF; Tue, 26 Sep 2023 08:21:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7E446F805C5; Tue, 26 Sep 2023 08:21:40 +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 71EACF8058C for ; Tue, 26 Sep 2023 08:21:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 71EACF8058C 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=SZvGRKx7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X7JQcXjI1f4u5iNt1iqlwsGCX4nVupmQMY9Jv2kA9351OSD8KzlbFYOTL30yLAQa8O7MFcg7jC2NOkfrJhGyI6oPIS4PujnREb8vdfVMrfZYS8hiiR1GJNPd8myfr3Q9Q0AOE0CvxuXAhy+U8eSZBB8Wlet/aPAwSt7A4X1HxDA6VF7RzXfyaJ77sJYtwZu6rzxX0kB+kvjUIvzSTvkM7K/5cApalxzkZ74m871oplctNrsMS+/WzfDYeZD8Xk9ODIGbL1PMD/R0EnrA1Mf9wsf8ScmaI5lKxAOt+dXSNCTDLP3FdXAvogGTSEYr021MRE1cVjqey9mXKYoRNeHuXg== 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=ZwaRIT34r+XO0h8KTchyZf5IJ8mKLjSng6a71Y5nrJA=; b=DV74CiE+8T7QtTgZ64/k3j3BNPMKrseDw5v+VGlH1enp5BCZtGHeyYUw3PupJrRYzG7xRgJXKs33VFskHSSZVgKpY2bYNTkDDlZYs1Eex8/J5wznp1JJMSGFjrLkPKaxDXW59iKTzMJ+/8TUpwjGNfZLrtMkODUxQsXYB2FYLhNa2Z5VKaYvNKCNHHRkgWS4PHeiGgiVhj0iEf/KUCy9dXeqEIvTU7x0e1lTSe3kvJkox81aC2cD2mdz+8y+XiLXtbKfxC6YmyhmTg6/OymKZGxJPk3nQmzm3MKcOMcPK6gkYc6tuzn0eubLQemvrrPW0Tty4cNGcZQvqF9zjaQOuQ== 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=ZwaRIT34r+XO0h8KTchyZf5IJ8mKLjSng6a71Y5nrJA=; b=SZvGRKx7AUQSzj9bq1S3Ne0oY5jHL5RBSlMFsC3uLRUnNtsgsv8+ub8vf2yktbyOt6ntHzTbUXLLAh1p0v3ypvOpaOOybfFkDU22A+sezPKag00+caHc5HkZ9L4R62UhjGX8Qr7ERmHI9eyKaeTgu2iXJHiRnpdaQ+/17XqTM64= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:34 +0000 Message-ID: <87y1gth2tu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Sascha Hauer , Shawn Guo , Takashi Iwai Cc: Fabio Estevam , alsa-devel@alsa-project.org Subject: [PATCH v2 11/54] ASoC: mxs: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:34 +0000 X-ClientProxiedBy: TYCPR01CA0184.jpnprd01.prod.outlook.com (2603:1096:400:2b0::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_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 50de8ce7-79e0-41c6-a153-08dbbe58d51c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sJT85UOuquuIkLg0GPQMjHi+Vhi7LTFOHhGBiH99To38F6WPoMq9Zk1GOpw1L/dHg4KcZhm2RGvtnu7nlct3jd0meUNdZSH92fsb7T31i2Vk0tRMIUDHtGvMvzs3hOqtQm0kIkk8FIZ4IGZR6nJXCoLLOAWPwzTFsttONwNTM8oU7itHtwMF0HVWJ11d6f8+3HGQ2WJNwGRiuidfi2QYIIrxo9j9Aqd1iE3I/r5dgvvkEYDs2nxZnJ4AT1aVDjDmk/BRinNq5i2TvYD2XOmnEhfYNvx8ubE40d3xqIvjtWx7a/4xqXoRS6ZR+BLcQZBqGUqADNnRuTLPE2oiEN9PvsgmFNXALSl+ZL+UloDgaJcVNIOFghy3TM/rsVQJwWeaBEtDpfZrvFn9byaCgI4E2BPq4ftzTmtEkiP1B+KzWyEQiFKX9vrciKoVOWPj7icgId8Vv61URuZEzh0pI+kQ8WuPC/Vu2o7kGIGmhh5P9+5dYc2uf3yfViBXsQw7bThHZBiBeTTJ39wKaPkyVptJQ+oEZxbYlf6IfRWenlYnENO4v4/o3AukRgxshRbgSl3J5FuDzTsiwcXXfuG+MhK/Zl4RRqHj3dnvuA/1gucw12Tf4ZKHaIzh6q63ukIfNrf054PLFR4yVnBrmMI5HpkXMw== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sMIlv8hXqa/XhhcIHru+Qi2LXzyDJu0emp0fRtwDOYNohrw/58I2yTTAqklFHRRGVCPAEFiJaJ6o85y6n5F/zuF2cVduQhW6NWaoPlHOyzgVpjrJ/VeizrOlDgSR3AQAk9KpIeDFNYv6Gfo4YeS3OZetH+tOa+kt0XSoNX+BRE9GdpWThzJJi9lDOv9zElxklVotc6n7MCHLdzA7YdBN7rM1R2z4woASOYv3V9h11qnrI3uYDfGEx6U54rIschSu/0qxZfqZDi3iaBwPNAFGwd/Fg1Aln5za4N1e6AGMc823ICBokX9+oBsiHG3OBrvrBlz15a9IxU2c4EsSjaUCYFrCqYBk/hs3j9vJ4n7GYTWe3NeJOIbaqo+tnzyGyCQ+DBPRg8hlBXOfS3JFPKoroON9ijBQCvot5dGDvOI1piCjbnRMP7IfG0BhqUAlQP9WI+qbD52h1mV7cYcGAhsZHLrL7pcZoOjmS6u4ChVnnqVnR3zwGgz12NX8FQhpLcpRv/KUf8Dj/rKKxTOuClDSlkqzhq16WxvFXWnKClwUcMF53c0M9W2FjvbtQAxS//kTyu7Y8u9BZJZjs05FlC2b85d7kVxUIFrnGUuPmD3ASAVSsUvjI+Mn/Z2GG+9mxzbHSj+VOzfS2cbpF7203vB5SDrLJ8AL7x2vSZuJsBhvQc+clPjBY0y1TbYy+nLOnHt9C/wm2ckZVGdDXgpRTZ9qjK4dIMyH79PNH58//ht2YZq5rlyBybBbHX3Rz2OsoMQGGc0spVsWGzlTmRTEa85nGxsWuIzcvi2YLrskGy+k1cDWZe7CdrxmipLNAofrb6PnthfAjpVOIovKJ7vPZfAi4o2lYHX5LoZ4y/B6H3Pl8i4LBhIExo3JfnwsTMmD9ibmNNVu2GmmknL6/dW6+Nzw3KmVEVAeoG3dq09I1i7/0W9u1HeSY9UM7g3vixCYPOXNKtRtB1IJUbiDAM/Fp3rJhMUOJs0QWCXWMoHiPzQyqvEyFoOug1jYC+sJweiIOABDSKu+eoPGsbk862Jm2GRODWI3sD0lGTni0eoMNa93c4lzlUQdkfM2I4PY5gsv/VfbcZwivEE00bpEo1Q2CGwLfsnu44QPcqJoUAKLH+PgRVgHle51na57scbTlTAelu7IBgRciK38ZUSD0K/ANRSBVa7I2xdSxjPZv5kzGx9McJeOIQfzMnqGKq4lSTjrH1MrW+9ikQfZ3fTqF91m4ieaDn8eKyVHoaqJDmjo7a+cn0VgkwDBXpIxHELPgywRD5s6faFZJipBmkWqKLoKIDp1fkTEOlWqAln80wi90LlvuQ4fhWpDO9HF2ZrsMyjLCUigmWma8VdcUFMHHZRtR7nyP22YoqleQbH6KBl4oBMyX7y+4SfzupoYKDmhb1GV20cJhbTNGlhddlXFWKTAKY/BtuGy1W5xX991zNLHUZvsHKkPgaZQk9Voz5A4qO1Ka8r97GbEOFyvPZIbCQ5uow6ypAKvJopZJa+fG1v084YLt7VSZBgIFdesLU1d58AzYa8uKn8vFN/7Zd7EDOJk0zQifOPabT7uwjMf/AP8C6dMY/GGE1YOw7qXXzBf2Hk3faDjG/JTgh22VYgsXrweyZNu9+lvYzQ73LnS53c5albuLJM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50de8ce7-79e0-41c6-a153-08dbbe58d51c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:34.6284 (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: iiL3vye+Tt1ps+lDUrmbkAT/EES5L5Lv58acfeqc0a3c5Mi+3M0n9WB5sImbRYHZY+P49XR1/Uu9XCyewHUgbFoV23UFvgBf98GcX3y6Ex8kzZDWd2rEZO5Q6vIlzroT X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: XMYK3PMIJDYFND5TMCC2RG7RWPHBFBC5 X-Message-ID-Hash: XMYK3PMIJDYFND5TMCC2RG7RWPHBFBC5 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/mxs/mxs-sgtl5000.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 457c3a72a414..01cb5c5e72fe 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -19,9 +19,9 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned int rate = params_rate(params); u32 mclk; int ret; From patchwork Tue Sep 26 06:21:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726447 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 30D4DE8181F for ; Tue, 26 Sep 2023 06:24:38 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 78C7AE10; Tue, 26 Sep 2023 08:23:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 78C7AE10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709476; bh=pHv3Rp1p5kxvOHaJBM3Kg6ZpxLOuh68XyB/0yFNebpg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=S5V7erfX8KELd3Y7t7tMXbqHqkQlv5Bc2Rs95UH63DNFKvzENiw0XDR7uFzgFtdGu L18NJrDMvyqUy6rQNMAeo82lXABKWo37LZNqKoyDeKDy7tlTHmEAwDtEcZZhLbE7VA 9CmCIYsduqSohuSYI4HopA+XUjHapm/EIgPYUdAI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D21A1F80567; Tue, 26 Sep 2023 08:21:51 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 75196F805E5; Tue, 26 Sep 2023 08:21:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 34024F805E5; Tue, 26 Sep 2023 08:21:48 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70c]) (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 14754F805D4 for ; Tue, 26 Sep 2023 08:21:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 14754F805D4 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=jrLbZZE7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSOXpAHAv/nfQxlhy1VGlGU7gGRcnad2Ma/LQM0FUtDLRiOuiuWDjwizYWa6A9tXMCi68A/FpgYmG4kuxs3er24k/IG4YzgvYcIpy7yAtKXQyUdPL1SxUtvKlDQtffEjFT1vqe1RwZk4PIfUIhtocmVyCyZNvHu4yEKoesLujeJtrMPf5of8m7OOsA8s8JnQngrItDdWtgcPVkQ5iQA3PFE/qmpgzxrIc9Q3Pl0l86/GWPSqUv6OG2iUXn0qexG9SbdrcJGDOs/nXf68A+jh8ptbR4WNqdH6zU/T08sA5gDnRCKQJP5tShNouOe0PI0tGvxR1XHgHa1bNM+W88iYdQ== 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=uIr5+JoJvyss2nVux0VtA6nj8q0yC/y4nUyXWQPmUfg=; b=acYsyF4imXeRUrbmNqPIUYlntavLrCkA/iESqh149+Nkh8knqH/cfN5kGFmXMHOh5Ntrr5r6YkLVTU+5QeFxOtG3AIqWzAjozQEeov+Cvd/vVh16SrdD8koxYjPTAKafwV80PsgFCxjyO9NOCJn5FnBDI0FEz23V7LuytKkgqE36ZAuLrYnLpcdCiBsGphRNjonw865thnEr9Qec/pWzz4C3ISDK7m8UJXDLJ68mSYnFb04tacsm2uafWLb3vNsO8PT/GB/rRITlAnl3wTrH5y0EMCzfLV0vEn7KxPNEqfYSgMmHJEpiPH2RQOWIePoAxuyA7syoofjtofET2Qy+og== 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=uIr5+JoJvyss2nVux0VtA6nj8q0yC/y4nUyXWQPmUfg=; b=jrLbZZE7Ztwr5XvBsazx7OfI1ToPViC2k7ytVuebZpI9OzyDMzYFLllUBoq4gAiYyQx5F1VhTNuwZkZ3j8CaTLQryxaMynZHbyZUDLvXwweXOwBrgCqzN5WoeYKU9JdcwdqxWwGI7Apc2T0zR86M9uW8VqCnjlrzyeOGiwPnJ7I= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:40 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:40 +0000 Message-ID: <87wmwdh2to.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Daniel Mack , Haojian Zhuang , Jaroslav Kysela , Liam Girdwood , Mark Brown , Robert Jarzmik , Takashi Iwai , Yangtao Li Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 12/54] ASoC: pxa: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:40 +0000 X-ClientProxiedBy: TYCP286CA0119.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e977f50-43bc-4327-86a8-08dbbe58d8b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cVppuEgZw9KFbjTQXfZIShDVZiZ23ArL3hDzqshUimXEd5dIz+q7/Y6DAIHxziCDz/hBxpHYHQwq0nks6LGXm3gihKq0myvwmNYuWKZvhqEumKOCpfm56jQJcdrvIESLyV2aaAAzr28O/Z3PM7woVI//h8zUVfG3tSzUi2u5pIeZJpVrwPT5gNQloOZXL5L131pPTex2GdBoFhXcPqg8VIlloaKrZWlu/VhEdcLhHuM8myPpBTLKh1HMKZn/F78hI/dC4HFBHXUvMGYbh0kuCzX5T87rdjmxfpB5JhXptZr0ptg1r3/2QKF61N53rVmtydvgNkrxiQz0RcvU4n5i/qjlTYIO6Ej2kQQUUWspDw/gVx1xhEVlWNtkyYKoN0STT3S5MSB7XTT3o7fQ7a649QU4+mmTZ4BjGqHyOJG5fuZwkBfXmqylOWBdib9GPsLdBBoOvGZJX2zMMpcHVqLdLH5DQJw7AQKEYyW6hoD4Fve/9gAbpWAR/neZEb7Mbw3G7m8bya25noLozAfk0yFEkIamjxOWo0RDy3sNmaDJoTxQDYKLcZFNzo5HZRQ9SWEhS5p743CFFaJ2WhrgacN0ANWwMXTSKRgUoQdpTazbWB7bBiE5a20DNgjSfqnAU2PgReA1VWlGY8cUok3fQvwx0+9yAl0vO7XA9A0YvQO4BZU= 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(7416002)(5660300002)(316002)(41300700001)(21314003)(41080700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sWZq8Q2ShwIF0zj55D8Kwguuvs778Db2o8Ihea43V2FaQrEmH5LD5ltUZhaHNslj00gPg9L+eN3STseWVOa9cmjKIwMx+X1d63gebWX3XYYW3PB1UPrtOazOViloITxz18lLcVtt+6tFchs24+MJgdkkpUAGpUdIeTqe8ScNKAt2GCynCJyDKe+p2XYDIA1wCjBIayQ8fKfL9RIP4/REdfAatnOADJdpbM3kE6iAVI7WP9mEkNM3it8qWdAwSxADspDx+mvOznMUmBHW1MJ77XR5XYfadyn74zXMRzLvsAE+I0PpI9Oyt5vHBts/egMO8ZKL23JW/njxca7KmgK+6Dhpzy0H+yS3uucBRnalFdUQc8eNXdIWWHtsF0viU9W9hbXs2/HvDtJ96DIfS3baZquN7vVl9lDjHxoYzHwspI7lVZNcfyZR329s2CdUReb1Xcxt1LMydaR4LR57Y2chRhEM1zlxjx2ofOU/aG+I7O+GbgngUoDlAgiHwLKfsyv44ER4oEgXy52NdOSNdBEPq78ywaBcr/bqmtvpg0Lece1PX/IKdT7WRx/6SPYekru9ogAEQuM1G1LO8TcF2UXVCeUCOiW8sKFgu5FkUUrJR5SHbDufcMw72yVkXMnuklCpzlfSBPc7aV3Hpk+dqN2cLOinVxXClAsUvoKJ/Ec7UFJW++db/VFqJMX2LzUWdjEGZNexVQfgg1pnJ2PxbdvyiR4QQ5eSnKH3IWmAog3ljmaVkyjmPbzSIOyZPNfGbo1yZCJw2it+UYR0hROPCSCf5Ac9CUqaTdQHzL3oL0iPwC3ieMyU8bekfOVj2qiUgHzRDFhDiPrO+jxx2amk6MmIFguDTYxhTRRXrGJLeQIjW5XM5fRhp0TeHSoJE8vSDyjBVxBRYDwk/nT8sbq68adTGRP1f9S1LRvtJSf5BqgK1IKZvvwizro2+3bCDN7rK/599ouh/yXgs9buSFBxQLVflXLQiDV90Np3dLk7G6VOKChCAq3xQ9fw1FFYAJ8e/eyCPlxfJ3rMp+lUvsFXfNXbs0dFpHnWiYNAjmMtL4l8mEGA3xI8jHG4fYg2cmsPGJKDqbWYhwxLdTPsMuBf1NYZn5LLcvhw7WXEhmEfjgU2kGtLmLE7jp6+fptXfwG/eBGeeVDSnnuhHCq7hTQJ/SYwBC7cmHXxEtjDusCIM37Ye/tQE19ku1gAObxUDD6u7J1c8ggj9Vo3oJH4/NPXx2tlwTTN9UVZosMmhaFq7avCN8SrgVy/71R8REuTN3MjyfEvbZ9Mj4N7Gbqrkvu5eip0VUWbmLqVL6WzyjRnIky4fLaCK0IbdnmfUDx+IGug4KWKkUeHUzSFriFmAWD6EpWg114dw4lCl0ZssgGcgeJgF4RGkFQIYzAuG57HmA72bGrryQpbIiJHqDMGeYOORAhhd+q7Ww05vBQXHAsyeba2Ewi+zEXFZ/vrZ9HkPyjXJLEDPgS0zVf8+q65FvDnQoAFrslxe/VVdK0EBwg5oOIYyHEkBsLkO5+oxp3Pc98cMKbuhcL/D6n8RlG0VRSL339y5/Pm3QhZIy1Jd0H443PHUwBqmVxdtR5Dl1Nlc+DOTSbVsG+rtmaePYHraLC4HaV4VR2hvv0qxEAmTTWFge/WrDQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e977f50-43bc-4327-86a8-08dbbe58d8b9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:40.7248 (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: DHBtZE8BqkeDKMdYNoGnnz5FcVtPCO1+6YLWbHh/9IYHw1R+GGq4Ea5jYuowLgHTmxBK9ep2dvMawisJdvj3YmrauPckfBpZ2NMjuzxWUwuvYzASTjaZrh6rMgBemxS/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: 4WDQDBOKOE4BESY4U6CDNGDF4FVSZMHI X-Message-ID-Hash: 4WDQDBOKOE4BESY4U6CDNGDF4FVSZMHI X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/pxa/pxa2xx-i2s.c | 4 ++-- sound/soc/pxa/spitz.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 437bfccd04f8..849fbf176a70 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -93,8 +93,8 @@ static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_in = { static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); if (IS_ERR(clk_i2s)) return PTR_ERR(clk_i2s); diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 70442315f5c5..8caa1aa99bdc 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -104,7 +104,7 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) static int spitz_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* check the jack status at stream startup */ spitz_ext_control(&rtd->card->dapm); @@ -115,9 +115,9 @@ static int spitz_startup(struct snd_pcm_substream *substream) static int spitz_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned int clk = 0; int ret = 0; From patchwork Tue Sep 26 06:21:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728192 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 92D18EE020C for ; Tue, 26 Sep 2023 06:24:50 +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 C6310E8B; Tue, 26 Sep 2023 08:23:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C6310E8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709488; bh=Q8tz7M11qlp4xk+MZ+7zzLLY2en4Zii0ZhrsmbWmFag=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=DJFRLTJyOnoA3oXXeX5ITao/+tzK6KEXHJ4uF/LFU/srqgNMcs7j9lvHTbnoKPe+9 Uzi2ztQtPzSBc1ggd50vYN/BlXy6eFjwKDfytc/74rtGDhO2ii1WUZBwu6IvJ9q53o JSwLPd2qINclEYq/tLkPBpsB53X3CX8V56dJVATI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 78D6AF805AB; Tue, 26 Sep 2023 08:21:57 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id E1635F805D4; Tue, 26 Sep 2023 08:21:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 300F8F805EA; Tue, 26 Sep 2023 08:21:53 +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 631C9F805D4 for ; Tue, 26 Sep 2023 08:21:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 631C9F805D4 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=gEIRMHVT ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FgcoS/40gc3MoN2yAv7I8UekcesfsLrIdrKPo6mz/FsSUpVmDjPARQsMn4qTBkEq/BWDHpZKlayV6pnIyUFTme7hJGV0Xz4Rn08mdIMw0pCUKu9U98MSAzkESH0X9TMQWFHONse5+CwaTkRdSxBColZ8cPfByTvTnpCLWCMDpJJrpE4Tk+8KfkGDzx652L33ke9LoMcpCVVRy9B2Ker2/hs/IIRoB09w7vREWAXX++WsQTbavV5qFaM7NR1Z8Piuv+0vsSY0QaQsjuRas79n35D2bJpZxDhvmQLcdfRF3LF49GS0Vjrznzf3bD1xxOWR0fQUjJ1iQVQDSsqSVwIgSQ== 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=t+qXuJbi/RQ+sUPbeR3VdxtysTfw8xOU/K8ymi3pT2I=; b=VwRM+vXzLM2vPLKiKGM3qBi+LQmKrzCC7s4M3eySUQl/u5T7QbClUZy1IW+gCuR9e56zg3TKC2ZmKmMjmiA4dRfM1adVnpnyZxe8pOoXwefmC2cMt7PiHRHXjknuRBi4kh3eqPRv1NdE8yBq3JwDSRJM/qOoHsceLolih7x9GX22lGuSFDVM/Xb5OKrLBBzon/khHDyR2B4JaStWkbN+txyAsljd2UlAbcEHlv1oINMZYutMMjHfniN3ZFJWogOi3n5J/Y6XgNjwFOEzSFsN5o3PKV6bui8mL7xtgiI0ijUOV3CZiVuMoslM8jrUjpJEaocQCzZ7Y/YMy4j0MeRFzA== 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=t+qXuJbi/RQ+sUPbeR3VdxtysTfw8xOU/K8ymi3pT2I=; b=gEIRMHVTZwR0NSnVKoIQzoth8mNVtMwOPFXWTCsp8TqMF3lcwh4sbn6IKMm6TkcavjHsgYGS03ETjxUOfJXs3rgIL+eVpRoRbFcaZfmBfjXJl0a731Rs8C0f7hlp981DzjclnNE0T+En/mgSLhXzv0d0uMrFaLDRBnvd1m/pW+A= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:46 +0000 Message-ID: <87v8bxh2ti.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alexandre Torgue , Arnaud Pouliquen , Jaroslav Kysela , Liam Girdwood , Mark Brown , Maxime Coquelin , Olivier Moysan , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 13/54] ASoC: stm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:46 +0000 X-ClientProxiedBy: TYCP286CA0056.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 315b738c-5fce-4578-214c-08dbbe58dc29 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kyNZUzMCxJmFhHc4oGZNWVxQLtEi5pYHP/X4ij7+PbOHm4AE0ko0tj3XZ4/ViruAGW06Fsd2EY7K8gi+rc94Zf1KMsoll8UPnEkhFyOQwG9sQV0Bbxljsmo1vrGFW6WXGNoSprdmBAF0FPJuZPgO2vnfCuCdhy8eCzeJsOS2SK8XBjY3Y68OBeD38Upw01xss8KQrZTu0ezquR+KdyEQ0B4d/MPqD7S0dS4WEtZE/K91q/Uz32dIMC0L0NJ8kSTZRFndJmkpvmwMBQ5OXeQo67tCa0V1blcG+RT1GEH3D31EDKwiHujKOgGQRAElLhOJU4+Nk8uMVaTavzqAMx1EBuSkyfWAfF0G9iRVI3VT77iWKuh82/kR4RUVO8Cug+fPFMY033O7eyYXnnLsN8MtmdU14IHUWjDT831+GoEbYOpFgHkKovAK4Xb6hTLUMmKCQ3IFc9tD7YnBm00rfN6tqe8Uaj3quG0TSqyl0GWSrgTt1m9xlcQkEo6vd93PSBuORzkm1QYkFrVnwdnQO7pFTp5dYX8wjTDlFN6tGY8acO029JTeyQ1jfq2mlB2dZkmXDXWXmEHsJU+OoDVvtbeEwR87xrGaSuq/V2Npz9w31QpEyNzbttsAdbAgQN0wqcOoomRMT+9sdnTcCDXgDyVSqQ== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nrhBdxtJARAOu42nLzo0q1zto47Z77AApMDyJp8MWPRUroyOpFhla5hPiWU8ADkObSmzbeBi53TnHW6VwB+YA53OcGSCwZyrbd406wpdN00FmfbhhBIwe8uEOrrAvNVcSDbntTmG+Ha1k707BY+1XMfz5Me2COTVawkY+jVl5oxNfICC19wA3U9SI+you8LZ87FyLC8f8+X8ir7IQ5xWlLcACpyT1+FiKiJk4HoXDwECEIor0ZbNQdE6ealweNz0wjkNqAF3Rsww9RgEBz7Kib6y5fRlUoKHpxWsKH0MjtqXifoQx+E4mnoSGKuHjUp4CqNOYRzmTcJBldYFhC22Bcuo4zS3EUeQAqiCjQnlBZXTvOn2OwFJG744Yzd3HyfXHRIoC0JGtxBufYJqa6+QnFWEAgDs4yFlG9P9zk5J/24bNuh5eBcR3/mVfmZB2Iufo04kLZoaW28N/zQxlqOfefIFBwzOWEY600IZA5M6V6HO/6PkIezKrdJy7dwlhpClX7ZaObxIbSDfdnBgjiKHmTb6APUa15+LltldxMnO/d+A0oYk/QTGn5iUmlHyDYzMKeBOo0nUldY/Ar41alIrSTvbtqTqX9NQqSUn+slMGvU4L+c4i2VZjHNdCXVd3c1RehzZZ974TSe7wec5SXLoa2unz9nRlyPZIz03UUGTNdGBJo/q/V1Y9puIPNCXsfPVsgyqZEvFxTIg44cu13w2MpCSyVRcho431I0whn6cjiqT3D9RWnyXcdRfxazi+0lG3vCMsqilPOvbvhR3sdPD64CV0Pb9LfeXfN204nt2oJULJCLm0zStWnXG/cZSyOExzuUsXQp6f4o9unEBMdsQqSKoMPFQq/KL+RGgkuvm4H4sqZqIbc2tIUqWZu3yTRWD3b1QN+vntJuH3x5mnbOTRAhkDIY0K25Mg3wZuBqOl4KqCjZPA1JjBOv7qUJRfhj7mDel4Y340h8pgAAv+wH80UrY7kudCDlNr+xE6hi5jG5+OFHl3CDjUtfD4Yl51dDKJH3zhnrE2Mb/q/cOvrfQ+BryiTh864Qfxlrkjl594VeQgb/3RPKIW0r0DOdVf3lEHE7iflXCJ5K2+jcu7J3+qlOUZ+P2Zg6IrC82v+vlYFrO03cUs8uUo7LfQYJcYMZoC1gutsusfxFOR466QpHQWOcIQcBo+EIiPJzVQHRkNesJUDBpN1vQD/3/eH5h2K5S47DHzPO6QiTWPNcOXqtXMuQKtYTKv5JQRADJn7ikGORrLWHlX673nCr6iA+gxptNzcseG/0fFU9yh/uughKP+xvARre4/VhwAT8wI7nVlczdgfpAoILqGy/EIYtaiiRx6VlvHZxEzmoBkOZH4hxBDgPPrTuZtszfsq+9idjgttEMJJj1L4r970Cg3KcEcmwGuPgRueTGQyTgxE7msye5F50fPH6ROlCHa4b4dc7pg1DReqW548XUls9shPpnEmJRtn5++L3+/G76TIB4IqXjlhAseqAQdSrK1odpq0EEoyMEPssoLYSHHH3c8UfZEyFH4quSHBNuhDzGL9fFAdyOIkn4bEj3dhSYzo3M8+FzJIYfVOngjvpjdXcb8xC8HJVglrJmPBluq6FkSA1t6HqSlVOs+YRW2znNADpTOL8jP/M= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 315b738c-5fce-4578-214c-08dbbe58dc29 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:46.4388 (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: alV3OOzTlDSFwZMLPY4++yZGFjGUuOOtMmnrJE+e5z8g+920qg2rqmUvqH3SW3/0H2s0OYE5pTERGCcHUHgmNN9u2EfjHME+NvKbeuk5HTMzWh7NU+qZloLQAjO63Fzc X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: OFTOOWQUVP52DDBEQCNZOJGXMHAR6RYH X-Message-ID-Hash: OFTOOWQUVP52DDBEQCNZOJGXMHAR6RYH X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/stm/stm32_adfsdm.c | 24 ++++++++++++------------ sound/soc/stm/stm32_sai_sub.c | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index a8fff7378641..fb5dd9a68bea 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -167,7 +167,7 @@ static void stm32_memcpy_32to16(void *dest, const void *src, size_t n) static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private) { struct stm32_adfsdm_priv *priv = private; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(priv->substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(priv->substream); u8 *pcm_buff = priv->pcm_buff; u8 *src_buff = (u8 *)data; unsigned int old_pos = priv->pos; @@ -212,9 +212,9 @@ static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private) static int stm32_adfsdm_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct stm32_adfsdm_priv *priv = - snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -233,8 +233,8 @@ static int stm32_adfsdm_trigger(struct snd_soc_component *component, static int stm32_adfsdm_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); int ret; ret = snd_soc_set_runtime_hwparams(substream, &stm32_adfsdm_pcm_hw); @@ -247,9 +247,9 @@ static int stm32_adfsdm_pcm_open(struct snd_soc_component *component, static int stm32_adfsdm_pcm_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct stm32_adfsdm_priv *priv = - snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); priv->substream = NULL; @@ -260,9 +260,9 @@ static snd_pcm_uframes_t stm32_adfsdm_pcm_pointer( struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct stm32_adfsdm_priv *priv = - snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); return bytes_to_frames(substream->runtime, priv->pos); } @@ -271,9 +271,9 @@ static int stm32_adfsdm_pcm_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct stm32_adfsdm_priv *priv = - snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); priv->pcm_buff = substream->runtime->dma_area; @@ -286,7 +286,7 @@ static int stm32_adfsdm_pcm_new(struct snd_soc_component *component, { struct snd_pcm *pcm = rtd->pcm; struct stm32_adfsdm_priv *priv = - snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); unsigned int size = DFSDM_MAX_PERIODS * DFSDM_MAX_PERIOD_SIZE; snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 0acc848c1f00..8bcb98d9b64e 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1249,8 +1249,8 @@ static int stm32_sai_pcm_process_spdif(struct snd_pcm_substream *substream, unsigned long bytes) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct stm32_sai_sub_data *sai = dev_get_drvdata(cpu_dai->dev); int *ptr = (int *)(runtime->dma_area + hwoff + channel * (runtime->dma_bytes / runtime->channels)); From patchwork Tue Sep 26 06:21:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726446 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 E3118E8181F for ; Tue, 26 Sep 2023 06:25:12 +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 4CEE1E75; Tue, 26 Sep 2023 08:24:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4CEE1E75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709510; bh=6+7yar8ebeGia1XrMQKwCNhHx+jh/EZeufXm2xKZ4lM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eCsevvYm0Rp1UktYq1wsuIetYBtjDvtTtPGnPXGFnIKqMeSS32j/x4RCy/B8LcNud izDu7v1leLPt8Ts8+OWRN8j8Tq7qLEYz7cuPCORwGKV61LvGpjstKYloXXxQUR11Rc HwF3SDb2bmCaXZ4yMW44AarF+2wQaFSh8NkcYEpo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0F5D9F805F6; Tue, 26 Sep 2023 08:22:05 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 5342CF80570; Tue, 26 Sep 2023 08:22:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 53592F805F4; Tue, 26 Sep 2023 08:22:01 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::701]) (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 8E64BF805D4 for ; Tue, 26 Sep 2023 08:21:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8E64BF805D4 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=RMRSqmsK ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WzOYlU86UCRWSnv2PiOduleeCX3rYogimLyte1GFOR4tJKLXUP89wgjp5KN6Qjcg6QSyMoySGSWEOx4ikk+yGEQYyc9x4afFqEQjnQgSL//aKv/fp4K/B7ontTVcBSyccCGglnrO1W7ImWn6DD1WLkrmvKB9TGNJAI3435nhdlM8MHs2l3xVWzTzRS6tQofVWU925xySZvxF5KADq5UFE0lVVtxk7Nggk6jznv7m04VppEmT/tyG/nzn1MII50MIfcEWsMHaKXb5RGdMXjEVBrE2LfB8u/iG+pYYRpyzn4lIAVaMh7RQULzJDs0TdX/RWcTEk4Kc0cbFKQJOt0y5Qg== 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=qeuzCyisUiyei0bV9OjCpFi8xJokfexdPvYgI2vfWFc=; b=Lqq4RZxe0oAWXwAnw2lp5uc7N3uL264Ofy9ErKkuYYPzqU5Xg20H0x1sM50fohu5YHjUE7D78AZoweXlYAYO8iaoII0V1k6PlUTdBhVW157J27ugu4zIk11nRG3FHMdCl58lSwDbrwtzoRC4EHarJzRe/iIHeVkiGuQmtADawxfWssnQAPnM+ZBXh4TKO1Wy1QIq4DUYVmjRYgIF2iUSoevp5muz8Xr6w6V6Y4tpThsaziO1nITOylvtPVfcwV3ee/h9WtppMY3TU2N7015TTiDZE3DTKJhybC0kI1a37omHeKvhdRItTVeEdmbng2CX/M7cOdZPDbBSdptovyE5qA== 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=qeuzCyisUiyei0bV9OjCpFi8xJokfexdPvYgI2vfWFc=; b=RMRSqmsKhWDWhonKKA2d87JANwTSdYWcViscZJxmcMgra+EFZDdsqTOJg4ZtsEaNxv8NuV9WEom1ph+RF7VqxoPN8BuOOT8IalqCQkN9AEAQ8rbVZ2KUKEXSXo0amSX6RVktbBCPvKNOHZZGRucUzoELRLuyAgERKAd10l/g+3g= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:51 +0000 Message-ID: <87ttrhh2tc.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 14/54] ASoC: au1x: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:51 +0000 X-ClientProxiedBy: TYCP286CA0052.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::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_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c4e9f4c-23c2-45c8-ad0d-08dbbe58df66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7ONvN5sgJBd4v89ciS6X0uh/lWMRA2+6x3pFVXGXTuB/dg8OCQvFZmYRJ7As4WEj4/ojfhnxH6/sZYklHcmXEkcTQVmQdtJgV1CHLT6bzbLdKryjjDUG/pvDgGbTgW4rQDtWHJZQIspaxvKphU0xL/QUwHayXGDW1GFgcXjlUS3R1iNktbW9qBrHoSR2Z/Ujjm8xSZBbcaM0mpow6r1PLY0eaEE3p0mKMTKBQY6pzT0j2CMiKtZt0j61rTSz8rouZGXYowWLcl6FeU1kclHCHyc9r486VoBczgvndvTg80hKzeDBVPKUw+OxlOsFVay+XIp7r+a1ruNCtlupZF0Ku511xwZCO6xFaBOtvmP9ByeqzFFJk1czOXJESvOdl0u/A1W1WaJ9LBQvKgrXojYSXfgJeuRdcihZDayznmuKrEQCzO64ceRFxUwSrSmEZhvP4hNHVP0KpMltJXxg3UQg/lhDUaMKZgVFF1pwEg1J29StRtYkpY1KPUZiaMbId2irk+4Ss7Uj1AeCiKO0CdfW/taA5CpV8misMSbcXxbBXlCvYDAqHsfPxLllPHLBnPTFdIvTLU14FP32vINhbg+SXPf5pQz+NvvVZ7hIapYoxdD0pMcCz4WoT1CqzOOlBmFPPu+s89V6TVwtb3DDol7G+1UQYho5VGkI0AFUC3S9SLM= 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003)(32563001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: entpzDOjrgPRgwAjGPxTNnfZ8ejEKr4j6jmmqdJuSvY0NxGyTyCS+PbjYRBr3Oy62/AMSIzmveN90OoYpN4K7ThxhZy7mc6Qq67xA1KWk5gccFCzdl4jhksF2eslY1fYEIF2iV2HUFXG38yEzLn9hURh/chzjwmrrtFi4juQ28Se7CJ0/O5NQt4Y5TX6rvJa26MscvM1Z1Bg8ptsh9I49T2ADmsKJoDOgTGzfMlHBgFQk+c1se36jAP67giERIPp4itIeQz02MCMBhL73l19gG9FXZPZs5YtagBypPpcxv5UJNmyl/z4qadiDjvbSVZmX74TqICBlo4GqDgTMBINMsW9ufVkmlnRYnoPhuSE9HT0HbiGh4FX6Besg5QV0+9kzelmq+T+4UJc7bYHzvRrIPl0dQkG0RsE0LhuKk6j+Z1pHKb38TwwCj40yI34+B5ysLjTyIggnbq3FNDZ7kIp81bGfFL1XKxzqpymvy0UpxYSUp2SQPXkKAaKJk+ok+jRaZ3rzCET+/bBdejimDC5EcmRHrrCAvQnUxFPUXqfmKvuDMJPQNOONHndU1mrnzk/XRo2NmPaY47juoaPPfTwUq8HC2o3NLqMaxHqwTMlO8jDdadxpzNMNBzO/1tlSTrCmzzXVhQdzCCI3atzRYquXUVIaffctEmGcmWZDh/DFzt7OTqn/gtN15Mo4OdtDHoCnW/0A73Bx4Ve41thhQLE4y5B/jMxl26wyJ7NU9wc7HS1ZNrbmue8GqzSle6GnESHQoafnrlVbXuy3cq01oKwsLKA0+F3wneROkbJZfWYcuFyTMRFiImfnVPhEjtLcn12mmQDuWsq2I38c2jfEv8mSwM9o0CxTdbQbyeqm9GidOYAZZgpSZowQX+laY61wcNbl3HtmvQgDO0Bbog+iyqLHiGYd5+7Yr3Cuhg+7cgYSd38zzBbD4v8j2y5Bv1qPSpaWgdPsRg3jlSIWX/XFoUaeB5ZkZJJMiHdn6wwHMpREtSg9HqHbNrr/3k5VyGbwiTRnTNj9Dg2Wf4z/dsmCIEPo/8e4oONSJItUVRukq/5ZqcEL6O/qPXDJz+3agh57WdqN5QoZLKXiQFCPwggRon58wXBUnOB7w97bFIIP0VIUtncKDwT+zSW58qq20GgjEX3nwD7mHaawbpAlXhtljEbu+YVD+ew9Zq3S1wLDgzjdIOn74AvOfkhTnPt+UWjNDKeQPjgg/t4QNPl/sffLHNT9i2kGOOruvBrASq1vk6Ms3nFs12aNLTPiYk481N2BQyweUPJThlutGRkGFlrkJrcgoC3ma3m1Gu/pmP31LuFgdltbeask/OteA1fERuO7+NEHoWTHG4pm282o7RKyqG9+ioFOS9q+O2gDNE6oMbVVGsneZoT8UXxlq7VM44Q8iS/N/JF5TnkFSP6D3fNl6gMTw4JgRMFp3/hLLUR6gJabjzQkmqiiLsZHjIAG/dRRPFAMnLoMpNqnqRQZPfOBM5NjRcjaqh8prAMHCiOSua0raWvFwhEEELyKPwfiUAS2vaprWRvPqdKzbK7IgAgk5096Se+OQPmKTn+1x0UuScBNgN0R/u2YJDJrN+hb3DwZ8xh+Rd10uRtaRW6gXEKqSVoxYoMq5QidKJITxw7PsPhAZc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c4e9f4c-23c2-45c8-ad0d-08dbbe58df66 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:51.8802 (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: yXL3T8QrOsWJnFzfWl3NiXs/PYNoSYgKSZb9AwDnmThq7rs3MoTWxwYQmIKEeTQ9/0dnIdXKpiVFC5JCSS2I3k27Ir2zKoF8MJ39vFiEhvAsYT3NCCSVgewGByN/PC4n X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: JT44KLOQ4RKDNPLEIXRLSRTZ6Q3V5CH6 X-Message-ID-Hash: JT44KLOQ4RKDNPLEIXRLSRTZ6Q3V5CH6 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/au1x/db1200.c | 4 ++-- sound/soc/au1x/dbdma2.c | 4 ++-- sound/soc/au1x/dma.c | 4 ++-- sound/soc/au1x/psc-ac97.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index 400eaf9f8b14..83a75a38705b 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -94,8 +94,8 @@ static struct snd_soc_card db1550_ac97_machine = { static int db1200_i2s_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); /* WM8731 has its own 12MHz crystal */ snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 3d67e27fada9..ea01d6490cec 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -278,10 +278,10 @@ static int au1xpsc_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct au1xpsc_audio_dmadata *pcd = to_dmadata(substream, component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int stype = substream->stream, *dmaids; - dmaids = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dmaids = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!dmaids) return -ENODEV; /* whoa, has ordering changed? */ diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c index 7f5be90c9ed1..d2fdebd8881b 100644 --- a/sound/soc/au1x/dma.c +++ b/sound/soc/au1x/dma.c @@ -191,11 +191,11 @@ static int alchemy_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct alchemy_pcm_ctx *ctx = ss_to_ctx(substream, component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int *dmaids, s = substream->stream; char *name; - dmaids = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dmaids = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!dmaids) return -ENODEV; /* whoa, has ordering changed? */ diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 5d50ebc2bdd5..1727eeb12b64 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -58,7 +58,7 @@ static struct au1xpsc_audio_data *au1xpsc_ac97_workdata; static inline struct au1xpsc_audio_data *ac97_to_pscdata(struct snd_ac97 *x) { struct snd_soc_card *c = x->bus->card->private_data; - return snd_soc_dai_get_drvdata(c->asoc_rtd_to_cpu(rtd, 0)); + return snd_soc_dai_get_drvdata(c->snd_soc_rtd_to_cpu(rtd, 0)); } #else From patchwork Tue Sep 26 06:21: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: 728191 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 9C9BEE8181F for ; Tue, 26 Sep 2023 06:25:26 +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 8DE38DF2; Tue, 26 Sep 2023 08:24:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8DE38DF2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709524; bh=qJpRATjFrwybw0jghZAqM4+Rr3yxOZJxQAqgyT3TYH8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=PNtI52P21edYlW/+GbaNt96FZDZ86oZ8Y7Hnk+Rw+VqK855gRUiW76Wup/Z5zXENE FLWvBpoHs7MzALgKDo2ICxLWPyGdd0oK1MN3FfZ4cgp4lzPwyd+mOD6+sEoQp+datx yQnLxoiPssfINdWT8OXamhbV0mKgC8FCM0bzvjzg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 40294F805F9; Tue, 26 Sep 2023 08:22:13 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BD87AF8057F; Tue, 26 Sep 2023 08:22:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA2CBF80587; Tue, 26 Sep 2023 08:22:08 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::701]) (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 3E2D3F805F0 for ; Tue, 26 Sep 2023 08:22:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3E2D3F805F0 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=VHFIS8xU ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7rLUmITTN67LSe1ai/Oe5ZbxKOVaOSnx4qFCvEexEgLjCVxVLPgcACAQf1RixVpm1ZSQJOwfQtBWsA/PtsJxnxmP/rx7kndW5o276YMLqaxczTyyxL/3eE68zZf1Jmt33dyYUj7AnW4tPBwOCZd5JhY4lsgG1iiN7rT15oYADbG3esk/7n6jtUSpCIeEkg09F31vu+kDlMVBTD8kHTe7OX6Dh9FIIxVOXjUYB2Wc0Ve1CjyJxHeIJgGy6KtEKQAj6Qf1RcjzqtWS+NfyHsn/FHPhx5b1yQrIcLZXG5v8wguqbAyRZmzL0BnBUx0rmnRIE0ep6rTHYd9UlbdmF6oYA== 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=j67jq0f4VANwv4rmXjFdZQF9/V5fIQ3UwL1WYVaIffU=; b=dDL88gsE8UPdLzRoIA+4+e3NB3iaZRY9sCdTKgefDdwT4F5bp17f+O+Qh6PTWAYpXBpX9OFtkL5TnOlEk9ck4em5+XvvhgT9IaGcCy3t0TrI/ArjTNXTOyz3SH3CIAyunUcKsaaBoJ/dCDPNhm28dMv2ewjqwdw4lpLOZUXNagDA9FNHmBxnayM0GVN8nf9yirw3UDHJi7WYtyQN5sq/ZdwtI07d5T8Js9+tLtWudJ0ybx2sdIAQw51I5yNFJIN6Fl2PE/3g1Hus0tvQSeSP5h8k1jsU/tNudw1dJLMuW/8GmjYMANF186iZvyanZYcO8Yb2YjuUJxsxQYQoHWSPZw== 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=j67jq0f4VANwv4rmXjFdZQF9/V5fIQ3UwL1WYVaIffU=; b=VHFIS8xU9RGrdQ8oYFR0isQo2+ivfmzIvWUUjKe6/IEQLI4TwGUCKCWdktkctyn6MH2zoWR4o0B+5VYVUlRUXZ6xwNK9fZUKUvOZfoyoFG0MAAEUifd6ohkIn+p7qC0ElFDjgKniL7eW/OJkZnYyZylsMbsvr9daOTIL/finYhY= 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 TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:57 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:57 +0000 Message-ID: <87sf71h2t6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alper Nebi Yasak , Banajit Goswami , Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Stephan Gerhold , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 15/54] ASoC: qcom: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:57 +0000 X-ClientProxiedBy: TY2PR02CA0028.apcprd02.prod.outlook.com (2603:1096:404:a6::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_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cd08a9d-208f-4ab5-bbf0-08dbbe58e2eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oOApj6mI3wEb1FwitnXPoVtbCs/cyXVyVK59w5jDw4NC5H5RUBaNBF0P0LbVjbRuTQCGnG/eBk+2oa5F2L29HKBzzjOKfSgxYBtbkbhzoHBUU2FP3wmoCDhAIjSF3oyr5+L1pgtUhhQ1BE0UXTQ6u0ypqlM46KjrIWF3K3oQEQ/veHvQeINJt2UldNSxqKyojuFCj//AB2amA5OnpUX1XF2sHzF9gCnjvbg+wzaHi2z5QkTH3AsuJh2/W965rtFqYZhJurU+eSMFOwDh8cxSqGqJ+305L259DWe6HogNcwiBWIotUt6jejMb9riN5kWudH8CPa7MveBsEvOLzAJdLTzugaWfs8KjSCvxvcex1KmNk3mG0DmddDRs+zbBfgucFVwWIpaHEzpA30mI+7og1YaUUUGSYZc2EtSTFFZrYD3yyn7SuEwhvrG7dg8xRzNNyod0m+BNzJ9FPu9ZrmZ5cXULS7b8Ebw/ZOF4FuPQyvXD25CscEPJaAsSVtPX54+ZAK2ibbjr6I0rNEhB75h3bubAnb4li+RSxtuHEy2UkN8cYQj8AurSXJi3hKT7D6ZydHyKKIxB3L8H1Eeym8E+KV6szLDMEsnpgIlkqD2D/317yV3qD7DGFxqDVqpLs4m0vbcL3pWUXDoYv+6c+JLS5A== 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:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(30864003)(41300700001)(21314003)(579004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FqpBS6a+veRC+F9qelJJvelVRI2PBR5s/XhBaUv1wJd+6Efp2GdfYz8NpBtbCAY083pCho0aoF472DG+8JdG6uSmXsgsHqDfl/jJvqCYO3eTv8cymuKFxnXHTeZN8G8NdlIZ9b4s56qThMPmuLbd4wLGFrRHGhbucxbrqgRMNAeTQmf96WF/ykriammb+rRRivCxOW7O9ZQoupC4Ky9wkvlkJCnS4fMluul//3E5nL1RNrz2NhsgJtR+XkyV4I1zVOG3fU7S5Mq7eHJV6Kdr5KYMnNL05C6QLuXM53o6kyC5YfI4rGo1GYLiRqkTh3NuQQWqKjKrOFOVsvrTZjnHCpKaAZPgIPQdy1oX54Ltern6ENzZfTp8vLdOlPuM9hUUVb9fEUcOG6UbELjxkI1EAC+CQzAI1fSdiZtF5D8oL9G3i8sY/MEFEibTvviuwg99VRUjHsoCQT6E+Y2bbPLbG1NvCejlTSZE8TUZDKmYrZAk1LtdKzY96v5uR6eo4+5FAujLbyVT1ueLbz5jjw10DFcNohkdFzOZSTAIr0zT4pYb5dcdqKRVR7lgTnJDrWO9FEwqQjTEdlYVQ8eNi/qnQ8lhqS3nQ6RXuyKQyoLZqV09HvvV+HDU8IPpmlHHkidfXdCsbdSaC4EVtmeqSuEhpTQ51putXh788VPfMhPvhMqQaV7S12EYhfkO1+xaw1eHcSKHlEzKpmpyOVIaBvwZ4VJYTH73DFQlSha8p8u658Ro17ZeVkKfpsxjAqzGswv64/EDRLvZLuFI6Mypxiucf56JdDe6xMQ3+Qd/KvVqhMZcuYd4rGDi8toWcC4yRsWllUMwDF9FR4/+S1Z26nRLdELa66w3tBugBCi+leBhEJS4Oj7NDYea5o6yZ0dMCNgl9e4h+RCtYuorl06VLXGNt7SeA+riAPGXqAoGMG72NaQFrK1WgY55+A8ccoPolW1CEhKP7qNqo6ZOFsMY28emz26LKy43ftc+tU0M6QrMGSKG4JbniIgGAfNIJcN7o/nugqkAES/9ClR9mhonPdC+nlBkA35uPI8CiADFRiaiQWKIWChQgdPOaxrDIVKL1gh/xHffKZCH0PnlO0A5tZRRRL0Zllvj1REH9SdWJgaT7gTVC1XO6SDChlj0oIc7ownBDnp+8HEt5gJqdNdTwUb4nt9kRBdbLXb0c23/nKZc7m9CwuipTlh799YWEidZEO+Ft7+TUH2HtlyOTHwRtKhq/haQ2n6gHHeKXC1HzpG7iI39JFjlDsZj0/rjCOkv9WJHwTKLrQQS4dmE293kieZC+j5lDv+i7NPs99AJUcr3nWWvxpyX+ZlI8SOMtobvCHmNO8hPo0Qx7MPnK1iTlPHqHHBgOnHBLiFyxrfMS+0p6zsOMzf/RhJHNRxNWOhVWdkW9JMel0oyHktJumxcFh3IRLLfEpEt8AAzs32o5qeBebSPpRjs5YYfC+xNcOEesLgnDc3MDYLKlS3ij9ssxBeLPe7IccYmaQHbh1nBfjNaf7NsiOCG1JR3FFlr6sbeq8qCVbo4xzkP+yplUXK+MeFgTkJS3tHXOuiLkn6k5rinIJQyA2Zqp6FAvJ6UbP4IyleAk9fqdtsRSrqo1KiD70BMnsvi8AZuEf1HBmAKdaqLrUk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cd08a9d-208f-4ab5-bbf0-08dbbe58e2eb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:57.7963 (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: mR4jT780srUUyeCswjX3xJV4To7/uafft/UNw+yQ8b1NkpLkFaWVEu4TX6rYH+cvsiorMvSVMZrBBt7f0f7ixYJ6aUdpAQuCYC1MCLkkgfjS3t9QX0MiD/RUo6PiWxIL X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: N6PWIR4RQ35CCC2DL4SB5VADMXSAVCSQ X-Message-ID-Hash: N6PWIR4RQ35CCC2DL4SB5VADMXSAVCSQ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/qcom/apq8016_sbc.c | 8 ++--- sound/soc/qcom/apq8096.c | 8 ++--- sound/soc/qcom/common.c | 6 ++-- sound/soc/qcom/lpass-cdc-dma.c | 16 +++++----- sound/soc/qcom/lpass-platform.c | 50 ++++++++++++++++---------------- sound/soc/qcom/qdsp6/q6apm-dai.c | 4 +-- sound/soc/qcom/qdsp6/q6asm-dai.c | 10 +++---- sound/soc/qcom/qdsp6/q6routing.c | 4 +-- sound/soc/qcom/sc7180.c | 18 ++++++------ sound/soc/qcom/sc7280.c | 26 ++++++++--------- sound/soc/qcom/sc8280xp.c | 8 ++--- sound/soc/qcom/sdm845.c | 36 +++++++++++------------ sound/soc/qcom/sdw.c | 6 ++-- sound/soc/qcom/sm8250.c | 10 +++---- sound/soc/qcom/storm.c | 4 +-- 15 files changed, 107 insertions(+), 107 deletions(-) diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index 6de533d45e7d..ff9f6a1c95df 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -147,7 +147,7 @@ static int apq8016_dai_init(struct snd_soc_pcm_runtime *rtd, int mi2s) static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); return apq8016_dai_init(rtd, cpu_dai->id); } @@ -183,7 +183,7 @@ static int qdsp6_dai_get_lpass_id(struct snd_soc_dai *cpu_dai) static int msm8916_qdsp6_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_BP_FP); return apq8016_dai_init(rtd, qdsp6_dai_get_lpass_id(cpu_dai)); @@ -194,7 +194,7 @@ static int msm8916_qdsp6_startup(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct apq8016_sbc_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int mi2s, ret; mi2s = qdsp6_dai_get_lpass_id(cpu_dai); @@ -215,7 +215,7 @@ static void msm8916_qdsp6_shutdown(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct apq8016_sbc_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int mi2s, ret; mi2s = qdsp6_dai_get_lpass_id(cpu_dai); diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index 5d07b38f6d72..cddeb47dbcf2 100644 --- a/sound/soc/qcom/apq8096.c +++ b/sound/soc/qcom/apq8096.c @@ -30,9 +30,9 @@ static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static int msm_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS]; u32 rx_ch_cnt = 0, tx_ch_cnt = 0; int ret = 0; @@ -66,7 +66,7 @@ static const struct snd_soc_ops apq8096_ops = { static int apq8096_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); /* * Codec SLIMBUS configuration diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index e2d8c41945fa..f2d1e3009cd2 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -138,7 +138,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card) } } else { /* DPCM frontend */ - link->codecs = &asoc_dummy_dlc; + link->codecs = &snd_soc_dummy_dlc; link->num_codecs = 1; link->dynamic = 1; } @@ -189,8 +189,8 @@ static struct snd_soc_jack_pin qcom_headset_jack_pins[] = { int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_card *card = rtd->card; int rval, i; diff --git a/sound/soc/qcom/lpass-cdc-dma.c b/sound/soc/qcom/lpass-cdc-dma.c index 31b9f1c22bee..8221e2cbe35c 100644 --- a/sound/soc/qcom/lpass-cdc-dma.c +++ b/sound/soc/qcom/lpass-cdc-dma.c @@ -32,8 +32,8 @@ enum codec_dma_interfaces { static void __lpass_get_dmactl_handle(struct snd_pcm_substream *substream, struct snd_soc_dai *dai, struct lpaif_dmactl **dmactl, int *id) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -122,8 +122,8 @@ static int __lpass_get_codec_dma_intf_type(int dai_id) static int __lpass_platform_codec_intf_init(struct snd_soc_dai *dai, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpaif_dmactl *dmactl = NULL; struct device *dev = soc_runtime->dev; int ret, id, codec_intf; @@ -171,7 +171,7 @@ static int lpass_cdc_dma_daiops_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); switch (dai->id) { case LPASS_CDC_DMA_RX0 ... LPASS_CDC_DMA_RX9: @@ -194,7 +194,7 @@ static void lpass_cdc_dma_daiops_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); switch (dai->id) { case LPASS_CDC_DMA_RX0 ... LPASS_CDC_DMA_RX9: @@ -214,7 +214,7 @@ static int lpass_cdc_dma_daiops_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); struct lpaif_dmactl *dmactl = NULL; unsigned int ret, regval; unsigned int channels = params_channels(params); @@ -257,7 +257,7 @@ static int lpass_cdc_dma_daiops_hw_params(struct snd_pcm_substream *substream, static int lpass_cdc_dma_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); struct lpaif_dmactl *dmactl; int ret = 0, id; diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 990d7c33f90f..73e3d39bd24c 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -192,8 +192,8 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct lpass_variant *v = drvdata->variant; int ret, dma_ch, dir = substream->stream; @@ -284,8 +284,8 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct lpass_variant *v = drvdata->variant; struct lpass_pcm_data *data; @@ -321,8 +321,8 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component, static struct lpaif_dmactl *__lpass_get_dmactl_handle(const struct snd_pcm_substream *substream, struct snd_soc_component *component) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct lpaif_dmactl *dmactl = NULL; @@ -353,8 +353,8 @@ static struct lpaif_dmactl *__lpass_get_dmactl_handle(const struct snd_pcm_subst static int __lpass_get_id(const struct snd_pcm_substream *substream, struct snd_soc_component *component) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -388,8 +388,8 @@ static int __lpass_get_id(const struct snd_pcm_substream *substream, static struct regmap *__lpass_get_regmap_handle(const struct snd_pcm_substream *substream, struct snd_soc_component *component) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct regmap *map = NULL; @@ -416,8 +416,8 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -569,8 +569,8 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, static int lpass_platform_pcmops_hw_free(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -597,8 +597,8 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -660,8 +660,8 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -859,8 +859,8 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer( struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct snd_pcm_runtime *rt = substream->runtime; struct lpass_pcm_data *pcm_data = rt->private_data; @@ -911,8 +911,8 @@ static int lpass_platform_pcmops_mmap(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct vm_area_struct *vma) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); unsigned int dai_id = cpu_dai->driver->id; if (is_cdc_dma_port(dai_id)) @@ -926,8 +926,8 @@ static irqreturn_t lpass_dma_interrupt_handler( struct lpass_data *drvdata, int chan, u32 interrupts) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); struct lpass_variant *v = drvdata->variant; irqreturn_t ret = IRQ_NONE; int rv; @@ -1169,7 +1169,7 @@ static int lpass_platform_pcm_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *soc_runtime) { struct snd_pcm *pcm = soc_runtime->pcm; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); unsigned int dai_id = cpu_dai->driver->id; size_t size = lpass_platform_pcm_hardware.buffer_bytes_max; diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index c90db6daabbd..739856a00017 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -332,7 +332,7 @@ static int q6apm_dai_open(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_prtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_prtd, 0); struct device *dev = component->dev; struct q6apm_dai_data *pdata; struct q6apm_dai_rtd *prtd; @@ -478,7 +478,7 @@ static int q6apm_dai_compr_open(struct snd_soc_component *component, struct snd_compr_stream *stream) { struct snd_soc_pcm_runtime *rtd = stream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_compr_runtime *runtime = stream->runtime; struct q6apm_dai_rtd *prtd; struct q6apm_dai_data *pdata; diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index fe0666e9fd23..5e14cd0a38de 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -218,7 +218,7 @@ static int q6asm_dai_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *soc_prtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_prtd = snd_soc_substream_to_rtd(substream); struct q6asm_dai_rtd *prtd = runtime->private_data; struct q6asm_dai_data *pdata; struct device *dev = component->dev; @@ -350,8 +350,8 @@ static int q6asm_dai_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *soc_prtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_prtd, 0); + struct snd_soc_pcm_runtime *soc_prtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_prtd, 0); struct q6asm_dai_rtd *prtd; struct q6asm_dai_data *pdata; struct device *dev = component->dev; @@ -443,7 +443,7 @@ static int q6asm_dai_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *soc_prtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_prtd = snd_soc_substream_to_rtd(substream); struct q6asm_dai_rtd *prtd = runtime->private_data; if (prtd->audio_client) { @@ -603,7 +603,7 @@ static int q6asm_dai_compr_open(struct snd_soc_component *component, { struct snd_soc_pcm_runtime *rtd = stream->private_data; struct snd_compr_runtime *runtime = stream->runtime; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct q6asm_dai_data *pdata; struct device *dev = component->dev; struct q6asm_dai_rtd *prtd; diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index bba07899f8fc..c583faae3a3e 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -1048,9 +1048,9 @@ static int routing_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct msm_routing_data *data = dev_get_drvdata(component->dev); - unsigned int be_id = asoc_rtd_to_cpu(rtd, 0)->id; + unsigned int be_id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct session_data *session; int path_type; diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index 57c5f35dfcc5..d1fd40e3f7a9 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -57,7 +57,7 @@ static int sc7180_headset_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct sc7180_snd_data *pdata = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_jack *jack; int rval; @@ -93,7 +93,7 @@ static int sc7180_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct sc7180_snd_data *pdata = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_jack *jack; int rval; @@ -117,7 +117,7 @@ static int sc7180_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int sc7180_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case MI2S_PRIMARY: @@ -139,8 +139,8 @@ static int sc7180_snd_startup(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int pll_id, pll_source, pll_in, pll_out, clk_id, ret; if (!strcmp(codec_dai->name, "rt5682-aif1")) { @@ -225,7 +225,7 @@ static void sc7180_snd_shutdown(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case MI2S_PRIMARY: @@ -249,7 +249,7 @@ static void sc7180_snd_shutdown(struct snd_pcm_substream *substream) static int sc7180_adau7002_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case MI2S_PRIMARY: @@ -269,8 +269,8 @@ static int sc7180_adau7002_init(struct snd_soc_pcm_runtime *rtd) static int sc7180_adau7002_snd_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_pcm_runtime *runtime = substream->runtime; switch (cpu_dai->id) { diff --git a/sound/soc/qcom/sc7280.c b/sound/soc/qcom/sc7280.c index 43010e4e2242..c23df4c8f341 100644 --- a/sound/soc/qcom/sc7280.c +++ b/sound/soc/qcom/sc7280.c @@ -58,8 +58,8 @@ static int sc7280_headset_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_jack *jack; int rval, i; @@ -115,7 +115,7 @@ static int sc7280_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_jack *jack; int rval; @@ -137,8 +137,8 @@ static int sc7280_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int sc7280_rt5682_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_card *card = rtd->card; struct sc7280_snd_data *data = snd_soc_card_get_drvdata(card); int ret; @@ -176,7 +176,7 @@ static int sc7280_rt5682_init(struct snd_soc_pcm_runtime *rtd) static int sc7280_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case MI2S_PRIMARY: @@ -205,7 +205,7 @@ static int sc7280_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai; - const struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + const struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card); struct sdw_stream_runtime *sruntime; int i; @@ -236,7 +236,7 @@ static int sc7280_snd_hw_params(struct snd_pcm_substream *substream, static int sc7280_snd_swr_prepare(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - const struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + const struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sc7280_snd_data *data = snd_soc_card_get_drvdata(rtd->card); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; int ret; @@ -267,7 +267,7 @@ static int sc7280_snd_swr_prepare(struct snd_pcm_substream *substream) static int sc7280_snd_prepare(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - const struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + const struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case LPASS_CDC_DMA_RX0: @@ -287,7 +287,7 @@ static int sc7280_snd_hw_free(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct sc7280_snd_data *data = snd_soc_card_get_drvdata(rtd->card); - const struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + const struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; switch (cpu_dai->id) { @@ -313,7 +313,7 @@ static void sc7280_snd_shutdown(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct sc7280_snd_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case MI2S_PRIMARY: @@ -338,8 +338,8 @@ static int sc7280_snd_startup(struct snd_pcm_substream *substream) unsigned int fmt = SND_SOC_DAIFMT_CBS_CFS; unsigned int codec_dai_fmt = SND_SOC_DAIFMT_CBS_CFS; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret = 0; switch (cpu_dai->id) { diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index 14d9fea33d16..cfb9c8dbd599 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -34,7 +34,7 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd) static int sc8280xp_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *channels = hw_param_interval(params, @@ -62,7 +62,7 @@ static int sc8280xp_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sc8280xp_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card); return qcom_snd_sdw_hw_params(substream, params, &pdata->sruntime[cpu_dai->id]); @@ -71,7 +71,7 @@ static int sc8280xp_snd_hw_params(struct snd_pcm_substream *substream, static int sc8280xp_snd_prepare(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sc8280xp_snd_data *data = snd_soc_card_get_drvdata(rtd->card); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; @@ -83,7 +83,7 @@ static int sc8280xp_snd_hw_free(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct sc8280xp_snd_data *data = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; return qcom_snd_sdw_hw_free(substream, sruntime, diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 29d23fe5dfa2..25b964dea6c5 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -58,8 +58,8 @@ static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28}; static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card); u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS]; @@ -98,8 +98,8 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream, static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; int ret = 0, j; int channels, slot_width; @@ -183,9 +183,9 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream, static int sdm845_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret = 0; switch (cpu_dai->id) { @@ -233,8 +233,8 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *component; struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(card); struct snd_soc_dai_link *link = rtd->dai_link; struct snd_jack *jack; @@ -331,11 +331,11 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream) { unsigned int fmt = SND_SOC_DAIFMT_BP_FP; unsigned int codec_dai_fmt = SND_SOC_DAIFMT_BC_FC; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int j; int ret; @@ -421,10 +421,10 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream) static void sdm845_snd_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case PRIMARY_MI2S_RX: @@ -467,9 +467,9 @@ static void sdm845_snd_shutdown(struct snd_pcm_substream *substream) static int sdm845_snd_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; int ret; @@ -506,9 +506,9 @@ static int sdm845_snd_prepare(struct snd_pcm_substream *substream) static int sdm845_snd_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; if (sruntime && data->stream_prepared[cpu_dai->id]) { diff --git a/sound/soc/qcom/sdw.c b/sound/soc/qcom/sdw.c index 1a41419c7eb8..ce89c0a33ef0 100644 --- a/sound/soc/qcom/sdw.c +++ b/sound/soc/qcom/sdw.c @@ -12,7 +12,7 @@ int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, bool *stream_prepared) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; if (!sruntime) @@ -64,7 +64,7 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdw_stream_runtime *sruntime; int i; @@ -93,7 +93,7 @@ int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, struct sdw_stream_runtime *sruntime, bool *stream_prepared) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (cpu_dai->id) { case WSA_CODEC_DMA_RX_0: diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index 9626a9ef78c2..6558bf2e14e8 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -51,8 +51,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) unsigned int fmt = SND_SOC_DAIFMT_BP_FP; unsigned int codec_dai_fmt = SND_SOC_DAIFMT_BC_FC; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); switch (cpu_dai->id) { case TERTIARY_MI2S_RX: @@ -73,7 +73,7 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sm8250_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card); return qcom_snd_sdw_hw_params(substream, params, &pdata->sruntime[cpu_dai->id]); @@ -82,7 +82,7 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream, static int sm8250_snd_prepare(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sm8250_snd_data *data = snd_soc_card_get_drvdata(rtd->card); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; @@ -94,7 +94,7 @@ static int sm8250_snd_hw_free(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct sm8250_snd_data *data = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; return qcom_snd_sdw_hw_free(substream, sruntime, diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c index 80c9cf2f254a..553165f11d30 100644 --- a/sound/soc/qcom/storm.c +++ b/sound/soc/qcom/storm.c @@ -19,7 +19,7 @@ static int storm_ops_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = soc_runtime->card; snd_pcm_format_t format = params_format(params); unsigned int rate = params_rate(params); @@ -39,7 +39,7 @@ static int storm_ops_hw_params(struct snd_pcm_substream *substream, */ sysclk_freq = rate * bitwidth * 2 * STORM_SYSCLK_MULT; - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(soc_runtime, 0), 0, sysclk_freq, 0); + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(soc_runtime, 0), 0, sysclk_freq, 0); if (ret) { dev_err(card->dev, "error setting sysclk to %u: %d\n", sysclk_freq, ret); From patchwork Tue Sep 26 06:22:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726445 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 D4A3FE8181F for ; Tue, 26 Sep 2023 06:25:43 +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 8424D84B; Tue, 26 Sep 2023 08:24:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8424D84B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709541; bh=9H1FiWcWVuJtXGBpHZo1A4zNzln3nUGvbho7qhinYyM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=pqKKGJJHmOnXKrq2UcCK4uvRCcK+ocJl+VPaW6FjEGWP+PpQU6ovzoLpwuTcER5uy eQ5hUKPP1NMMDWPmoTWsuN+OtehlEXmgHwFhyLmt4jGX2TsrP89m7j2jJQGPMRl6C3 ArIbIJQ+YraLMfw7RaCVY1RNxeHBM6Xr88Wy+gSk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 81634F805A0; Tue, 26 Sep 2023 08:22:17 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1F565F805A0; Tue, 26 Sep 2023 08:22:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 29D57F805F8; Tue, 26 Sep 2023 08:22:13 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72b]) (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 A6FE4F8057C for ; Tue, 26 Sep 2023 08:22:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A6FE4F8057C 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=CFC5jFea ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CIYCZj/krC4hhEbMSOKsjkbNoHUAQRini10W/WdLtmm4xhT/clIBlJgplyyLUd+i2TgtCQQ8Z2iaCkY1DugLK3VEqXWSKxdCxU65CLhYP2/41YZxMnASnr0zA8HGiuWR5oBIje0DPOt4ZNdKbqkoB/eWdf0p0wBISRPUIZWvu5c/5gMHtxo4kkU0mJ4eWL1dqiEVnnc60vbRkyN2vdDlG+isk9RKDVaZHwQ5VTqMwlHjVPd9OKI5K+w89nBG/gQH9oyP9MEAOwif/9lwBLUDBKu6KRWoakz/CVGsDI3UaYHM8jlbSdJmVSfutX1gQ237jNey0VIyAXjv4QtAHJo6Xw== 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=kFZpTjJv+vW132Nn7vRiC6s9CTPpDoxdWJpJl7XoEbw=; b=SGRsGGT+tbX1OilFOGNG2DDU7+AAFkHs5kFcPTRLUIsbKAZ/jl+z/M2FryxrqWV2mKk2NWVmrgxeqEemjrFo8BvfIrpC7H4X2j3s2JPkZJy/E55HmGWwpWKXn4Lt/D7l0mfuLPYAV2u7r6FURIkiaC03C/uFAcpaiMbjiutBemgQkYYgPcXspn0u8XrwWUr+wm0bbfeK3cvFhVkuIpUd6kKzbZERU9aZXlIoHGCB2z8e2d5Z/LWJMhxwwN7adSkdG7APH+etO3Ft/9/HJG2FZggjYUU96AYInuuojE58woFnc8jVc2dKAffrb4A8+LN6Nz6FNi07GxNuvqkNi2vaVw== 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=kFZpTjJv+vW132Nn7vRiC6s9CTPpDoxdWJpJl7XoEbw=; b=CFC5jFeaBVqSmEevE/WySgL3qXnKR8B4BXlxKaXHy4KNEN21r3QQECC31U36gTrevg4WtCIc2yhTGwhG6gZneAgruzBLMrxpv+Uh9EVi04lHf6eo8sZweoxXsrK5/zCVoXrGjae1qhA7fwoiTSlBb0ffuwPnI0E6/c9yuU1Nzs8= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:03 +0000 Message-ID: <87r0mlh2t1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Baolin Wang , Chunyan Zhang , Jaroslav Kysela , Liam Girdwood , Mark Brown , Orson Zhai , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 16/54] ASoC: sprd: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:03 +0000 X-ClientProxiedBy: TYCP286CA0331.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38e::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 7268899c-63c3-423a-922d-08dbbe58e656 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tWROW37jgF3LjUbCGBYhzpPTducN7BCj7MY1WhXJm6S4FHzLK0DEPk+GGwtWg7FaNJepx13DmHYDibutnIFxIESoZL/DdnltvrU2pZiBCJa96yCirPP1X2ST40WqoLJO5ARLqfGojEvsSnjL7HDYEAazg8E4gCheu1UaForqwfGR/SbZsuiSPJ17Txdb/PL7PFYn/+kFgNJUCrspXwhZ9pkTfCfPCedSdXrRfMIN7gsuruC7g4NUMq0B5hXOarpZoh390r9b58vqA7R/Kan3I3QEWx/Zbw58rfWmQEWpefJevi4iDStGdQvj+0KQRiUmoRp6w9pYtI13lj72j4vwS3pTSuwsHH3euV2PK82mRn1EI6vIHQTauFRMEFjGaQ5lMTGkNnURcbmFvYCtvgwO8AB7oD5/AquCvPMPI5JJfdFhznJLUFGHJbyVWbnWewy/zTe22N6RIvjzzhb0Y1KzjEPoHwXetWefytVkpM/Gi9DeYa9JnrRiBwAiymgy3LD+oyRz/iv1imQtPXgrxOKtvIa8PdGbF84b8Jfg7gBkPYU9PTKqRcQfZEikAJuKBtQpzcTA3egiMZTyiXosJnCmvDBy5pxoyuo5H27O+Ovp3AnRB/jN1BVkw5PCAMMUBO9y2Aedb6RqqGEVieP8xiaWwg== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wU5Zwjpv8VbxCA0djT5NIvn/NiF/ZCszRdg+Dxq1bqKSVMqsyPSrmSMsJdtytwbJhdvDZJUbON/K0La0gEg0iCfbdXqSBxQpSpwn43oQIfxG8csZ+DSedWdh9oEu90SyrCawm4pRTZnl4n4iHVIMznJzDTVDGvPXXjKDhZW283Kd65yXulSPZzYmuUmerjt+a1t/uCpG2pCdgzali3ulzS1GY2VQDnbg4siRpADHP7NPMtHLuReOMd1W+qS5ejj9O/CE/WQZFVx/USSWb9GiGtTh2QvEW4q86cJMl1l8Y0V91DFMIFoAL/AruIN9YZQE0RSuhSdwo8yhDmqgd/HW7vnq27epsb9RbRoUujgD0weJ//m3OdZzFPFEZmfR5Q2yF8JoY5+8rdRgRwtcZmqqdpVPNmhcZFRIEcoo1nN1615wECeNLbNlJU+IeDQGfJ9skr/2hJaXPnMP53RRuqi+NTnS77TLW2WN51Y2pGGp3VHti/rVFu5B1IVfmj8kTJ8B8jFdZzxDg7cXRrzLb48cpwoMl4fGwnTBMoRFA+LKzcrFhSZjjnqEQYwwU5JMA5jq5qQ+mYmRldR+6MSsHRTfkudxIQp9yaxITqAsGxUImgBSoyuXo64p6Xn2g9umoJEfUML8TsC5QAvZwkwYD/12zZJ0NAR5OsJCO/otaM4r5/KX/Xi1Zswarg4aHiBjRDM930ZWMnyrQkxLGoLDJ17pn+ZWdsVZJqxO9Yp/5SC9bu3TmPuHc5PlaclVJMpkOETzRYav6evJAef8tOXf1qwEek/MmfCI3PFhWHA3nibeQyJvij5ao1Y3yU6dCzuw/gA4JqM6h9VSsNPzzlOFSMJPiDkkEIo4Pbb4YvoV+38dt12YuEIYtbMInATExOis38ldbjj04Ojp3OL+b6WDvPLLguj8h+KMBJyjHIHMaPDx1L+pdEJY5NC9s1E39nNOeB+7pBNwF5/9QWOoe71QWrydUniY0QUVnHlsmdw8nP7X12LKLeqU2kCcv20mSmSR4BjEy8uc4lU3ZUHXppfCfajJWgiR1Fp0QhhEM7znTP2rb56GPDYOTRogXJWv3FVNfsGGc9FvODQOhHlLvnjQd/76CDk5oCadbSaJURbH0hssOI4AcC8u1B+/mcyCy+uNNeWzhPN4FIOTF9+Z4KWNCJiw8b+yGP1umN/3fVI4NFIh1iM4ke39eqQlwVkVkfjmgL2AtRVChtVPctLLYooaaTPy4klFVpHGeh9RjUQ3l03H4mXMjmre0fhnM5pgqcoWUFI9X7liXA+ISeEoK8DGlhxmwVbNrHZyc/j1ZFrgA2ESHLT6GWkXY069kmiGqKSBrwDw9teLGqMQDXz7OM71VxzNw4CGxOaPPuZAjqorjxDRhNnl5qy06CFggP/asfV+nuDRZ7HawHjOrU45j7+tE2fT2AqsZD4BtiSGkrT5On9Ur2vj8mxoaxLAQkHRvgjLaz2IMHC6JCJDmZlcR2YukvUSoZyI5EaqLVKhzj3aOzdDMcCdGDUmmceeIXD9wkKBVN9uMS3eYXOcZDAx17nnfJe4at7E2ysAoEO8jaRmipgMzNZFpWkKBh/1comrWUe0qhC9DtLG6rJjr5nR7vGgfp8mqFlGWZkMoibtOHoc1GY1bEs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7268899c-63c3-423a-922d-08dbbe58e656 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:03.5184 (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: HAMdwCwhRIr0WiyuODMCEtou97eCfYQ8Z1sqjBcPfIoRn1iKDSHIJuIduBWsHuQ9dVtTnvXwWZftX+iaOxSE3k80TPBDqOSgAoeY7t5RTGsTlfeSYBpKYHJyLTTHJDCv X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: VPJPSSSDYQ6SVAJ2VOQF4JIO3ID7O3FQ X-Message-ID-Hash: VPJPSSSDYQ6SVAJ2VOQF4JIO3ID7O3FQ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/sprd/sprd-pcm-compress.c | 4 ++-- sound/soc/sprd/sprd-pcm-dma.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/sprd/sprd-pcm-compress.c b/sound/soc/sprd/sprd-pcm-compress.c index 6507c03cc80e..6cfab8844d0f 100644 --- a/sound/soc/sprd/sprd-pcm-compress.c +++ b/sound/soc/sprd/sprd-pcm-compress.c @@ -135,7 +135,7 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component, struct sprd_compr_stream *stream = runtime->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct device *dev = component->dev; - struct sprd_compr_data *data = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct sprd_compr_data *data = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct sprd_pcm_dma_params *dma_params = data->dma_params; struct sprd_compr_dma *dma = &stream->dma[channel]; struct dma_slave_config config = { }; @@ -318,7 +318,7 @@ static int sprd_platform_compr_open(struct snd_soc_component *component, struct snd_compr_runtime *runtime = cstream->runtime; struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct device *dev = component->dev; - struct sprd_compr_data *data = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct sprd_compr_data *data = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct sprd_compr_stream *stream; struct sprd_compr_callback cb; int stream_id = cstream->direction, ret; diff --git a/sound/soc/sprd/sprd-pcm-dma.c b/sound/soc/sprd/sprd-pcm-dma.c index 48d90616b23f..d6b96cc2f708 100644 --- a/sound/soc/sprd/sprd-pcm-dma.c +++ b/sound/soc/sprd/sprd-pcm-dma.c @@ -190,7 +190,7 @@ static int sprd_pcm_hw_params(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct sprd_pcm_dma_private *dma_private = runtime->private_data; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sprd_pcm_dma_params *dma_params; size_t totsize = params_buffer_bytes(params); size_t period = params_period_bytes(params); @@ -200,7 +200,7 @@ static int sprd_pcm_hw_params(struct snd_soc_component *component, unsigned long flags; int ret, i, j, sg_num; - dma_params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!dma_params) { dev_warn(component->dev, "no dma parameters setting\n"); dma_private->params = NULL; From patchwork Tue Sep 26 06:22:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728190 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 19BF3EE020C for ; Tue, 26 Sep 2023 06:25: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 67F3AEAD; Tue, 26 Sep 2023 08:24:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 67F3AEAD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709549; bh=fdem2BFplzcLUYI0ONlnz+Y0r1l17M3BA8JTlrrYrrY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hGO/IAAmf/ZekM8xTBBIleg1UucAE91Mio36xNAMqYpg5MtRMg54Nx3D+ZFoBz+sp tCqzFcHdui3LFb7xJVJm+LEYVnmt3jpUM9YPOwwWOEkz42//onE8j9BPMxERK6tFc5 Tjl2PToPjoGRjzmlC10WRFL8sERHwp/dgjxU+Zcc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 68684F80608; Tue, 26 Sep 2023 08:22:27 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 81B4BF805FB; Tue, 26 Sep 2023 08:22:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DB4BEF80600; Tue, 26 Sep 2023 08:22:23 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20731.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::731]) (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 BCE7BF80571 for ; Tue, 26 Sep 2023 08:22:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BCE7BF80571 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=XJg2HjH/ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gVsZRT01MFntz1ultU+rRN4bJZTTqHv4T5r4m2Ize7ixtkI4GYbOD9QSSFOpZD56opCkK/jNwawV3gi+HlNNfWyyxwO2a9lw9/MGj5uG0pBqtHKueAt7IKVVvMWIQYbDomVf0TcdAa4PPtYgLkSotEkjiAb6RJQ+zwvDpSqqoj6g7+xiU8vegFBaP25EW5JuEoMsWoHglGNvJOvy4SzsxF76J8l1jNNQh4PgvgItHMbYfqeXrgZNlgoOEHe1aW70EJ0rCCKXNbcIqFBIa9+skzvZtW3CelQLCYnpCPVGZnrLa1GQcmLcxbdheeA7e0Rrr7gckPODVPsX4zJZ5t4HnQ== 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=1NhSl7FqdQmI9Tx4a5bSUNdX6rKe6H84go9qUBobzgA=; b=N638/UKmkmkPJ59b/LbHx+IABIzk9vfC02Bx4uwm3Y7DG2rQeB0W7GH41CuqVq/XzFOkZ6uA8OqKqNy4TyzQMwMB0gPiVABFhTqMf6/uEqbGfdZvUhdDeVug1uRlQiacQVOI6kYeEuW6DW9gvN47Q1fLqf/ZU6luH90+T+deLH6FOrWeoETeLyvFwseNFmMwyRScgUI4vZIMSJPpiPFg0WehyEU7SIHtoP8xB35VXzjxdjyzS60/j3QXV8RqpX0fKt04xUKfuwXqRGmigII71Ay+yEKoj9pympHMVxcJordOiRHrOzH48XSYAEHJkSrZCjtKh+PeF+rQwak7L4gJXA== 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=1NhSl7FqdQmI9Tx4a5bSUNdX6rKe6H84go9qUBobzgA=; b=XJg2HjH/66M7290eyo3ReJMPc7Q+nk3ltK7hQnal+HDgHhzpE79Ifckdz5D0zM+YAMK0J8neJB6+t1fjtvPmZrSmr8acEoP3qUIbJu3soDZclkmCcH1iErbPGJJ6SSF1sejzJDmiscYToG1rpbNaXa+FjT523wdtYerd6DJJbB8= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:12 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:12 +0000 Message-ID: <87pm25h2ss.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Martin_Povi=C5=A1er=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 17/54] ASoC: apple: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:12 +0000 X-ClientProxiedBy: TYCP286CA0268.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::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_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d149c79-5039-4879-8ab7-08dbbe58eba0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X7jkjL9I61sbSC7R9z3ywCp11whYmmdFD1iLbrgqDECNN1ElKx9uNvt5bn09jenxLvYNQQ372zeqPK08ibCsZhb9jHrGslw0hehshouWxdm4nImFy39aaBjM8jhMrOM+28srppLXSaAIH6I0TOiJ2i4FXCaYZLGYen8v+N9xsv+X/olQ6ydL7H6+npGoZNK7wxVQipUoEwVVacXEVZbard/Z4BxZOW2tXbBPmR7ZQ0BRAv85btkbBZXj4DvApsQYaMMEph5Bq7KxzTMAykEfRr8BFGEf/tL5rJMTDudeIFq8ppX79kCUygdeVQw2DAQO4eljlxeE8HMAwS8iPQDrgAj+O+nziw1U6Jta7rO7Puq+6ahbNOVPCrFnixFSvwadIKsqebxFepgbMnviU04U3C4CdWvyhCExcMKroMTk+soAskM7XOnIf9HW1j7zHRzgpci/oTFG4kHHnerXL9G6vHnOhumpV4n+NkwOwohvfXsuYBsKQSaqxgXSUl0wVUO0i71OIWGz+miY+A54Q0FK+N6FpdL3wuLYO+/5h7+fnTH2kcDnvWVOoSR428omvzFeXPFwnfUUvIcGniOtk+kjOGwvf5hRqkci55RyeVNx7zjYjRQ6KtHLa4iL5aAzjXdHkPl2NnfdpvDEIRtCgsQvPJtYiSekRrefgEM93EEnUSo= 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(47660400002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(46800400005)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BatQJVpWe/e34Lv842Sf2NyXCzreYq6kDKibP/+74dUpDlhkYRIFVqjUDXf6gaM+cUUBLqixSamEAeCgrI19k0TahYpAISKvlNByfDilVqwBE7YIbWcBXJLU/6UHGZjOvySGi6ijYXQsfVLRdFhTq16ocU+UPbtdG1jN3rB3mu4AYnHspO/OZK7VaP+jHWozfUD1UFdq9oqv4CfLb7q/UdE83eVQ3Z3B2kgG8QZaYMNPDhGZnOgNTaVJN5XLRFJGIFc6Xwyzcwrb4b/9gIqum9+QeWy1KcTteQqQv1FcYUAQI+0yzi5chpDaiJinlftTHm8jjY4mXTUe9H4+VOgJz4PauGPkoC9yRqr07v+D4ozG4qJbz26TiKyglCnFMpCuvsvR5XM8iLra5t6z6DCac8TomWNYpG2ZOtVObjJX3Zua8ZUviW0iUBbmOZcI8Z04VxptWG9xIGXpF0Qx7RxV0J4aCNPU2ch//sRmBiQL+lvxQy4a1MmLu5tbOSph2WZWNL+riN0Hrsk9T55nrXvMCQJbTZObwQ9dpHDvClyezKW8uaO3r8kxcpzKYYD/DlVPLXpUMV1Ddl36+wuD13HElZgnYgv8x4hABICoZVXOz2yz+xOCUkVMNvpuHWbes8g5l7f6wjYYQH+T/RoX9Kp7B9O5NYcEZmXxM+dzw5c6WsVuYa0gqhSkFj2Zk4SNtElpnb/fg71P1YBmDtcr1MpEs20q5I/8vfto//+YBsJH6YhhNyrdEAChCdwNfKdr/MJ1uBCMpNcoRxwUE8i+MK6tU9ZyfVFdeYCHYQUwXln6XBgXdB4D/NbtsYelbOrFM552PCxhB9iecPZ+mvCfzU7zrnDtm1/DHtn75fSNyLfhozQXlvAR/BFMc6TGF4NpAyH06glveRuyXP1Qcz2KX9irTvJbsx5N0NDKfsqZ8IDCVeYqpwiucC0SWy4QfDXtPUOtW78P/p51IpDv1d+wYSQYJLp82UM4snhGIxGjbMqj8NFPttvAGi5jBJGldtVBlBZwU/a8F4SUnc0vAlX9zq4u0eTtVeXrJBoQsOBRvL95lLMfGQ2SDHCUSzBPU7S0xCJisCRQlQjEx1z0uUS29jWExcCx/L53abW6cn6ngk+WJXphynQ3dIjeXC3BjYHlg0dudOuN3GKer/28EwER8pEa9MiTolCx9vkgGpznvyJ0XsuoD3wc9tv0BhBcbe8FDRCKc0qLCn+PQp+pcIW5R7pPN0CWpVfS8jijEhWr+RCSnHu9yY6hfG0vmWCnv5XdeHa28YhANpMkBcfjGKsLnYFVFDEpYj/ha12eEbAvc95gixkQUSrUwxRKTvaWsQbITT52DEKtUcLYO3qkt7mlzvav2KcGTQeOyM9xc0boLJ+h0eLtRyBt1OAa802bWEqxAlFTPD4ITbpJGCCKx8odTlu8gVKHGNkh0N+CupHNLt38FCAhU1I6DH2IVnysjssgtg7EaLdV8z5J8F711jTIpVAsz9NYvAQh9iZrUxSGKRygWjKUJ9yUrdDBXIHMGVyfO4HhUO02Juzp09d+ZtBt3o+uvSm364qIaGnjqkcp4oxwq1qX7fhF2Wgzs1ul7Px7ybsvLRygpGkk9fc7rrj9eLJw6MeKzJbo9sAWtV8Qr5rWI10= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d149c79-5039-4879-8ab7-08dbbe58eba0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:12.5823 (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: 8YqqmVipK7zfCGgBMc6RRIm3RLu/WfWzcJVqGXkSVrgFmMEBkr+uFePap2NPXbh9c2aEMjZE0jvpvxWSrImKH9kiKHlUQ9Co6qa0hykFCB+IrLfe9nMGCokQom8UHDP4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: JUM5O5Z5VI3Z6QHTZCSHDMK6XWGZZHLZ X-Message-ID-Hash: JUM5O5Z5VI3Z6QHTZCSHDMK6XWGZZHLZ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/apple/mca.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c index ce77934f3eef..9f64a9e74c54 100644 --- a/sound/soc/apple/mca.c +++ b/sound/soc/apple/mca.c @@ -546,7 +546,7 @@ static int mca_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) static int mca_fe_get_port(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *be; struct snd_soc_dpcm *dpcm; @@ -559,7 +559,7 @@ static int mca_fe_get_port(struct snd_pcm_substream *substream) if (!be) return -EINVAL; - return mca_dai_to_cluster(asoc_rtd_to_cpu(be, 0))->no; + return mca_dai_to_cluster(snd_soc_rtd_to_cpu(be, 0))->no; } static int mca_fe_hw_params(struct snd_pcm_substream *substream, @@ -700,7 +700,7 @@ static bool mca_be_started(struct mca_cluster *cl) static int mca_be_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *be = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *be = snd_soc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *fe; struct mca_cluster *cl = mca_dai_to_cluster(dai); struct mca_cluster *fe_cl; @@ -721,7 +721,7 @@ static int mca_be_startup(struct snd_pcm_substream *substream, if (!fe) return -EINVAL; - fe_cl = mca_dai_to_cluster(asoc_rtd_to_cpu(fe, 0)); + fe_cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(fe, 0)); if (mca_be_started(cl)) { /* @@ -811,8 +811,8 @@ static int mca_set_runtime_hwparams(struct snd_soc_component *component, static int mca_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct mca_cluster *cl = mca_dai_to_cluster(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct mca_cluster *cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(rtd, 0)); struct dma_chan *chan = cl->dma_chans[substream->stream]; int ret; @@ -830,7 +830,7 @@ static int mca_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream); struct dma_slave_config slave_config; int ret; @@ -857,7 +857,7 @@ static int mca_hw_params(struct snd_soc_component *component, static int mca_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); if (rtd->dai_link->no_pcm) return 0; @@ -868,7 +868,7 @@ static int mca_close(struct snd_soc_component *component, static int mca_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); if (rtd->dai_link->no_pcm) return 0; @@ -877,7 +877,7 @@ static int mca_trigger(struct snd_soc_component *component, * Before we do the PCM trigger proper, insert an opportunity * to reset the frontend's SERDES. */ - mca_fe_early_trigger(substream, cmd, asoc_rtd_to_cpu(rtd, 0)); + mca_fe_early_trigger(substream, cmd, snd_soc_rtd_to_cpu(rtd, 0)); return snd_dmaengine_pcm_trigger(substream, cmd); } @@ -885,7 +885,7 @@ static int mca_trigger(struct snd_soc_component *component, static snd_pcm_uframes_t mca_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); if (rtd->dai_link->no_pcm) return -ENOTSUPP; @@ -911,7 +911,7 @@ static void mca_pcm_free(struct snd_soc_component *component, struct snd_pcm *pcm) { struct snd_soc_pcm_runtime *rtd = snd_pcm_chip(pcm); - struct mca_cluster *cl = mca_dai_to_cluster(asoc_rtd_to_cpu(rtd, 0)); + struct mca_cluster *cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(rtd, 0)); unsigned int i; if (rtd->dai_link->no_pcm) @@ -933,7 +933,7 @@ static void mca_pcm_free(struct snd_soc_component *component, static int mca_pcm_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct mca_cluster *cl = mca_dai_to_cluster(asoc_rtd_to_cpu(rtd, 0)); + struct mca_cluster *cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(rtd, 0)); unsigned int i; if (rtd->dai_link->no_pcm) From patchwork Tue Sep 26 06:22:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726433 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 0E2F2E8181F for ; Tue, 26 Sep 2023 06:32:46 +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 3C9331284; Tue, 26 Sep 2023 08:31:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3C9331284 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709964; bh=RroniyMgQMpSLI5qoDsQgN4oecSh4cyMZzbh9gqq+HI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=uwntK1kYbgc+uD44M5ISujVkceAIjJzk5SaG+Lmjypi0pWg6TmFTNaoneR8X9aOA/ SVyEZSofG9nObhp4m0o98IX5SISfGy03mrnLlxR2kIURfhLCuh2tpDWWuixkD9x8bL 0hzuYBKbs2MrgERzISS/Bj00rAMp1RJ+Nk5Wbk7o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8A1A8F806D5; Tue, 26 Sep 2023 08:25:52 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id E0509F805F8; Tue, 26 Sep 2023 08:25:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BEF05F80602; Tue, 26 Sep 2023 08:25:47 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20731.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::731]) (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 65763F8016A for ; Tue, 26 Sep 2023 08:22:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 65763F8016A 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=WmZgdcCc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DZwtY8fta9djZak7j/IJXe/Zc46bQk/vSafE/0P/o8Tk7lPqePNnShfabMU7k9zRTg4XovQIZR8dR5NZdJfwhdhzWisgZ9EnKZnksGi6Xaru69xfax96OVDtawz0Bj1C3YZlm/klwE03CTKMdcvoukbz9YYigjXPdUMkdvKduOjxOfKnBidotGj+rIfKXYKXPoN/Pn2jDtDpBpsJwCDtce/Eb3FrEZAcLvmDf5+WvDlK8sdD/HCZpcKXXF4p0hKi7eP+qpMKzxSfmHhEKzkNj9g7az3Wbn8vGONIWbjR8Mqci4yoSJ/19bAD+4xeeKMQ8dZK6Gm/DkAIr/L6m3YeIA== 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=mL+TvYL+RB3OsRnhtZCeEQ7mzznRIwMWnpNJVLCyBBU=; b=dGeQp103lpwetDt06vwW5wiIEsh2Y4sptqQM0QELZZgbZP6l/GAAHcFWUg603oZT0RUkxA49o/m6hk7RnGa/Ue02umJ5iS40pk+kWXigPGZS+9ZHFneVfgTkcniOu1fGr4o6ZHlR2/KEbVC7qcigN6JYg/bOtrqbiibpOjnJp7M1HaKNiDwzXsJEvUcD/RtLBk8p5w77ZktMrPWNE0dtIivkcgQL1D+7rdyj8jVcN24npgll6BMuNTRz1ND3JMk0Ja8Y1/lPai1x+xWOKsq4JqnZtZtxRVHyLsmnYL2Om28CAbW4cgPO+CsNdWryNbMYbrcpCyO9GQC/2PMK3dWV4w== 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=mL+TvYL+RB3OsRnhtZCeEQ7mzznRIwMWnpNJVLCyBBU=; b=WmZgdcCcNlahScAqDxLZR2Rvo0BZK+wEy2UKv19e7kzAar4VzuWxEaK3ZrzvZVbbitkM4Cw1KQn1bXiE7tWtJXNvFMnMu8O90sWkRlekafbrKWH6vLcI73JQL9K/imcF4U+o2hOx1N9lNrKn5NE6Me5kPshbJHImJF1S2OJXnZQ= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:18 +0000 Message-ID: <87o7hph2sm.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Alexandre Belloni , Claudiu Beznea , Jaroslav Kysela , Liam Girdwood , Mark Brown , Nicolas Ferre , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 18/54] ASoC: atmel: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:18 +0000 X-ClientProxiedBy: TYAPR01CA0224.jpnprd01.prod.outlook.com (2603:1096:404:11e::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d43018e-089a-4cfe-7ffd-08dbbe58ef6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FIE+7cV2iLMqL9CSUG4+8IyJOsfi6TUifgFI36M8iyqX3x3Tqw1mawkmQWSjs5JwUZv7nf+XIIggNjWX1+pJx8wMAu/mmCVJDy/ael2lKwjBb18SzufJUy3gKcTVbcnXwY/AhZQtuhpEW2GknKmrrXQtQXGX7obcNrSGevL1BwrD5vHwU+vTDW8uO5H8F/yQnafIVe013EsJCHt/0+unoqgar4L70e65DQTxe1vwnaam1EtdmIT6bEhGVyOAIzqsgKNDk4muurEx2hzb4FK1I9z4qt6E0WoVfWOqMosMpPsK4LDXVw9C3xNcXLZQ+ze/IeiQddrODI7BSRaTaCmdT1cwUD6w6LEtHhaLMrnJ5Jo5LM3U9vEwxEbi2JPk2Mt3s9bTL2Bxtqj7Vw1bxIyo2G+oLkiM9pMV3wo5eCgbg8ImS5SmUrfKuYJmVyyHIqScUyxWXR8XunMl7JUtczaPwlbXNyr8vH0AmJt076+Z63l/mLFOjSVMBClDWDz8rUVc2z/lJ15Ax/6jVOuDYrAo7ToewtnYpl9IxKmQ5w5DrnWGaxp/q3JvTmq9s2ECSKNOgWQddE61P3YQZcPg9Np/N6Rmizeok2qBE38B4tDMp0rsp5mYJwsaXaRp+MXYlQNLyKMECec4aVZxjxtfOpGPMQ== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XDrEa+eTxP1BxoCCr7F9874tKb9b4Fn7GwN4vFP2cXMKww6n615b/rkbllBVdpAKf91MAuLWh39C8MfIypsEccWXECjzZfnUndpr9zUEuINSyhjnYxlmhiNW5LjVwULnNttU+rzYOf32wh6K+GfFQ/s2xcF6sdpIHT+/9SnHPhtbNJK4ZtV1SXC35OEBGj0dPYoIfpmdEKOU3z7JBfCQcp4r9jbfbv0dyEI6MQ8n+dKx+OUsCo5T7EeG3UtmY29VNFrB0Sb08ZmiIUrZLUgAlnveWSHexD4rnCyGrHoNHWtNKMbP77CcYkmfbTboam0zt7mWgo5Wor1bdaQEIvbo2GFwiFO1HbcabCf1ci+B/Jk+1N6ZlKZETUN8Bxy/jgAqq1aVxutu/r7XU2acWYWz6RAiyZzeKD7CJPjS5n4vBhe6+d6abq6zwhNmvcpqcP/V0DYKoXZaBiYL3diwkE31nnAn5+wuAfVghX3VoUiW0aZJ44IPT45K4xoF22HS0K1UXALZNYQSzjMrrOhOHoHI3Ti+VtGMWm3DrMK8lpkz3q+JILD6dw3UyWnP+G/JHTFnqdpMEAOZoSGMOuuAV6K4FB26K4Ify9WKR7a8gJ0vX+LCXD0Nlx+WEnxDZ3Y2EuT9NeIp3HULQsG+1+szvmVdiqEuNbG8AJHvwKlEOTQ8xwHcRxTSYO1b2EVTwXzRhWofqbvOPs1iPigeRZb9nOwUIHlUIPnnQ5k8UbCrS6Jl5ggXre0Wq6kS6hdFhW974bZbFSIVF3ipHxCkzT0grRR3Ch14H3IFmblbzz9fmdY5X05RwYZbepSAmyb67EiqdV1CmfabU4oS0NUyRmAAWY71/XlFQvk4eELJnh6BMRRupTC69+I6IJcihOzqyDKYBDqWLQ6ZqNncQqEKI/Nbw2pqu6M6qQpbHTkwCXFmNiYTPZYHehzKSyRC5uYm0FcFpWoj+RsfBM8I7snQXdWGkHQFzFY4mkAT19/RbVuTW/qLVQ9KcnCPzbgzW9its3vao7U6kHffyOTOGH1u7NnynCUKewTZXKucbuCVCbD1bP9DMfZFdzmeAiMmw0XaJbrfT+F5dPezKy24zf1VnPmst94AMWZG+sPzgAHDhYRzx5ncrR1HdrNB3hDGfnH7VexJv/kDBzRhzzgQubGh3if27nCxdAaRvqxrmm/mAZR5aI1llPYHSc0vIrgv/MR48wK0yWCSCWhNo53YeaCGit63UaMtOY1eVTbV2pYi8s6OGkmWGPgsvVvNKRdCLktcz3++gp+vemLKlFtBiNV4exCdno6nn8CVgbqNtqqDdn/jJCaDRoQANoHeEwj945GLy/ILWvcXuxF1t1Fv356PG2nODrABNwkmJojl3crvzuVzvFd5xDYZ3AG0sF4uWvvJO+z5ay663le2pfID95kA1wx8bAgyr55lUxMK3Q5TWuLdkk9dBj+oYLNgikc9nl82bBD+oluBkOANc4T/m64SB1hhwAPwGsOxKzQA2nmw52k/FdyrtCVren2cBAWxVnFdbf7v7snUYgpGNGVu2vuX6j5L+FUeAlXvUWTibJrWw6kc0MbFr5nfQxY/czEz08incLB1wtL+uxALeaUUKG7C4Ko1SRRTCVJl2MxYjZGiS9Um0uwg2tQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d43018e-089a-4cfe-7ffd-08dbbe58ef6f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:18.8360 (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: xDV0xvrpvy5+0gCfn/hsSgbaXipnjWb+BsQkOiJ1+nun4V5CyesZzIPi9/kLHcssK77JSMueVvLdkf+Q/GEBfrfCLtDWKzS9hVbxI4ntcT5g3EptPF7w9WJbb09uL27P X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: 2ZLMU22CYPFWMBIN4IMIJZIEX5ZDQVNA X-Message-ID-Hash: 2ZLMU22CYPFWMBIN4IMIJZIEX5ZDQVNA X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/atmel/atmel-classd.c | 10 +++++----- sound/soc/atmel/atmel-pcm-dma.c | 8 ++++---- sound/soc/atmel/atmel-pcm-pdc.c | 4 ++-- sound/soc/atmel/atmel-pdmic.c | 12 ++++++------ sound/soc/atmel/atmel_wm8904.c | 4 ++-- sound/soc/atmel/mikroe-proto.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/atmel/sam9x5_wm8731.c | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c index 4c1985711218..6aed1ee443b4 100644 --- a/sound/soc/atmel/atmel-classd.c +++ b/sound/soc/atmel/atmel-classd.c @@ -118,7 +118,7 @@ static const struct snd_pcm_hardware atmel_classd_hw = { static int atmel_classd_cpu_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card); int err; @@ -141,7 +141,7 @@ atmel_classd_platform_configure_dma(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card); if (params_physical_width(params) != 16) { @@ -338,7 +338,7 @@ atmel_classd_cpu_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_component *component = cpu_dai->component; int fs; @@ -381,7 +381,7 @@ static void atmel_classd_cpu_dai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card); clk_disable_unprepare(dd->gclk); @@ -478,7 +478,7 @@ static int atmel_classd_asoc_card_init(struct device *dev, return -ENOMEM; dai_link->cpus = comp; - dai_link->codecs = &asoc_dummy_dlc; + dai_link->codecs = &snd_soc_dummy_dlc; dai_link->num_cpus = 1; dai_link->num_codecs = 1; diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index 96a8c7dba98f..7306e04da513 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -52,10 +52,10 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { static void atmel_pcm_dma_irq(u32 ssc_sr, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pcm_dma_params *prtd; - prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + prtd = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (ssc_sr & prtd->mask->ssc_error) { if (snd_pcm_running(substream)) @@ -77,12 +77,12 @@ static void atmel_pcm_dma_irq(u32 ssc_sr, static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pcm_dma_params *prtd; struct ssc_device *ssc; int ret; - prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + prtd = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); ssc = prtd->ssc; ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config); diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c index 3e7ea2021b46..7db8df85c54f 100644 --- a/sound/soc/atmel/atmel-pcm-pdc.c +++ b/sound/soc/atmel/atmel-pcm-pdc.c @@ -140,12 +140,12 @@ static int atmel_pcm_hw_params(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct atmel_runtime_data *prtd = runtime->private_data; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* this may get called several times by oss emulation * with different params */ - prtd->params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + prtd->params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); prtd->params->dma_intr_handler = atmel_pcm_dma_irq; prtd->dma_buffer = runtime->dma_addr; diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c index 0db7815d230c..fa29dd8ef208 100644 --- a/sound/soc/atmel/atmel-pdmic.c +++ b/sound/soc/atmel/atmel-pdmic.c @@ -104,7 +104,7 @@ static struct atmel_pdmic_pdata *atmel_pdmic_dt_init(struct device *dev) static int atmel_pdmic_cpu_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card); int ret; @@ -132,7 +132,7 @@ static int atmel_pdmic_cpu_dai_startup(struct snd_pcm_substream *substream, static void atmel_pdmic_cpu_dai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card); /* Disable the overrun error interrupt */ @@ -145,7 +145,7 @@ static void atmel_pdmic_cpu_dai_shutdown(struct snd_pcm_substream *substream, static int atmel_pdmic_cpu_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_component *component = cpu_dai->component; u32 val; @@ -191,7 +191,7 @@ atmel_pdmic_platform_configure_dma(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card); int ret; @@ -356,7 +356,7 @@ atmel_pdmic_cpu_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_component *component = cpu_dai->component; unsigned int rate_min = substream->runtime->hw.rate_min; @@ -501,7 +501,7 @@ static int atmel_pdmic_asoc_card_init(struct device *dev, return -ENOMEM; dai_link->cpus = comp; - dai_link->codecs = &asoc_dummy_dlc; + dai_link->codecs = &snd_soc_dummy_dlc; dai_link->num_cpus = 1; dai_link->num_codecs = 1; diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c index 00e98136bec2..01e944fa1148 100644 --- a/sound/soc/atmel/atmel_wm8904.c +++ b/sound/soc/atmel/atmel_wm8904.c @@ -26,8 +26,8 @@ static const struct snd_soc_dapm_widget atmel_asoc_wm8904_dapm_widgets[] = { static int atmel_asoc_wm8904_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_pll(codec_dai, WM8904_FLL_MCLK, WM8904_FLL_MCLK, diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index 30c87c2c1b0b..18a8760443ae 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -21,7 +21,7 @@ static int snd_proto_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); /* Set proto sysclk */ int ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 0405e9e49140..d3ec9826d505 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -66,7 +66,7 @@ static const struct snd_soc_dapm_route intercon[] = { */ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct device *dev = rtd->dev; int ret; diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index cd1d59a90e02..d1c1f370a9cd 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -40,7 +40,7 @@ struct sam9x5_drvdata { */ static int sam9x5_wm8731_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct device *dev = rtd->dev; int ret; From patchwork Tue Sep 26 06:22:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726444 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 C18C2E8181F for ; Tue, 26 Sep 2023 06:26:08 +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 F3B11EB4; Tue, 26 Sep 2023 08:25:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F3B11EB4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709567; bh=RmsLKG9oQ7j1XgS2INAf6+K4bpIXd855SO2hdq4lSGE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dx1JU8JwvaG2/N6DnT3T8s/miT4BoVIbMLQIJHa7BEHiZuWTfApPpSZNo77ON2Qod E3p7Lp7RofvnGPXpDfhHTY6vyTEeL4sKG+1dW7zWvmSSyUK4prZ/OTBgYMv/cev4dw yeZ4dNllyvA3AflJGWafxmZCV0h8TSHRccfc+0jc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5B2CDF80558; Tue, 26 Sep 2023 08:22:57 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D3DC1F805B3; Tue, 26 Sep 2023 08:22:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CE81EF805B4; Tue, 26 Sep 2023 08:22:53 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20709.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::709]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D66AEF805C0 for ; Tue, 26 Sep 2023 08:22:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D66AEF805C0 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=NCanGAJj ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JfjbreJBpyLBO9+tpdQyU8tT6FDkiuBP6tJ2/bSllO7yZdUkrKKLxNugY6G6fkjXCzH7cDbvUkLC7INAvHghEKRjJk1OU6OSM7oxEZk45daahWaErMi9aco/gG6zSFnJojYbS3q6RKdHvIdyhTfDfHHqRD0qSbbO+cJGAyabYPAQaMwzkIu82HCOyncj2Lhw+aBrmxdg6NtzE6e4VrYZBpj14gdiABNkx282jp1afS+k1YNGv7g1hGP6PleISfGPxHdSKYTUSddb9bGcp1gPlRYSX3UJJpm7scHZsw8GX5BBhivw4wgy/WZg1bB5NqAXsSphkV2VWa+BKiLgORnXvA== 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=eBkIiolKIH+EfCoADWKQA2TeSTGB1yql1Z8hlVUZLD0=; b=f7aBUinZlnqN+w5vsjTvD2Wob73YgrWwrkAWxtWQTUGLuuV9qlvubSFukASnzWofjKzC4DvvmycgYShhRG7f6/vjXiSFo5OptmxzD/LXJqtsCpDrksURhfaMghSn0t9yL+LPWmOeTeYAhj7UD2Zfg6mG6eP6CmWom4RCO3U+S3wIBBVlsaFq/ipYdFhg1+pD2p/4dvIpK6PX9TcHgavybSoG6w3zP5Zj4/OpvghrEXelU88F01clxxF2ppXewCyGzdHdrkS9rEkTzhPNRUkSabCDYZjt8dy5rak6D3cEqFMokYaqJCTIhoms3g4rroEIbHQ9rd7rpo0wlOuHQiDAdw== 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=eBkIiolKIH+EfCoADWKQA2TeSTGB1yql1Z8hlVUZLD0=; b=NCanGAJj2nr+HuB+SGE7mLlBiqUJxoqlQETmydle56L/jnpE14wD+W8/0RazMvZDPDkJJuRNrUaTuDESfYFlGu/XB6GudySexPlFiAnt2HilUU/LxOvzQ4ymYEaY6qPS6QpZN3MQfZ99gN3A+1lTo/jQdrrzVOOh6PqVRwBlIS4= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:26 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:26 +0000 Message-ID: <87msx9h2se.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Jerome Brunet , Kevin Hilman , Liam Girdwood , Mark Brown , Neil Armstrong , Takashi Iwai Cc: Martin Blumenstingl , alsa-devel@alsa-project.org Subject: [PATCH v2 19/54] ASoC: meson: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:25 +0000 X-ClientProxiedBy: TYCP286CA0170.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::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_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 006291e4-926e-4d52-a3f9-08dbbe58f3d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 008wUtxpnFtjFD/6zP0RVN9fk9R94gtipwGMWFhi+UPTXJXvd5zD5BVXN/wfXCq9MpSssEweZrc/Py6Kzi12SbBy2Gdad229l63W5be4lKb0qgjm9e0w//LhrWL4cAUQG6yHy30eILjqGpbW5jXZM5IiL1aGGU5dvqFroCtW8BL/7UA3MfRdmRGyva03PmNKozTPxehzOb/M0gB7F+8xB8BZaswJZRYAkfV51AuYow+04F9rBw8R0LZ8OFU7Y1CQGwVMMjXXAnttUtNofKLf5nnQMBL0FiyHDbYZVskIg7Pocz+0svy2wnM3gsNK2tvwJOOA2+iuKkKW25EAZzQOWsf9artVZAhIrZlrjdSoPcvB1jOzP9YUwjHiY6E67DziayeaYTjNsYR2puCHdSM3hMX+FdoXktwoa9FWODO7246IMYu72GgW+mYi/aSSPyg+3yDu/8tiCCOf5Dwamg+r2BIFSOtNhD8E3HVMVStiqYT4C+V+1+b2t/6XpToLxxYXaI9NANgjlABEvjALNjH7gwW0BgHwowsSMcQuHIU49T7Sa/4rwNTFZRFvSrYcbODlxe2ow5BWNL3p14GIEhgRaKt4rzgvMphOBFlAA/pDEgLKIsOWrVQJaQ7OIjaFWJDfHKCFxRUEK6VB1Pph83VL/A== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kEQGQSXQWCi3cVLJa0OnIiysTza5u2TO0OcwD7xLQTXZlVgshaTsWnSswdmSjWCpGcCK4z1gZo1YgEiDMW9yb9VbT9Qb9Al/ZhAWTwMZscTVmV0oy1V+pFAs3mu1u9vXys7DPhoigsy2AmqNTZBCbNmjriWGp4kEjiwyvvlrG7t5erpRmFURWSkSQ5tF0SsXXa61aKxQr7KwbxpQLjwqNOoi326g2k4/rNM39O9ZzTRU67Rg3UNRbh3wqRyitsPUHxg+La/L99jtV6jnSSAy4kiPKYi9WrdXnFbWv8vqhdRQIb9O+vJyV5kXH9k3cuANRGtpzxhfKFvprZkdvt+/hJvs+U75n+KZqEfykREl7zzYJwcskIyi2VwRUJ6b/W3ppe5ffi57gQY4GusVlrbxdvTsciviQlKyAqg1IckVPJ/my3uUziLzSvaI1QDyfWrrN6bNBwA5pUSz1r5SEQ85My2RSIaRY86b3k67dPK8JHv1jSrdMZKgxxqxawZimzNOMvjvoy5yXQe/VYVDAYkva9POaGX1G/gJviVDt9PDqnkJLWnuQXwbGao6o45BZZuWe3irKN/R2rSm7SUEl5ibvpVKKBNWKCC1csrBYKsT4KdClmi0kpFM1gD7s/bbBoQO6Hszkb8jAcge8pIBsTXrWE2d/CJpquXffDCCPsr4XjRghr4SVuPpkzgDbqpfeI6/ynjtvFyGctRYQAb1OSR2wSa+k8mZAhUXVnL7XlKei9OJQ3ChjR+/cc+45N0bGPxE9QZ52MciPWT4zNUXyy4gHOuDCmvE4LV6UHdFevG0YeKxcU+jFQcQBbTOFTzr/9iU9dqmOrmReEIYipLEZgTC3GcIzbSXAi6zoPnZawtAEy1B4WAhVxCkTDr/xLOoy+lMpOE4y6/cMzLcPbBXiSlZmAGp4lNYHsG9q/Funh/MGb2kmOAsvAHKqohX/nZ0cYy6NKb81/CAbmsry5eOTHiU7YA77b0u/DoFUfV+kxHBOV3ouFVdOWGr+BRLdO6LM1ufeHQ+MEGZKVqdUlO+P/igMvpuGQpSXG5oqE/CuGwef/hhg5Ys5rOYtoVUjHfLpEidx9JCgl28s3YZm19Cz1Q9IRYcYJW8fe4QPWp/i9ao+UPVVzviObeWsa5vfk8cwFA7a2a1HO5pboYHfcpqUf+wLkk5kaZSkRibmLhypZnnSZ3Rj9uZaSDNE9XFGfkAaUlW7xly/usbmgZ+9/vfaMkMg9Hz7M5zkvCRgxDcDWOBrO8fQEuoBoviOjlLHUx/PS3Zb7MKjScBp2EJxhlfPgdWjiZi0vinPrwyG37h5O3DCe0APyOwHFobsgtWIFLrrlb8KsB7/g2behQaa8uSq+pZ/pIRbX/DBLcdLwSva4P09XbAc1BHxEFTxWcXLbnzvGB4sFX1JoDVMmjfE7EqYKA/4E6r8bW9M+pbonQI5u38BmHVfnvW1AstvvNj3RMg/wpG3AfdOXEocrmzV6s/ZTmUD9YfdyQrpkuo0hJxkhCopjsmdCzzTRcEK3GGhoo2nAx4qXk61Qi5cwzY1D6NnwKL958Es9z6fJuE68nNvv8NvWLJSQqdHB6DH4yU5KqfTTbz8WKPxbFvBE/gYOS3w37a1zMPH7w+I5EFJwlijVolwwc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 006291e4-926e-4d52-a3f9-08dbbe58f3d4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:26.2630 (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: R9dDNV+IqhzgsJJsG9YZsc2HuMfddiXjG0aOqOqsxsf+Ntu4PDq60A1TLJteYBdp8UXW4MRLFGuSqlXcAdL4tIbtdcrvM14M8nOFPcdcGfMOtmpkDyTnBk8rXCKHme4G X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: 2MPXUVDQHEKZYUVSDBONNDDG5QPFRO66 X-Message-ID-Hash: 2MPXUVDQHEKZYUVSDBONNDDG5QPFRO66 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/meson/aiu-fifo.c | 2 +- sound/soc/meson/axg-card.c | 12 ++++++------ sound/soc/meson/axg-fifo.c | 2 +- sound/soc/meson/gx-card.c | 2 +- sound/soc/meson/meson-card-utils.c | 6 +++--- sound/soc/meson/meson-codec-glue.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sound/soc/meson/aiu-fifo.c b/sound/soc/meson/aiu-fifo.c index 543d41856c12..4041ff8e437f 100644 --- a/sound/soc/meson/aiu-fifo.c +++ b/sound/soc/meson/aiu-fifo.c @@ -27,7 +27,7 @@ static struct snd_soc_dai *aiu_fifo_dai(struct snd_pcm_substream *ss) { struct snd_soc_pcm_runtime *rtd = ss->private_data; - return asoc_rtd_to_cpu(rtd, 0); + return snd_soc_rtd_to_cpu(rtd, 0); } snd_pcm_uframes_t aiu_fifo_pointer(struct snd_soc_component *component, diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index f10c0c17863e..18b16274449e 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -40,7 +40,7 @@ static const struct snd_soc_pcm_stream codec_params = { static int axg_card_tdm_be_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct meson_card *priv = snd_soc_card_get_drvdata(rtd->card); struct axg_dai_link_tdm_data *be = (struct axg_dai_link_tdm_data *)priv->link_data[rtd->num]; @@ -72,10 +72,10 @@ static int axg_card_tdm_dai_init(struct snd_soc_pcm_runtime *rtd) } } - ret = axg_tdm_set_tdm_slots(asoc_rtd_to_cpu(rtd, 0), be->tx_mask, be->rx_mask, + ret = axg_tdm_set_tdm_slots(snd_soc_rtd_to_cpu(rtd, 0), be->tx_mask, be->rx_mask, be->slots, be->slot_width); if (ret) { - dev_err(asoc_rtd_to_cpu(rtd, 0)->dev, "setting tdm link slots failed\n"); + dev_err(snd_soc_rtd_to_cpu(rtd, 0)->dev, "setting tdm link slots failed\n"); return ret; } @@ -90,10 +90,10 @@ static int axg_card_tdm_dai_lb_init(struct snd_soc_pcm_runtime *rtd) int ret; /* The loopback rx_mask is the pad tx_mask */ - ret = axg_tdm_set_tdm_slots(asoc_rtd_to_cpu(rtd, 0), NULL, be->tx_mask, + ret = axg_tdm_set_tdm_slots(snd_soc_rtd_to_cpu(rtd, 0), NULL, be->tx_mask, be->slots, be->slot_width); if (ret) { - dev_err(asoc_rtd_to_cpu(rtd, 0)->dev, "setting tdm link slots failed\n"); + dev_err(snd_soc_rtd_to_cpu(rtd, 0)->dev, "setting tdm link slots failed\n"); return ret; } @@ -125,7 +125,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, return -ENOMEM; lb->cpus = dlc; - lb->codecs = &asoc_dummy_dlc; + lb->codecs = &snd_soc_dummy_dlc; lb->num_cpus = 1; lb->num_codecs = 1; diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c index 2e3d0108179b..65541fdb0038 100644 --- a/sound/soc/meson/axg-fifo.c +++ b/sound/soc/meson/axg-fifo.c @@ -47,7 +47,7 @@ static struct snd_soc_dai *axg_fifo_dai(struct snd_pcm_substream *ss) { struct snd_soc_pcm_runtime *rtd = ss->private_data; - return asoc_rtd_to_cpu(rtd, 0); + return snd_soc_rtd_to_cpu(rtd, 0); } static struct axg_fifo *axg_fifo_data(struct snd_pcm_substream *ss) diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c index a26b620fc177..01beac1d927f 100644 --- a/sound/soc/meson/gx-card.c +++ b/sound/soc/meson/gx-card.c @@ -29,7 +29,7 @@ static const struct snd_soc_pcm_stream codec_params = { static int gx_card_i2s_be_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct meson_card *priv = snd_soc_card_get_drvdata(rtd->card); struct gx_dai_link_i2s_data *be = (struct gx_dai_link_i2s_data *)priv->link_data[rtd->num]; diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index f7fd9c013e19..c81099218597 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -13,7 +13,7 @@ int meson_card_i2s_set_sysclk(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, unsigned int mclk_fs) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; unsigned int mclk; int ret, i; @@ -30,7 +30,7 @@ int meson_card_i2s_set_sysclk(struct snd_pcm_substream *substream, return ret; } - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, mclk, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk, SND_SOC_CLOCK_OUT); if (ret && ret != -ENOTSUPP) return ret; @@ -177,7 +177,7 @@ int meson_card_set_fe_link(struct snd_soc_card *card, struct device_node *node, bool is_playback) { - link->codecs = &asoc_dummy_dlc; + link->codecs = &snd_soc_dummy_dlc; link->num_codecs = 1; link->dynamic = 1; diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c index e702d408ee96..f8c5643f3cfe 100644 --- a/sound/soc/meson/meson-codec-glue.c +++ b/sound/soc/meson/meson-codec-glue.c @@ -98,7 +98,7 @@ EXPORT_SYMBOL_GPL(meson_codec_glue_input_set_fmt); int meson_codec_glue_output_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget_capture(dai); struct meson_codec_glue_input *in_data = meson_codec_glue_output_get_input_data(w); From patchwork Tue Sep 26 06:22:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728189 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 6747EEE020C for ; Tue, 26 Sep 2023 06:26:30 +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 D34A6E8C; Tue, 26 Sep 2023 08:25:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D34A6E8C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709588; bh=2oRfMZShRxLnbqXrlWwnKtqtGSMODPMH9g8KEejwTIc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=mziZCadkxQDZgXnGBBJhiqxBZYpZjChAVumbJRC7JdD0WYC6PkZbhb5GLF5TlHmQG no/R2nbm3DUcjAUs9zG++Tz68ZdlTcMT/IY8BIYdlJrqHNFwGYEFlsRoy8hUE4YVEx 4rTE6Par8RTWwBuWhXis13tgZ1b0tX1J3q4a/J/E= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 373BEF80130; Tue, 26 Sep 2023 08:23:03 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 3EDACF80580; Tue, 26 Sep 2023 08:23:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA547F80589; Tue, 26 Sep 2023 08:22:58 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20713.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::713]) (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 A16D7F80571 for ; Tue, 26 Sep 2023 08:22:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A16D7F80571 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=dEdhCpFw ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H0N/45vZLYHhsRETZa1V9w3r8nacWjW4oXctu2IGPREOxdGvJU+TBoUwj/mUIpWx7cqh7D50ChF+ImNtUkqbXhsCXJeT+B/IKbTHkwKCTLSXsbl78815NatCtIAxw1/4HRunyOIwBgwqx65Dq17suy0q86WZ/PFLO9lC28dQj/e5FoZKD5ztVuF7n7459vgwowlSvLFBxZ87yHG3MVa/+ey5uwQiuKdTMEd5frcOs5gg1l8zLYeFus88xo+vpqjl/M/FHtAILvSlrUNhtFRghbEL0lNTM9Zyenq0uwHU+4/M7x1u5WBRYJC6C3UdPyubBDrKW+yu2t2Lh0dvAgi5hg== 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=HDQho029f7y6giBzxtvW8tzHPEefUCPxOQD7km8cckE=; b=MleSHt7QxKHhA8TdUPTMSr2Y/WYo9wzIZIa0eMAK9hXOlTvAqoroN8I2ATOh7jBEPx56iBToyc28Obsu4ZTjLumOKQv4j/3Rk9egYzYF161r/1hBktUmpJz1NHaIghj+F4n5Ui+/A+KeKVGO9pAPi3I+X1Lyn387AWGqpUpxKAf5OGaJQI7vvgy2RC2Fz1tf8z1FV2UGPrwpGJVRybQJSbkWe1aNcp1itL4p5Yo2yldFGjuWKvCeK32Q3d/t8a/PCVdL2mmUwhufDr0FXwQhxxxdsxa8tPk8s86zWv8FWZWQntpucPKKEZUZelApgI7VRpdAlRI3V0Irv/SiSTyO4Q== 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=HDQho029f7y6giBzxtvW8tzHPEefUCPxOQD7km8cckE=; b=dEdhCpFwlpAKXHh4oGTyKhoBY3bhQWf8U04yXLIYQnjPspFYrxKWISSLRz1t3/BQqwUam85n7LtvXTGYPqhC14j6ydtLvcksNiQA13JOCHMRPvvuIGwvupkhALgKvyZOnSwRHIzZcI0q9KZOdDrAXHn33CiKSyWJjLsQi5O6d0o= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:31 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:31 +0000 Message-ID: <87lecth2s8.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Ban Tao , Chen-Yu Tsai , Jaroslav Kysela , Jernej Skrabec , Liam Girdwood , Mark Brown , Samuel Holland , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 20/54] ASoC: sunxi: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:31 +0000 X-ClientProxiedBy: TYCPR01CA0059.jpnprd01.prod.outlook.com (2603:1096:405:2::23) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 78dd7948-807b-42a4-07e7-08dbbe58f72a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YnYudt8YoEOUYZK3aOmnnwf4Vj9/A20pJCNVTW4R0J3gtIpwmJn5jIHSXTF0ssXYM6gYGKfFkIaK9D6oz6xYDMp+u98YHsUjkGc+pgPp918siKWMBrZ6jBHU5+ywQDf6R0uAu0Rt7YAPCsPssMsj+Ygs8lZY/ITPnTtvYf/erlPQDj6YeAk4wuuMOem86+qQXFGrwT56+818Yiy3LQ9LplS863dl8CsxuScNqwqaHPUqT7tGXq59w9sR01dmeqiVTk5ndZee2sWjMgb1qwww2uDmk5RGC06yjcQJ4YIhlZk11EqfIkLitHJRj/khNokP+DF6VoDWlksPTz+sj+syeTdnuWRulhpLkiD/9oCdbdNByu+EwBNzjTCdZ1tvJKjLvdTNLAwiP1mEqUODdO2ECCceqaupnzY8VJ1o9vjL6kBgw6Z+sQGvV8+t3PLJQnydsyZPp+C+P6FU3zl5s7FY9d1ghhVdzyfOAzBiwLgW2WN6eFfa0DBx/lZkAnQNXByJ6m0nKd8TLZqAD5gPnYoJyz3bIIe1ekhMF+tRm7TVv4/6QGxc3iuNEd2Zzu6T8ayy9WMgYeq4Zc1YDA4GL4H39XXJfVGbbMbmUkhyIKL6E5hOXhG0A6W3ebPlERt+hBH3G6Df4W3W2NoVAsmdixSt4Q== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /VLX9J0yxyuigkf5L1/E04XiqMQUDfioD6J+65/XOOD9pM2sU+1Xhr9X3BXG9omeK7wIaQiIeHq3ynPSz4KMOZmXabLbNFo72YDcYcXGcTgAR8c6XDX0Ur0+RCSaeEIM6LxSULxV7ZaD2Kom3lU8gdW7uAII5Kw/LO+ohu/TXGk9/ogO60leza4EHHqwTCAew5BFfpg+DKvkuItqkbKNYR3ElJJW/CHVSGy86q2GfTN+YQarb+2o2NfXQ0rQQ+VnbglkZZhmQEmfsSD0ZVky2P4pmAmM+d1jKrM0MAimYWsuR1K9QwAlrT7b+t2/yxLBxsXUHRFWGIq79+vsHIHFswCXz2fOTYKN6MCRRLHozaqaH61AWTD74mzqtQgPJKu91QblbfCpa2PcE7OgT4noLv+y5acPUOHpE/iq5DGSb3KMeOiHSMux29/s0ogejYUIKcT09sCwnkeJJsX7YTOvFvWzQivnPfnmOOxLraoTfBbXeRKq70MN8EOAOojjFyMzMPhiKfH1l9bmPktERKssPDNS3SwhP3EQNYd+p4S5gVmqtsCE6pS9U38cc2CWfz9NngdIFED8K5CDcIbri1xstt1hpeJya4luS8AnWgMZSx2inZUIUKaEn2RX3o9BjZvzY8yZDW7oOOcOlj9CAQtsL9T6kbT1jL0Qjx0e/6nQKA+zj5NbYMWq1tUz4/IE/WevmLAA73kGyr4n0Hhq5ePwQXESbe/rxc9NcYifLUOxxNNCqcm3xHR5grRIMo1yBKyUFtsf/PJuU4Izc8joQlb5ZO7puKC8FFVmrY2rTyj0jcs/SeWXe6CQROoHMeO5zIRYdxrAKepwkoLXfn0AkMemzuBqxKmg7GTP5x6aM3EAdrTaRWDFFzbY7H/9OYH5b50LvbNgi+pUqv2mBJL/caWK0YnYkXt/3pAkO0o8rM/dxYH3w7Sg1jH+emm7dTRL3skNMzVVWpK1vjFSE3mtmd7dLaJDCz9jKHKd3CSkRwSSB+i9j9awTedPna8nWpL3CM8Lampq2P+a5lKQbHacDse+NEXWMaew+aiHoSuH5NYySKfNdI4xnSCLVhkW3QdUYr6QXjOCm2uftMgDDSsurDW/dg5p4RhVrr0yNaiOmkxuX1rZcN5dN5scxYbt85UuoPK90x5t+zk9ZYTfjSrj6B3oJ6oZXCUb2iQhsArU4ENqU8feox5DQF/8PEtOFYjdpQBAedenoe3A0PAnt7WwWtwu2dooKJlaiRMhiOWvEhA4D4z650q+WEpKM7s8QCIHIQqPU7LFtuZKDdzrQ/eQHtSVHNRH5aD3rEaq7p2LFyjoqnxfdCWtKqIizBP2YXw3NYHZhDHIXSRZBoBH6DCz79XFqjLmnCBiKl3r+zwN5xcHsZBj58ZnIaVNcYlIpkrGt5cfp6jK4GWvrepOi4tyofeTRIm+CZYs642pX/W3QEAGVMq0SBCXrOzxCfSWwyg3rE4HnjLAwwQl/eDuAMA4HryLR4VeZazzzNuNjGOGMFrKhXNDGmmXrKk57Bfgil3yVE7VQJm+bVwr0IohgMUUWDXi1rMDWD2Ri67S4nagDUEwr4KU0qZpRcFN5fI4xlZ/hBDt57qMLkbJ3mG+BbmCrw464whcCbT9APU/r4NHaAyf/1Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78dd7948-807b-42a4-07e7-08dbbe58f72a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:31.7045 (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: jktUo7koPEJ8msu9IMx3Bq694R61IMPsWcvi2S2luiiJBLhOveEcsSn463OPaBQi5u4iZE/YhJAtiOP/JTI7WFjIDyAsIWyWIZ0h7iYFyM+uZOU8DX1joywP0fZoxKDv X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: O65SIK6ON64U5FTD5VOAN65RBMQ5NLBC X-Message-ID-Hash: O65SIK6ON64U5FTD5VOAN65RBMQ5NLBC X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Acked-by: Jernej Skrabec Signed-off-by: Kuninori Morimoto --- sound/soc/sunxi/sun4i-codec.c | 12 ++++++------ sound/soc/sunxi/sun4i-spdif.c | 4 ++-- sound/soc/sunxi/sun50i-dmic.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index f0a5fd901101..ad6336cefaea 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -282,7 +282,7 @@ static void sun4i_codec_stop_capture(struct sun4i_codec *scodec) static int sun4i_codec_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); switch (cmd) { @@ -314,7 +314,7 @@ static int sun4i_codec_trigger(struct snd_pcm_substream *substream, int cmd, static int sun4i_codec_prepare_capture(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); @@ -355,7 +355,7 @@ static int sun4i_codec_prepare_capture(struct snd_pcm_substream *substream, static int sun4i_codec_prepare_playback(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); u32 val; @@ -556,7 +556,7 @@ static int sun4i_codec_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); unsigned long clk_freq; int ret, hwrate; @@ -597,7 +597,7 @@ static struct snd_pcm_hw_constraint_list sun4i_codec_constraints = { static int sun4i_codec_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); snd_pcm_hw_constraint_list(substream->runtime, 0, @@ -616,7 +616,7 @@ static int sun4i_codec_startup(struct snd_pcm_substream *substream, static void sun4i_codec_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card); clk_disable_unprepare(scodec->clk_module); diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index b849bb7cf58e..199cfee41d31 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -246,8 +246,8 @@ static void sun4i_snd_txctrl_off(struct snd_pcm_substream *substream, static int sun4i_spdif_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct sun4i_spdif_dev *host = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct sun4i_spdif_dev *host = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) return -EINVAL; diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c index 2599683a582d..3f6fdab75b5f 100644 --- a/sound/soc/sunxi/sun50i-dmic.c +++ b/sound/soc/sunxi/sun50i-dmic.c @@ -75,7 +75,7 @@ static int sun50i_dmic_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct sun50i_dmic_dev *host = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct sun50i_dmic_dev *host = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); /* only support capture */ if (substream->stream != SNDRV_PCM_STREAM_CAPTURE) From patchwork Tue Sep 26 06:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726443 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 BA792EE020C for ; Tue, 26 Sep 2023 06:26:41 +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 E339FE81; Tue, 26 Sep 2023 08:25:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E339FE81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709600; bh=LnCtSq1jqW1eAoBBMF+qhpMgw4dBUm9OPUb2O5f918k=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XiwhdzAAQCr1P9CZ4ANGUAwAwhHQmUNceXEzLqWoOG7GIkxhnptS9tg9/PcTkmKpK vRir1G4dAhW8YPi36hDwavqsdApz6yQ5h3OZRxBzM4lPI4DM7wQ4r60JghpNyrj8Hx l5ImcS5f3YaB93V3M7v0QrY8bjbJHDDn5WDLMgmQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E2BD0F80613; Tue, 26 Sep 2023 08:23:05 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1DAF9F8060C; Tue, 26 Sep 2023 08:23:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1F6FDF80571; Tue, 26 Sep 2023 08:22:59 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20713.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::713]) (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 67CCBF80580 for ; Tue, 26 Sep 2023 08:22:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 67CCBF80580 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=j5hjxoae ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QpYLtQbIqREjZqBJ283mQowBiup4dpGvQBMOtAqZUbMCBBy5/4CJu/L2pUCB38gM83Ehv8s0/V1T8DZKaEDp7zNRZ4BVDiVFCel2TQQYtYkKp7IxDTIdorvMQ+xYYe/DCNfOfsI4S35GNxakKeYERtCWCmX3iqO4dzYhYGgDiVCac41b7vuq0jhkHdlhwsUOoqxW9CvFWrVa4URIeCJt7xyJfnlqxkJ2thXNbm0W8+DSA3QFOusjb2qTTPF6FY+qji5g1A5B69kl2WPvu1gnxoTnaCwkQXrxugbbc7USC4Hjn3Y/GRKMi1jX5MVn5+/t2K9m7zMCkS3Zaw+njsmRqw== 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=auZrzbhqbqtYM4YKP4ddFQq9onOt5tAEW6w7hFdGeKk=; b=NIx7BBM21VgbYKgoLp1mphBrEN7/OyEd/Pjx64uDOQrlxid7XSNF3vO72I4/XHaQCCBT3uH8ffSfhAbcEkal+8xKZxSDKcTCWbxulie9yjIQkQZvzUj0kaK2US+447XPpn4yN6qMmVJ7rU211ne4QZ7YgEz9m79FMDGyWccKADgamSQy51cA57ul8nLrP2Mi16kcGp0qNBvtroqc8+tMMLcXtPZBM+qsuAchtKlF90IIYBpfIR8G305UxIoKa6mOu+gu0Z6D1Wzktj/3Op0lxEU++vFyDtv+EjhqjEjlmVNOISFsuJ3gvdaPh5hMLqtyoQhORuxbU6443WPabOUvhw== 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=auZrzbhqbqtYM4YKP4ddFQq9onOt5tAEW6w7hFdGeKk=; b=j5hjxoaeCNKjTBNNIoZiChaDkDN7st8KPoTwfZwjbzCMyYAllU+oD0f0eJi17vy3g7v1j5jWrUMUk+x1wdMCYFsf4iiwDP5KJEzD0OdpM3ys6m5tAt2ZTNQV/lRLLXN/sXhcSJpbZyGrAI9HsxHKjd49FNa1VmBGXBcxp2uWCbY= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:37 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:37 +0000 Message-ID: <87jzsdh2s2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Jonathan Hunter , Liam Girdwood , Mark Brown , Svyatoslav Ryhel , Takashi Iwai , Thierry Reding Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 21/54] ASoC: tegra: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:37 +0000 X-ClientProxiedBy: TYCPR01CA0069.jpnprd01.prod.outlook.com (2603:1096:405:2::33) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: ab7ca7a7-cf76-4c8d-03d2-08dbbe58fabb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WIdzg+SWRxa8E+s4IVUGrhpQiCFKLuDH1StesVn2fCH7XrYxykNcFR9z2Yjlnp5Qla4lFL2v5b81mrUSdKDj51rPAGIkyAGA9ypKKmv3HQecv1gna4z8K51o6HS5MRmFneCPYpVSCOU0g+jSMCe3nvRyMn62OY0De50LDW/AfQ62EaLmSoRtGFN4fiDF3BUKOC+xL3GPWK6ruyuBlNweAZ13SeG9pGnGkCdOgKyAE5O+HM5WKbGcoRTwggVRy4cRIj5MmeMKjOgYiuUSsuWihP+oQ+8oFGi5XvH0f6jjwf3PJXt39/FYZyd2UeMkJQP4yWvp92NQwKEm/s4YhOvselts9iOoyQbgW0hzuYoxj/ezReVVBJCYDtuTCiZn046p/H7H0sd4+9nciKUvkN7NIeeSLazlo8Gi5Wfq9fmZQV3QbFg2dK6pJENHabtnJoatobVvhapTZ6YnOz729HjbIGmfPze53zDeXreC/HSqZgvsJehtq1i2NNndGN/veOUdrQdpjrIFDCJb0z8pSUNLEPdH5BHmP4YCV9JaHgITaRMTAnVep6PlAdLzD2P8UnB+0jn9C/biXMvn/3cxCcHbn7DfRAXh38epGm1bfspCMPG/G0nMlEuaPceuahN+UXM18EkoyV8ORoRdXFvUfbB09Q== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +I/Tbw957yJET0rY7dnuj64hjKJOrzkFGjpRHvY0wxfVUFL1KTTen5QZsvna/iROqZtlWYZEg+BUj7LV+AQiRj90gj6zclVOy3ma/rxdx9Y8uZqTH6Zaz5tgWiFwkWXhyxdjhVjm/qa2lzH4OzV7BaE+189LKP1fi/YN7wx+hWuyyBUdd5ebseFK9czOimlaliz5rcujhQJOqePxdupM0SbhqoqqdB01h37Rfg1u9haLxLU+48keD0FaM8Ik0SwX3oraGQbWLPX3m7yiqkhVuUcS48KSNlOtRkGNqEhSOrV2NpJlmgrQ/sUi5kkvH8Jm6IomG+T3WV+0xJq8Bful/EzdZJTc3sgZEMO2Dnf4pdlawJvF1oAd94/ejpSLhn1lXYvJz1e/r1P77SvuQGLOWtexXCBQpkXVgEN3DHoUFf8i5Xz9dyVxTAXER0upWYfoCVeUhTUO5r14pDKO3allQGTgJAsUIRnWl8V7sphQgqGOdR7q+pHzC0QaWw0AFvMAQqbeaAGvJWb0ym2u3hDJi3QFMW/U5DsGnFJMIJ4W3LhdHj0ysZH8zMXK4bBYoS7+FcfpqksaQU/RrjeKWWXnj2TrccoWd3iltpYV7zu93R44INMjcP7Vkmimmh91J1neQzU8wkqV2SABpBin7nf1WzxIcAm/T2lSPl78Q+SaN3XypBN5jQbjK5uT+UNsfH8ZCcSNVAISRx2BT1P0sV3cdtVACe8MeVRfoKL3JcX90Qv375A6V0h0uhjn+h03kRok9jku1Bsy8+O8kxsQF568IcLJEINI0cQNsjinl4Yxnx6fij07qWxtMdc2lzrGEPKKcs/oBq46y9rKpecRNJYyMFGj7a4b8DzljpVjwYIfYq6Rq7YZyH96nvhg9GvgTfMCoUqFLPp4pzZJe3c5FnkgsqI7S57u+qkWDRCQWzhhO75n4yxawRlLvr9VLmQdKGF0iKDNGyf3sFySHwMmSmWdlHJVVF1NlOb2loiYjcY2wfivFyE7e82+1BJ4pho3g94B/YXQBrDzb3z9XrmBcwjGD8MrYU5P2VJNE9DztK+gYDB2KhO0r3BOMMN7QriDPcqrQPCfx1ftp+RnycdH5dRYAwNJaFbj0jvDUpSsoOkeTpaeK2Mo8FuQTTkmGJg6KKC/UBuWoCS0A84eMPZDdBnlic+LEtNM10nr5QLlvJ8asOT46Ep6rx+fbPGGQcWy2zEcoGWQiDPldQmqnTmXpA/ubaBhW0iFIuq/WOTcHjjCQ0MrTNzr0bPhn35z5XX7spDveGR5BwcQrkbhi3MLOFJXDPH/O0ZCCjL+41iKNDVtywy1O/mcHaYR0IKh0VT0Uo2b27iU83UIXQzYOEHTnXMKeBoN8Xa9KN9b39nC7DjiVy3RnMSKJPsXd7QaI8uiDwv5fTnSd7NoFfrw3IU7GNeIgMBf0vwphEo5dYIETn4KmheDROaDEQLHmcEh6neF64Snc2l9W2ReG9kLUZ+3LzTBl/ZGNnVNQgZZ4GBTDsF/6xikoXLg4+72SCZF9Bj1WI9zn1Jwwt25ep+QF49bqgZ87U+GraXMHFZE15J8LE8Yk4RVUqXXpOH23qi5r8IC9XhIEi6Fwm3S1pVOVeua+ZuIzIOsgUB4OVR8KP+IqsXTt7g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab7ca7a7-cf76-4c8d-03d2-08dbbe58fabb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:37.7043 (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: IdUufIf4ywxPmBReluEDCKCg/gcb7a6jAuLhbYHXAbdJQiY4QaV3HqgNcjNdJ9X2KuzykGt5fTcLzo8WuBepgNqQmgkaptO54FGKxEy9/2qlZJWaElUGet/45AMICInt X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: Z6BX5YRDJOLO76MWASKK3VRHQXDZ3VDW X-Message-ID-Hash: Z6BX5YRDJOLO76MWASKK3VRHQXDZ3VDW X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/tegra/tegra_asoc_machine.c | 2 +- sound/soc/tegra/tegra_audio_graph_card.c | 22 +++++++++++----------- sound/soc/tegra/tegra_pcm.c | 4 ++-- sound/soc/tegra/tegra_wm8903.c | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index f5092b410926..0e75c6d5c0c5 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -288,7 +288,7 @@ static int tegra_machine_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_card *card = rtd->card; struct tegra_machine *machine = snd_soc_card_get_drvdata(card); unsigned int srate = params_rate(params); diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c index 4737e776d383..27e9f41188b4 100644 --- a/sound/soc/tegra/tegra_audio_graph_card.c +++ b/sound/soc/tegra/tegra_audio_graph_card.c @@ -34,7 +34,7 @@ enum srate_type { }; struct tegra_audio_priv { - struct asoc_simple_priv simple; + struct simple_util_priv simple; struct clk *clk_plla_out0; struct clk *clk_plla; }; @@ -64,8 +64,8 @@ static bool need_clk_update(struct snd_soc_dai *dai) static int tegra_audio_graph_update_pll(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct asoc_simple_priv *simple = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct simple_util_priv *simple = snd_soc_card_get_drvdata(rtd->card); struct tegra_audio_priv *priv = simple_to_tegra_priv(simple); struct device *dev = rtd->card->dev; const struct tegra_audio_cdata *data = of_device_get_match_data(dev); @@ -152,8 +152,8 @@ static int tegra_audio_graph_update_pll(struct snd_pcm_substream *substream, static int tegra_audio_graph_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int err; if (need_clk_update(cpu_dai)) { @@ -162,18 +162,18 @@ static int tegra_audio_graph_hw_params(struct snd_pcm_substream *substream, return err; } - return asoc_simple_hw_params(substream, params); + return simple_util_hw_params(substream, params); } static const struct snd_soc_ops tegra_audio_graph_ops = { - .startup = asoc_simple_startup, - .shutdown = asoc_simple_shutdown, + .startup = simple_util_startup, + .shutdown = simple_util_shutdown, .hw_params = tegra_audio_graph_hw_params, }; static int tegra_audio_graph_card_probe(struct snd_soc_card *card) { - struct asoc_simple_priv *simple = snd_soc_card_get_drvdata(card); + struct simple_util_priv *simple = snd_soc_card_get_drvdata(card); struct tegra_audio_priv *priv = simple_to_tegra_priv(simple); priv->clk_plla = devm_clk_get(card->dev, "pll_a"); @@ -188,7 +188,7 @@ static int tegra_audio_graph_card_probe(struct snd_soc_card *card) return PTR_ERR(priv->clk_plla_out0); } - return asoc_graph_card_probe(card); + return graph_util_card_probe(card); } static int tegra_audio_graph_probe(struct platform_device *pdev) @@ -248,7 +248,7 @@ static struct platform_driver tegra_audio_graph_card = { .of_match_table = graph_of_tegra_match, }, .probe = tegra_audio_graph_probe, - .remove = asoc_simple_remove, + .remove = simple_util_remove, }; module_platform_driver(tegra_audio_graph_card); diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index 0b69cebc9a33..142e8d4eefd5 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c @@ -79,7 +79,7 @@ int tegra_pcm_open(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_dmaengine_dai_dma_data *dmap; struct dma_chan *chan; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; if (rtd->dai_link->no_pcm) @@ -151,7 +151,7 @@ int tegra_pcm_hw_params(struct snd_soc_component *component, if (rtd->dai_link->no_pcm) return 0; - dmap = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dmap = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!dmap) return 0; diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index b3cd0a34da63..6116d2e30fca 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -75,7 +75,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) return err; if (!machine->gpiod_mic_det && machine->asoc->add_mic_jack) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int shrt = 0; @@ -105,7 +105,7 @@ static int tegra_wm8903_remove(struct snd_soc_card *card) { struct snd_soc_dai_link *link = &card->dai_link[0]; struct snd_soc_pcm_runtime *rtd = snd_soc_get_pcm_runtime(card, link); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; wm8903_mic_detect(component, NULL, 0, 0); From patchwork Tue Sep 26 06:22:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728188 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 0B83AEE020C for ; Tue, 26 Sep 2023 06:27: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 66766ECA; Tue, 26 Sep 2023 08:26:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 66766ECA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709618; bh=PXQs/DWbNUUrKddiSnnr2WONN90QtjHVKv0is9K9C5I=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=qG7PC3ICNnftSJsWMLxmd3RtXgE0PxOSCo8zUwEWm1XU25KbbXX10i0R+b9Xtt6qN OQaQd541ovhq7ygUNoi4Px5NhG1V2m+83x/hgWnrQMGnZAHwoglIype+ipo+f1Ku+p CzdGtHnCXbgYQmq2Qmio4LdxvzTiRpFYXDoIZS/c= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 69CC2F80614; Tue, 26 Sep 2023 08:23:07 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BF81DF80612; Tue, 26 Sep 2023 08:23:06 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5B80AF80571; Tue, 26 Sep 2023 08:23:02 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::727]) (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 11D99F80130 for ; Tue, 26 Sep 2023 08:22:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 11D99F80130 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=pLyp+nTm ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H14SCeAoS+86He8vpXa7umPcQ2OpZtlxjRU3Ou1JBOZYtJJL416Cl4CKMaEBl8tglvd0ApweiBHjZgJPn0SnAsILwFsivNvaN8NSAa5Mx57qSj/0J/n0qT3qRUgUG2KNf8oR5DOEYiT+Cs+z3QOKuzB80wklLml0Q92mQMRB0ubz7DmG3GNB9CyIt8NlYp0wy12WDyPzvG7byqE4a2/sHPqeUxtRPp5590NPkb8mnxJlry5ILyqfVBCB6ACA9rigy3qcVtouI1t6YLaONo6lMt1AJBeZ+aKZuankoqtTMz41GWzIAN7PEolQ3j6FJujzX3Ibz3IOEtngUEP5vyYrxw== 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=SMx1lf4xWSbMrH9iiXaAF34eD+/ZOUuQFEbQPQeewPE=; b=K5Pbm+65GZMtBqXG9C3KUR2TmQDT7ClNQ32fhoJTck6D+m3gN+cImiG0mwjBOnilh5IlCQUe9CK3/QgMz2VI33sXmUS3YUlBrO+BrJX7iMe0/AyFHw6MVm5QbrtS6kJdb374RgrszTihHM0MnN3wO69oyNa24sbhXM90aNK9ZNW5gx9lniYWTLLVfS8aHm/AT53BTEA0a4J3GMEd1K7I3FY4uIq9vyOMx3dDzoCRWH0L75m9WlJb+S18ux/7m2pWHCtC1TqjUvuXABkkDjqTkTNR0mRSslKzFfttvPZ/xAWPPlcHy9bpxGd3VnPgsvl8V++016fbEi2viGrA/i1mAA== 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=SMx1lf4xWSbMrH9iiXaAF34eD+/ZOUuQFEbQPQeewPE=; b=pLyp+nTmkY+BpGvR0O5j4rpEc4Cwm6yqxtt3XKqoQrCIC2F3zBLZWs4Uh0IC6TPJwLYCsOoenrh0AJu+2RPYagthj0/j9WWPYnIed6P7MVcoLyIpDvWmjl6EZV5wdn1IfR3GwotI3q3G+uzOHB4aqMEN4A2wp8uGcapNbbTjAMc= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:43 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:43 +0000 Message-ID: <87il7xh2rx.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Arnd Bergmann , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 22/54] ASoC: ux500: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:42 +0000 X-ClientProxiedBy: TYAPR01CA0096.jpnprd01.prod.outlook.com (2603:1096:404:2c::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_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: d9bd6093-b720-4ab2-8507-08dbbe58fe04 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R3mO7S4sd+jk71YrC4bB7uOcrFk3oUwdqfzomSyj32/RrKe4iW64WR5HuKOfNmkvZDEh+lxTtXmDgRVHsYLoQhffLtC0o3MrukMdZzj0iHBHKhXXqxiu2K4a6n8fKC/R8XEvC7Ua3TN+a0kpZp2geoEx/mXIY+1JOcGTsDn/6EHNrvYnrEtevBSnZOuxNNjXL3TjNI1TVQc1Y9cKSyAOv6Blrfp1vHZ934osNpnQ87Dr4uldBrs7+l7DQ+Jul3+zieRfNyM//C3tc+0k+9xCGCACHI0mKhBc7h2iGKaobImabMZMbo3VwymG6rFnggY+k/iZ8u7Nma+ymOdKCOPftA12CFtCpEtaxGzg00W4ZRx2g7lGrX440xzUMzHt9vbsWkBU6aSduuY7BqKJ+qzXG2JaD3zwWXI85oLja6JDmKpS5xLFgpztF6YR7kOZxs4VHHQ6z6YapXdeMM3blkIi1lROo8BMWXe8OHwDXzm4fpYO7VLe8TSMTuX75Z7Q1ocdY3ljAwl3LdjvlWEoGVS08+gVVc874Tk5MNMv5SopWfzqNGURTQ0+VGVEWwvVTKJo2rK4o3bKVTrFvOKiQxcDaXXLt7kTwl7p4WjFqzgHHExk+4YTMzR7BKwTwKL4WttyvyD7yRZh0Jxus6c3YuU+2g== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z+XoOI9W+q9z0llZDTu9KqqITWcrNshECDecyirwUwbFRG6HbYVXe+xVVnfHtPR91FfhWu73WmPZdxpO3fA1bfKkRkIbejtO42eJvvNXAc27CpKhKwHaeHzR/ZXNHRE0ezE+dZCqa49XbzJG9J7XKcA4WZt83QjwMtf/OjVfJU7hkJYg1+3Lx+/ppfGZNFsmgYwQECvzKJ0aXleWtVrLFQZZpqMi02Ptu7YPiVDIvMSu0jl8YAAXDKcudX7ea7NHW+nAB7yn9TiH38wsx3Co+iGmpJHEJrfciS3F6vSatj7ZScUni7w9GDYcaT0wxbREhXPNqf5qJaujQhmC2wp/e5dcw8/LC1CqqLmjJNwdQOo4ZIJlknYloxj+w4zrgDFDPR5l6D8bddxNR1Lu6AcepCnsvtndIHSpU64S1jbXFm32/gIF1KpW1tgTcUcgE8xfErobORcsvPLYfhVE5bUgsjCwE88DP0IaYDqe2niQ1mwM1lW8zc8hNUXFgWK1TepUoDwsOZ2r3ZUYJepzfl/gaTDt0xYPvUFf7L1oa5USjw3mUgJKqlrS35NDNJhF++as2peqNvRWwhz13SGdnu+eQZny/7oaeS7sEAe162TvVm6f7EtDpDeHVLdFPaLJnEPf3XlNE0H9Ns5hMgpQwnE7x6sgE4Iko5M3OLOtW1V36+3Teob+YCioxk+p9D8j2HwH0u3iebps5jGI6fcR0u2YTM5Ye6cfUB7FG56jGmSrEEftnH3wdTEuZfc3fTtI7YxuOfnrMBaYbHycbJNH7pndj4BbkJgR5C/0UwrlMDviawSADANKX80oPLhF3KD3MPeor61T7YMaN5MOLjfKzXbZiTuP3aU6PO9KnYU55sP8U5i9mewp9CNjfBW1wYVqavyVgi3Kcim2pi49FicOt1pvhWU23nsfb5pEYE3j4EYP0tAaYNrezHhGEbs/+h7yzEirUTKP9NRa3zUSqEdhCRyC6sZSYx2uBbvCMAK34hiHhdzLN/QJQZ9or8y7zEZskiQYJNZ/V3N3eTZEOs8wz0MHqU8AV4WkT5FVZyWdQAB8fmf5LzjzHgh9F2NHZ6C73a8ZSvyvQIjAsjXWyIbKzTmmDHyPXs+SAhKnKRymYP7msTcXCY6spXAr6P/DkShNugRpTovt9xiW9PR+MIQadR+jYaRDANoVs1cOehrLOQ7ADtD4B4oEKhFMO3QJF56RM8gYW1TBjVHPVA00CvPB0J8hPmuMIEEUa14XZZqByhja//StCgdmcYYrDEYs/t0YT1q8wjK7oSC6jajKVSKx8peac5gWkUgIYMt55irc7DwlTY5jJBVrHODrvEp5nUW1wrfu636r4jnl5vmomnKaEmmlddxIrU5CPZ7T/f1njPK6zBzp1kAs4MP/9uQuSgidoPEdXEbilxvFHUc9Xi6tnh8EcKhxvfhvGWZ7vZ/qp35zgKyNBs9tOkA1jH2B5xPxFE4P/QUx0sNDrsPznpRSsiTeVhm6v1zcwk00CWcHTi2RZwxyo3CGtVcMHy5QiE2Ed/Q4wZTWPuw7SUO1vOhPb7o4RMDgDeH08oEvdliBM2K4YhmO304iCygcQedjRVAj9SbS+TAXUkMgkyV7VBkZ3arN7QPmD3mEBQY0neTMJmQLRmA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9bd6093-b720-4ab2-8507-08dbbe58fe04 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:43.3771 (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: LeDG9iR164XhOpWJlsMPrGv7DjQRo8XUl3iScmDeJRNkkleOVCBGQBi3WXwcMmYIaRi9hidnNUpm4B68nRX0lhQR6+gcWb7tY2xk4E96aHmooUbdWZE+sPQ24UA+dYsp X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: ILLTIH3BCCG6FEIJ3HR7OH7QETJ3YYOP X-Message-ID-Hash: ILLTIH3BCCG6FEIJ3HR7OH7QETJ3YYOP X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/ux500/mop500_ab8500.c | 14 +++++++------- sound/soc/ux500/ux500_pcm.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index e5e73a2bd9fe..710b6744e013 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -188,7 +188,7 @@ static struct snd_kcontrol_new mop500_ab8500_ctrls[] = { static int mop500_ab8500_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* Set audio-clock source */ return mop500_ab8500_set_mclk(rtd->card->dev, @@ -197,7 +197,7 @@ static int mop500_ab8500_startup(struct snd_pcm_substream *substream) static void mop500_ab8500_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct device *dev = rtd->card->dev; dev_dbg(dev, "%s: Enter\n", __func__); @@ -212,9 +212,9 @@ static void mop500_ab8500_shutdown(struct snd_pcm_substream *substream) static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct device *dev = rtd->card->dev; unsigned int fmt; int channels, ret = 0, driver_mode, slots; @@ -336,8 +336,8 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, static int mop500_ab8500_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); mutex_lock(&mop500_ab8500_params_lock); __clear_bit(cpu_dai->id, &mop500_ab8500_usage); diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 53b5649cfdda..b7f38873d2d8 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -32,12 +32,12 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_dmaengine_dai_dma_data *snd_dma_params; dma_addr_t dma_addr; int ret; - snd_dma_params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + snd_dma_params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); dma_addr = snd_dma_params->addr; ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config); From patchwork Tue Sep 26 06:22:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726442 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 6809FEE020C for ; Tue, 26 Sep 2023 06:27:12 +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 760F0ECD; Tue, 26 Sep 2023 08:26:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 760F0ECD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709630; bh=Jl9B3zaCbrWOSyZJN0nIh+eeL0/dTil/GvFbuhciICA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=P9mjI/PjRKb8EWk+ivoE4mWij9DyM9Kk2wlcFEEB2DN9LF2gyhGaQSdsJbjK6nR0h 4/UoBkxptanRUoPgKds8TCqRvJ0eUPD7Gn7bnEYW7gLmicA5/hqZyX+Y8KkPfbsVfa fCD3OCM/r9LiQyA5rfhEL5+H8Fs+NUzuaNVj0zb8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D5D23F80579; Tue, 26 Sep 2023 08:23:12 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 58849F805C6; Tue, 26 Sep 2023 08:23:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6BDCDF80618; Tue, 26 Sep 2023 08:23:08 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::727]) (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 A6C6EF805A8 for ; Tue, 26 Sep 2023 08:22:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A6C6EF805A8 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=FhAUoP5c ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lpO5K2fe5ej26LAOZt79pRzLiVXgQdDzyMnneAwC1C9H6ihf8+Z0F657yKnIsuCA7MH/wP0zsMWUN5k+PPyIpI9Is6bi12FqnqRXy3wJKmLLUXGStOezSfOX2S0hNoyl4yJvbJmJ56sRuYiL0puHsBchD86wtAflGQybX8Q5t/ojZlqIdHFSJfVV2jCeQG1afn9hvcPes6rvCuk6Bi5EJZy6s5wBzeYXJanGnT0S368YWES8P0c22Dc7PgkXq2dA6PILN7mXLxRTyE2jlS8lOukyY2mHq1nxLtE0Z9o2Eg5qFMyB5nwUjLOSZ7ScoHpKBBStAsW8ZSoC4gL2/VLp+A== 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=BjdhGTLZYHENWzEgqVA3IKTLpRjniXReQZBzz3fefHU=; b=P1MJ8R0sgadZt57u0F05BzrJEEjKAr5WcRNUZhX8zMTbRFD+teerVieXeNELC+taI/zCyXBuRLh6L7+lJN7VsUsinz6SkUhMchVzdLzIJgBu9NB365b7R2QpgBT8+3AkQ/4tCeS1gOdS4Dkb9h9p7f01IiUYIb6kaEVxaQ8VNMsQdPxpitiOmPB5skvHcnYauzlGvBsfDQIb8I4f0jgHzyI4bqqrjPTBxqJrfXCETUc7L3/Y89KAauJ1K7cUxNopH40zWhy1chZtR03f4j435GpzxMNjD2Lg89AjR3/hxrqAjo0Sqah7HjbWfa8l52/9U1BYWRVNbNpoPVKSn89xdQ== 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=BjdhGTLZYHENWzEgqVA3IKTLpRjniXReQZBzz3fefHU=; b=FhAUoP5cXKftJmIrZVj2/uCfrHwFye73aO8bZk1d4/jT8s9/2qEhUg7tBP4NMh7jtwPAx84KY40UpzYnwUxGFeMdfHXtmU3hS1AClTXT/uBfaTPGNpbVIGkpGvpXllIpVUmck1i4Ybo036MZSep7Syxl/gWmO7Bs3I7lTviMBh4= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:49 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:48 +0000 Message-ID: <87h6nhh2rr.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?unknown-8bit?q?=22Pawe=C3=85=82_Anikiel=22__=3Cpan=40semihalf=2Ecom=3E?= =?unknown-8bit?q?=2C_Jaroslav_Kysela_=3Cperex=40perex=2Ecz=3E=2C_Liam_Girdw?= =?unknown-8bit?q?ood_=3Clgirdwood=40gmail=2Ecom=3E=2C_Mark_Brown_=3Cbroonie?= =?unknown-8bit?q?=40kernel=2Eorg=3E=2C_Takashi_Iwai_=3Ctiwai=40suse=2Ecom?= =?unknown-8bit?q?=3E?= Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 23/54] ASoC: google: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:48 +0000 X-ClientProxiedBy: TYAPR01CA0079.jpnprd01.prod.outlook.com (2603:1096:404:2c::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ab614d1-6222-4f25-8fdf-08dbbe59016a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cOZeFFCtjqqXIbiIlfgt7SkVgsCAT8Ojjp9Ta/eU0qXJtcN3hcociENnymG3khpd2zAGtGI2u3hL4WHkh6bwakBN1cNyGzg6pHvUi1M1DPxXJXt4M1DwNk9wDMAv5bV3vUv86opFQnY6wSMvXVyC5mguyxmwei6oRaJsf9kHIMCe3de0FXH/QJ33uGC+GRB//Gm67i4izAIGL52C12BIA8YI/i6RhKEe8WsY3kQ8lIKPTMGSRiaNj4GBiAVI++DItYqVVe0wYnkd7i7x9HEP1bSMkis+AsrWojQb5iIm7/Ao0NROyjmrhHanrzUFibxUMwBoZIShZI5sVvn5L1V4awXHiUe+FjBBn7a2pFiy6OdB4qC5hivUBoAs8IPD8AyUbnzQ2ZPXhkkNvIbm29TjDRD6z3h9HIOqnJ7PaIR4Ikaf3ao7Ajr8AEh4qo987GUt51yWU9TK/mZnnfXJqubSQINGySWUG7wOAuXtG6sJFQKKtDOryst/WsT5SFeWx+l8pEA8KPeFKJF9q6gPNKmXHqVPGSph/voeAhUmtaE8k1z1XnVBFN+4LlTIUtoDbMmyf+EWYK+m82wRi6hGg8mDFEkRZFMBbi+a5rzIOO7LVQzTWIbYxvSQT6GHZI3T50nX3NZVV9b3I0rxhDNLMCU+qw== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3FweSc/ne3vSVN59ipkLHH+14ISId7MxY47ohDG/05pJGCl37hAApyQHG5pOp/zY2TQpO4086qNi9u7fudhC3YgOUZAAV0XcEq0iaZR04wHR6AFFRZJQkLrZ3+s888YCsdgTnQELcA27mDH9sX8bmUGYUGnrZ1Qr/Wxavat4dJLFVMlIY5SoDbgVnO81n00BmVQ+dJsSimpaaSuSjfNzI1DQTWtYd3E2piGIOK431M5Ap5cho57/PgdDlFKBhxC8yhYUMnGWro5vE9PZA1+0m3EhcqTZshNzYveLVfbS/9ooK9LW/AHnpnKHDCw3wuwTb5ED+qijpQVTld6PQAwXNqt2hbXgBSbml7239V6Wz8Ejk2quuntCFKRoM44UBZ1XAHSRa2Fj5qzNIvrdftGQqrMNkP6MycepFSxa0SO3ilJs7YxjolhM3gswyeeT36MQFKwUDMxGhk6ZfeI4XVnUacmWBdwfwjuM8gF+i3hpq1fJ6m1KEKmo1rYygBcAI4TL4yLBQBh3BnOmX+SQMjTdbz91gXLo8+JjT6qHUkJ+TZbRONpj25hiEtlLDFQV1XWzi81S27QiSii/f6MHggmSWWf9SsHRQaa1dgNhKrH+0tbgRoXNM0LV+NvudJfVTbvP6DPtZGYvXode5eOz5URa/pB0RqKVAUc6QtNbH7lfnSbZzteyGsuBneeov4i6pa4F7eyNyZHB9HnSu7Agi0AQLoy7bVQJ75isx/npNOWBcZEayMx3uyRQ3xnHzTHoFjHLrHzvX7UhdgCXojE2ZJU/QwefM6HoEXhSQgG18ZlBz9LkwuE6Oc3Uh09B5yfrLl3Uq37vdUt2u+4cbZXK5/xBIAKdDTZBKN8m3WUHOD25onh47hW48/cHoNird+bRPafOcHe8xr0q8m8mNneGTxWwiLgXZTYC3Oh/dgnCZP8tg6t3SPCjL+X4gVyQljwl/D9Pd4c4yNFiM34kilj6bLgtPH+ohXxpCkmaHYOL/QpqSRB1ZYstqUU0mWoZiYtGklVi6ELGL8c5lOO1yy+wC4APjUZIFiwZFESA5tPSHiGj8aqFFsc9Qgib0cJep/i/5ufOzH9MxVIDR8P5mzN96Pvsj3wkbWoH8NfhD5tHnAtM75G2TGGIaUwZmcNP5SQbARvofyV7z+4Wr+PYDC5v/d5onJeTHO7MPj8vUUAjxbWR9LfOKDrkPS3PT2E2d3MXT0Pi+lHNWDXDqnkC7yj+6HLOcDO0/MUuoN6UpM5O6DXXwDS4ce075mLJaPE1fZvL4KQV9y2yfDjRL5lgN2WjN73SNAcxJiEaxFc1OMO+b7DOvLQ8enE0g3Rr33Fc8x25HFeS0tMFedqYPo7BfVFZ3hLnCk4ZfDH0htFWEXax8Fro3zwpY9zNb3G95nPcvBf7R+sDTDxhFEaoBmzrOlAyid2HqROY8zFVA4xvev1SFhq0JpkQp/Iuk8L9zihnJWPDahksqUgv7FI1HR0pTyl/Q5mzueIkH2br59gbIA8GzecJfdL6SKG2RfwHW/1joI3S7EldXWEBdRQyl1haDSqXIi5R5gs3c7Es22TiIq5onyS/QTfNcgYlxFzR5dgGsVYBs5uE8q+w6SdXRk01Zgk+ZUogb8q7wf7nUeKaQ20pkmVfDp0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ab614d1-6222-4f25-8fdf-08dbbe59016a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:48.9222 (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: DKcqIyTlwrjeap6nD060gybz50Z1uU14kYvXbxRI/IYtwWqEbm9xoODwaZnlBDv7l9gEkodSyn9ipI5UEpIbIXb2ZylcaYjEHfuYrN/4k2cgV/1GQDgH9D1VfObL10zi X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: JDI4BSFTW3N6ZPKHPZM4XQY4UYGWDQHH X-Message-ID-Hash: JDI4BSFTW3N6ZPKHPZM4XQY4UYGWDQHH X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/google/chv3-i2s.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/google/chv3-i2s.c b/sound/soc/google/chv3-i2s.c index 0f6513444906..08e558f24af8 100644 --- a/sound/soc/google/chv3-i2s.c +++ b/sound/soc/google/chv3-i2s.c @@ -131,8 +131,8 @@ static irqreturn_t chv3_i2s_isr(int irq, void *data) static int chv3_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); int res; snd_soc_set_runtime_hwparams(substream, &chv3_dma_hw); @@ -152,8 +152,8 @@ static int chv3_dma_open(struct snd_soc_component *component, static int chv3_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) chv3_i2s_wr(i2s, I2S_RX_ENABLE, 0); @@ -166,7 +166,7 @@ static int chv3_dma_close(struct snd_soc_component *component, static int chv3_dma_pcm_construct(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); struct snd_pcm_substream *substream; int res; @@ -200,8 +200,8 @@ static int chv3_dma_hw_params(struct snd_soc_component *component, static int chv3_dma_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); unsigned int buffer_bytes, period_bytes, period_size; buffer_bytes = snd_pcm_lib_buffer_bytes(substream); @@ -229,8 +229,8 @@ static int chv3_dma_prepare(struct snd_soc_component *component, static snd_pcm_uframes_t chv3_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); u32 frame_bytes, buffer_bytes; u32 idx_bytes; @@ -252,8 +252,8 @@ static int chv3_dma_ack(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); unsigned int bytes, idx; bytes = frames_to_bytes(runtime, runtime->control->appl_ptr); From patchwork Tue Sep 26 06:22: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: 728187 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 C3A21E8181F for ; Tue, 26 Sep 2023 06:27: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 D351EECF; Tue, 26 Sep 2023 08:26:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D351EECF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709645; bh=8ewh8S9j0SK9ho9ixNpW8SlYXSlxw+m+1J91A4QFtF8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=MfRWcjxTBJF0/pjZK+ydOhyLGMO4Yl9enaMMLcZj8fkiPjmZcWgJjlQJRdd/t4Ku2 wEbZes6rb0UmMd+zhVoop73t6AgletprN8kk7cmnp5PVs3hhW8kcP+qCorCVOhO6hD /c5K9ZdCw1Cc5HmpqrjMVVfFc9qbGaJCvyWwW5es= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5F851F805C6; Tue, 26 Sep 2023 08:23:14 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id AFA33F80620; Tue, 26 Sep 2023 08:23:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 55440F805C6; Tue, 26 Sep 2023 08:23:10 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20731.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::731]) (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 4637EF80552 for ; Tue, 26 Sep 2023 08:22:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4637EF80552 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=PuXAbSUS ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tvlnd4GgOMui4+6n50av4Dh5gptiDWNFvBmU4Z7kzq3AYZJQeMab+zX2qGENtfnUAPz+HhxBO629OJ/4eu+VPuTmbJP9btYB729LEH9rGVoGXRZSXTANOFzpyRWpjf0I1pv+kueqEVZy/uAosmnyTIjB21y9hssmMRjpPUQV8Wc2yPQPhljPkA3r9dQvSbNDoNaxNARMpcTCc9Qr6kVO0EUqnHjEvGtie/kyPz+kLKCfpH3GnhQkzJmPeBhQ3QF3yvBRruO0/JdeHd/vXsnSnn9dAZIwHvK1tP3HLKTh9OMkZMPZJs36jFQdIdSRmbuV2/UCb1fslNP8Ibp7ip5OlQ== 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=wCnhR2D7o+QIbJf6c/MV9fZDsZZA8M32TNJW4KYzNSs=; b=eFB1/XomU0vqaKxZfBEQdM54vZzpxJezG9AUVRQ3sOyDxaca1Vpl1lD2MpSsAPrpydT4iW5RMtxqAK/JX1xSU74nXKTYWfa1YtJKZ37wDwAO4lJmiBviDaWzEp+aTTLStgonN/cG70XXz2zGOPT02Ess6cVnbdj0Py7C4jzbaHtyZTJ0noFF/a9PrNMsegwRKDPl5/px4Cigby2uX7viJ0oON707O38n4Z4A57DeyRXPXh/xMaT9qSLT6YhAOY3N76h/Z/TT3m0Y8kTTou1REzFGVEWzp7t/Ur5wLvLCmfFZBpq/ysh4C+E4RgXcrRQj5AbwiJMfYHDEmPq+2loaFA== 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=wCnhR2D7o+QIbJf6c/MV9fZDsZZA8M32TNJW4KYzNSs=; b=PuXAbSUSEEFV4MHGy/OzE7JdfT+3qrX0S+P0yHPRCay6KD7V/tuVgJM+NzD48ygCtttAj91ZysKIF7gCzl8jGg5sADCXTQ6LBmlZ6OWNtMQ/PTpvFaVEQLJvgs1IGHQn05idTB1AlOjDK0fWc9GLjGApqaCphPP5/eU7jjh1Ie8= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:22:54 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:22:54 +0000 Message-ID: <87fs31h2rl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 24/54] ASoC: cirrus: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:22:54 +0000 X-ClientProxiedBy: TYCPR01CA0066.jpnprd01.prod.outlook.com (2603:1096:405:2::30) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: deba52e5-4ac6-475e-a08f-08dbbe5904ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CJFvHyCjG0dFiijh72DI312kSIamVrSwE8HCYfK0J7rg5CmV86/ra2nOvbeBqDbbFbyH3lE59DGM+1JNQBkuMxRoHMscBhVEE6Ve0GZ8FI5ECX1pKYDcFYUO6hP00JmMKuMOuCdlKYwio3DGqOkkG+wJZarTpnY0eXnGzMu08Ha6tMNF9FYjb7kGJhurZpZxID8oXRF1bPJXeL/IcxDC0Kn6LD3EmD99IrdwWRrEgyrWq9FCA2FQsQi/oZU0F6MrCU8/yMwI7Dr7nvKQgx1E79G+aXlzP3DLLbmzKycsvpJoE3MgKLcclpjWSDy5JGu2vWlNvAeqD9aqn4oxVndZpgpX288mxuBQl3WRaWVHYUyPW4WH+Jwfg0aHgg1zEzrT+9T57yUI5kCeesDx84NfRsCWsB2g7nkC3hU9qHWgKX4FKjT7bck4UbL8qv89Ry9VDl2nqdRgBPnIV9Wo1ndkOR4tSa8dB4D30ohJtKcfw+I4Ex2WVj2xhyTbTxqKQnr5erXUvHNaOHODvcmB2WlAucN33OsqDA4XM81ZqUJ2tUBENsMGzINqvRMXFO1oGEi5f7Q2p3Nnxy0tv/2wa+t1RTHFSEKwZqTvbdD6DcU8+6Xx+joSiwW8JhWCeYBSMgJszVTpE1ARr9nHQG5w1s006A== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BhNPR1Sh5J1g4a/Hj62SylNZdktqOsSjYzSLpHq+XNOl3qAYnKnU5RryzQKUr06u1OhEwwG7S81C6isfqJejPB9xLmeSaHQs2E9xUC3I0sFkyMrLsL01yzzGf2ZnpakvvHJCtWtaG6erzOIVLw53ymyUj0H/NfIaHPEMIU+T5PCMRbOH5gEDqZqOay7ihL62RNl1KZDJIDqAK9ATW5awjGD5i7TFYBE9EUgcO2sFk+mnfFASdasbxmIGrdFj50DyVZgARHa9Itawf76GVA8i62hmqhAxq6SgiuCdvA8WRVC3YLaPPToHIG7T5ifLhhPpdTOl5ggkdvM7QRp7TNU16+2H3s4eGWOFBeixFdhzT1yIn4XpOI1TKo4CUhCWzyYg7W8PreFSvkdqCRBN4QiBPzBHL/pIUDRxjyNvIBz+lkoLsTdTAENp0+HGdQzNr8Y1g9J1RTCkj0jY0CkG8OmQqEJUt0oButgHHlamKXioAIe8dIXK1QX+ept2ouvIUI+LabKip87hD+deGB/XaMTmNovGmx6o6kRGoBLDWH+rB2fduMnzmLSmFuUN8kpH/USkVT3QnZJDLuTcyCfv3iUxHcbvV4URDwxTMquvI03Zh6cmssh5T86QNN2degZB4KebSq2D2iN5Nti/WgPlpWDoihp2w3AvXV3XEBJpcEOJ/VMTngl7S4WwaHPnlT1VUAqX1H7MIoHdmvHAXqPqx6wffi6Sq9aV/d+H/4IAnNcKoVjNa2n0VF/VyTyU7uRk4bCEuCWRL+kgylBtaa3sHdPI8C2goE+zJWkDGvjgy2wTlDbIV2ODc5kgCPLK6AOoqfLXby/eWswH/uuyU4t0x4UrhiJXPhYuut7XpHP9Hix1Oeili80IaO9wVzb0j4VsFUj9eolzLKRwsMgHgSMZeDqwy/C/GWGG+flALJR3utaEekqamqsmMYkX0p+ws9Hcq0Ncmifhp1J3jaSAG9ovNE0Ge3ea8NcQ5zZu72/G3ltcbecS5wWyGAosJgZhDPiMIVEo0xzd0vIxr2oM+ZB7XPOm4lTlubyHbJ+6MViHp4PkBpPri1q4NQ2DxxfkEg4anxDdC2uG/MpJn7cuqAMXh1F3ta56uvXeJFwTeti9Cd/3BgHOfbvq8F/eauqu+cYQ9nkHNOasnpY0Yme2abkbOLhdZBjfw29GSWdK/nlPy2/+3xwFOEM58nm5nwq9GjzuGnf3bS6dy3StZl4UWYYKuMYlSPA16SgL00AkEH3zXQ1A9vWKjHdjZVcBVFpWOOgoF2hqa9LfEtzf+ZuP1xvrPmtJVW4Nh4hyuvTwsVu+dA9RBNguRRYEvVA3Bc65zbkS4eGP8+8OMGaPUgJpbM5B2VQvUyBncBcgeBMMCV9Cdk2qA7QJ3q4yr3lbM0CPnp13XKi1oNxFlHseImHdqdwOzJWX1cxpIIDyq2P/JeQiYUrPQ0dOdRr/rkLAzCqFddErw/euV2L9kOHb/gzBR5A/62CVzrs0ZFkcZEMSlyEebiz3eSafoKmR8rQaW4bB0FX3MCbbTWkDvefPSqaSnO+dMeZy31q7vqGUDA6xGX1okngiRH7rnU3avervDuVeTP2r9BnMm3m2FBLBsUnxkyf5sM88uOArAPomKcQm2aK3F1+kwjk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: deba52e5-4ac6-475e-a08f-08dbbe5904ef X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:22:54.8231 (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: TnjBdL/dVutbXPy3v1kbsATkWjkl+aM8lpGumUDWUxKbRLzbQgYlhWRV6179hq5pSnVjbyZjJNkNnYKP6A9DhW0pZWEMxnq7nP/KFd21rfvS9JqwbJpvj1fKTS2QjOwy X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: WFQVT3YYZO223LAKD5AYW7FNMIBOO346 X-Message-ID-Hash: WFQVT3YYZO223LAKD5AYW7FNMIBOO346 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/cirrus/edb93xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c index f49caab21a25..6b6817256331 100644 --- a/sound/soc/cirrus/edb93xx.c +++ b/sound/soc/cirrus/edb93xx.c @@ -22,9 +22,9 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int err; unsigned int mclk_rate; unsigned int rate = params_rate(params); From patchwork Tue Sep 26 06:23:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726441 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 895CEEE020C for ; Tue, 26 Sep 2023 06:27:41 +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 8B023EBA; Tue, 26 Sep 2023 08:26:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8B023EBA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709659; bh=EA2w0iQ1JOO6cGfH2hlTAee+YQ1mdFgxtcUW6BO1vOw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=FrtMJ3ZOBV4lZQWlrTAUMPK/zM8I5ITUQWRWyS/IkR+eGQfWtzyAh0QPk7UUg/aOR jUKOlZsTHFAijA74ZxMUzUuoBXoBop0FC0TOHogrZ8PUUIUCW8zun215yZCYQQcH9J g2Y2JWezBw9wjwCgfrmPTZhsGnT9sDaAoMsInh+s= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7166DF805D2; Tue, 26 Sep 2023 08:23:40 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 36C4AF805C9; Tue, 26 Sep 2023 08:23:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 73FC6F805BF; Tue, 26 Sep 2023 08:23:35 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 72B1AF8060D for ; Tue, 26 Sep 2023 08:23:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 72B1AF8060D 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=XwXjg3Ps ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFCCvDVW3rRL5KuxYmNjRkU6hzBZvPJnDnChC5didlAHN7LTImDAHAafPMfzuILFl+6LprRhu3b/xtUSvS/OdGodlLquhhPYLqL7B4W5mDjukO0GA/V+X6l6tUZVCHYJ0qpYUgNa9fyOnt0kIywKDRKQlwY4RWh8PSP3V9GDWPdCn9OIwrltfF9xJrEJGjrCmJM6g0ZRT5VmQz+1JYhBkNNCou9XLO4bb1Wr8jz3QnbFOi1kTDv95+6l6xkFbCtk8MAUZ+wPwvOhUYxg/4+k9AIMfLtLnyuBk5RWMxr5GMmQfbQcQwFPn4SIttHTFJlTF56bldc5DZBDAz65uXcqiQ== 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=IsbviVLMJdz820uexOkBYzFD8FrTf/Ho/V+FS0FEHGM=; b=VPZa6qubTyZNdQTNEPGbYIbAgPFVEcqqkGwnc3thUmLQCoVf4Zz5gb8Lj8SQ11LwCcXMhT8svxQgSXbZInExMxB7Q9eu03oTzXzBMTnOJQgW9Oor4vQd9bNIPELKTTIoizJBY5mW7ajyg3COjvfmEH+JIbkBKviUtgmQdY8DnED378FEB2jAs494HSO5Jv8QRUSZNKEiKYDCAAAv71MjW1vCOY+SeDiCH8nN26lIl4F9YmdCIgQOwva4xedHNqBC3UGuUe/P4nsARvz+aWHPeK9KY1yCp4rJxKj8cdswEnr3xmpoLgYkHMC4F4rml39blTPyPl9b5o7ux1hxdWU+Hg== 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=IsbviVLMJdz820uexOkBYzFD8FrTf/Ho/V+FS0FEHGM=; b=XwXjg3PszJlvQUws/9NqoZILHE8YMTXW8/u0kHV0fHVZ6gIJnXgqTM7LRptAGWPnvngAR6MPMYGeHu0dp/zujR8vMAbnGB5NFD5IWaSDRlZVJ5F+jRbdFwPUzVouoS8S9SxDymGQoQYWxLdW58k9J4nG6WOl+u4wXvE6pamo/9U= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:01 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:00 +0000 Message-ID: <87edilh2rf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 25/54] ASoC: generic: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:00 +0000 X-ClientProxiedBy: TY2PR04CA0020.apcprd04.prod.outlook.com (2603:1096:404:f6::32) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 962518f2-2c16-47a6-b10a-08dbbe590874 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XtZuN59FOmQnSg7vNkvkNDYYKkkZhhsSBTnbgNgAOlVk+4i6ntxQlyc2LrVlUkf1HAF75q1Lr5dD4N4zeBsL/IoG2RdfHUpArccGpRc7tNR3MHm7v6vKqSKt+kBQvKRU6nz7Hvk1PIZdByhuO1f5xcu18DgBUQwptmiVrintNdBw4R9ABFz0oAyhWzCfp4Gb5wM+k9sVHgCnEz3v5LeMHlUxihk6lCwO/mGgLigEfIVkDvimHYOlznQ+XqWnv8gqzs52u30JoUOHPNoxgCGqCNzy4pU2q4RtmLP8WV4QE2fy/AYWGn/0j/MCgjp3sB9r46+1iGi/3T2fvumXtSVwZDyTaK9kQXjVNOMGkbp6sYCmdGIC4EpWT3C1G1K/55Z45hn0cUe1iRe/cIRTD0GH32O2LmDKil6z3jyUAzfnRbTZZdSU1wcYW9VVz0IMd+a5ZiudkpWvtHGhMO0fLubcxru7ncESSccNbfAfrCs9hqfd2kCaO8zRL2C5iT3EayMH3NiqqGo4fPR6MjrOMfeXQJrXoD6ySMHIlVX3W/ELgdiIhQC+hFy3yHvrK5XHjtxEmC0L2nM0I2FkOsCxlrI9wTTNrtc4wgwoQvsGWVhsuuY34aZ08kmkTbXKNC7heTwkNBXrR0N7HQmqZNfSXGtaQ1cE1eITfHGCxMie9xXwJGU= 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(30864003)(86362001)(36756003)(41533002)(21314003)(579004)(559001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VAx7bCvCMomzmZjo0AcUaroB4itLqa4uQxcTFibOxpKNV2QQdYUdoOoaTsyw1zlhVopdt1oJaRhhprZvKvVQ5mNEea4LbiPCxNlx4p/1nmJpwJumM6r2RBM+ZmdpsvLXWqXSsqmzoo726IF/iiJ7AP/xk5KBt2lLaYVSyQvBjtyfj7eqeK+7O5110l3ewrGJHtneKZYU6dlFqPg3jXRLBwnzrTj6Go6BzjMvdWM+SXSj4IyHPXAwHIwue7tS5ijDKq6fSf4Eo95xCvAnfvqrY0JZ8nxAZlzHfuyjlWBRTWszGQDQ5pCKUxDefc3aVPOFmd4g0Yy0X0d5Xr5nqUbbOGopalyWx+ijBPtNV/KI6W6X08ckImYiMykGDgcwgNsqLMnAFRYnZvL+SClzC7feBOHjJKxHL+89wxIJ9XJv1j/XIGA/izZ6qRUImMhKWmsK1KK7l+qgWrjKw70rBIa76Kl+SfnOoMGGASwhlygmjIHLY3LEOH5UVNLj0uOcTS+cm2oLW7NCJtgGkfVI3HXihPfmDWOxB58ilExGnwSeUe7df3O+5StLgewAXMYLTwAZp8LKJ2vjWxyhc00nMnHAa5xn72VnJb9NXkoa+xCmsMVt4n2jkXxaQ2Ot6fOr7IVMETYJ5u2UD6HP+LVcQC8wewtHR7SabQsQbFfm1og9l/pAfjVC4BkV6eEnqe4SvobWFtNp76iWUsbPgDs57ekalx2wjT3+T2roaJdMJgUrg1enFlsy0LTP/imJBQVxkSVY5ZbLxna2I1KZG/VSY05w1nS+m+tIElwKa28hag0n8bGnahjSooA3xwxTzXKVbKgcvyqUyf+PnPkc6oq7QLTexP2ZId27/LZ6WVPU2tGCbxhagd/Ns4Tg7KJn92ZuomptgYMrM8+LWq5pdxG2pGhjQeMG83K+o7OALOXHTG/vyCrve8Az7tG9/u68NvZZaW8RGdGOnvvV2sq4MguqHFwx09Fc9XS+GovNdC8lpIlQ9IXZqrcToLYPQH+OcpBKvvKI6OS0+4n0Pbevr0bNkMGNQXK23heUDoTKfmHZGrfyZQP9MPXVuY8z1hp0+VgzaGhY48GT2Ae9LI/tlrkmXAHAPvnuxyzl5Ky4cQeP5RKda2SqnzlFfP14CaCiGOCEP8NjUwW9VRJRrWpj2qNwJl1KkochfhCcGpNvhT/8E3lDRRsxamxaOxNVi6b2mthGKzXFs2DDvwQQMPRX+9xOJVC+k2C9xUoxNhTQEbu35ddvEHEio+cmscvAjvSpoLdW9GD0+9Rt5znIhK/Fqi6hCQ00r4gE0haPXZzJ8CVUaRc+F3spVHtjNc9kgAbs4nhz3T5zA8rgxpaoVZ5Ea5m02wQkal4NRaycEpUd3QJwnpd6TLs5r7kTtWqMkgxqeKBGOewuNOwANAfN1B//3hqS5URhp3rMKTIuxaALt0k7AOlrYewt8u7lXMlhA5vwEsBYj+xvpBKgzdLhYfK3aW0wDXvMth+Ylg0iHkmxBkerMmf1/n/84z+R6az72dBRDYgeZVXrNYEWQVr42VeCaynFeV99Fj52SR2++ZZY9LeJlqbzHCFbBhUj7XYkqN2hTvndqYn3LnjzNE2/uGwVcZSfEQGot0PLYkKlQ/BPo/NN7lsdO0c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 962518f2-2c16-47a6-b10a-08dbbe590874 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:00.8815 (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: nLCrMolfVagaK92rydsrhRHsN3wixc1qc4qUsVp3O6FmrTKO3MTKVKhrj5dCvTahDuuTxwaQO9fGLDqlgF4/STRe6/0dxM12vT/N5mhw+9XhsGpHKpq9TSBpbDLg3qj5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: L7IVSISYOE7KLDA723WEQG4TR4EBDR5W X-Message-ID-Hash: L7IVSISYOE7KLDA723WEQG4TR4EBDR5W X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/generic/audio-graph-card.c | 114 +++++++------- .../generic/audio-graph-card2-custom-sample.c | 32 ++-- sound/soc/generic/audio-graph-card2.c | 108 ++++++------- sound/soc/generic/simple-card-utils.c | 125 ++++++++------- sound/soc/generic/simple-card.c | 147 +++++++++--------- sound/soc/generic/test-component.c | 2 +- 6 files changed, 263 insertions(+), 265 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 844a2ef15948..e4a9420bba85 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -27,7 +27,7 @@ static int graph_outdrv_event(struct snd_soc_dapm_widget *w, int event) { struct snd_soc_dapm_context *dapm = w->dapm; - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(dapm->card); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(dapm->card); switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -50,9 +50,9 @@ static const struct snd_soc_dapm_widget graph_dapm_widgets[] = { }; static const struct snd_soc_ops graph_ops = { - .startup = asoc_simple_startup, - .shutdown = asoc_simple_shutdown, - .hw_params = asoc_simple_hw_params, + .startup = simple_util_startup, + .shutdown = simple_util_shutdown, + .hw_params = simple_util_hw_params, }; static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc) @@ -68,18 +68,18 @@ static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc) static void graph_parse_convert(struct device *dev, struct device_node *ep, - struct asoc_simple_data *adata) + struct simple_util_data *adata) { struct device_node *top = dev->of_node; struct device_node *port = of_get_parent(ep); struct device_node *ports = of_get_parent(port); struct device_node *node = of_graph_get_port_parent(ep); - asoc_simple_parse_convert(top, NULL, adata); + simple_util_parse_convert(top, NULL, adata); if (of_node_name_eq(ports, "ports")) - asoc_simple_parse_convert(ports, NULL, adata); - asoc_simple_parse_convert(port, NULL, adata); - asoc_simple_parse_convert(ep, NULL, adata); + simple_util_parse_convert(ports, NULL, adata); + simple_util_parse_convert(port, NULL, adata); + simple_util_parse_convert(ep, NULL, adata); of_node_put(port); of_node_put(ports); @@ -103,7 +103,7 @@ static void graph_parse_mclk_fs(struct device_node *top, of_node_put(ports); } -static int graph_parse_node(struct asoc_simple_priv *priv, +static int graph_parse_node(struct simple_util_priv *priv, struct device_node *ep, struct link_info *li, int *cpu) @@ -113,35 +113,35 @@ static int graph_parse_node(struct asoc_simple_priv *priv, struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct snd_soc_dai_link_component *dlc; - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; int ret; if (cpu) { - dlc = asoc_link_to_cpu(dai_link, 0); + dlc = snd_soc_link_to_cpu(dai_link, 0); dai = simple_props_to_dai_cpu(dai_props, 0); } else { - dlc = asoc_link_to_codec(dai_link, 0); + dlc = snd_soc_link_to_codec(dai_link, 0); dai = simple_props_to_dai_codec(dai_props, 0); } graph_parse_mclk_fs(top, ep, dai_props); - ret = asoc_graph_parse_dai(dev, ep, dlc, cpu); + ret = graph_util_parse_dai(dev, ep, dlc, cpu); if (ret < 0) return ret; - ret = asoc_simple_parse_tdm(ep, dai); + ret = simple_util_parse_tdm(ep, dai); if (ret < 0) return ret; - ret = asoc_simple_parse_clk(dev, ep, dai, dlc); + ret = simple_util_parse_clk(dev, ep, dai, dlc); if (ret < 0) return ret; return 0; } -static int graph_link_init(struct asoc_simple_priv *priv, +static int graph_link_init(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li, @@ -151,20 +151,20 @@ static int graph_link_init(struct asoc_simple_priv *priv, struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); int ret; - ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep, + ret = simple_util_parse_daifmt(dev, cpu_ep, codec_ep, NULL, &dai_link->dai_fmt); if (ret < 0) return ret; - dai_link->init = asoc_simple_dai_init; + dai_link->init = simple_util_dai_init; dai_link->ops = &graph_ops; if (priv->ops) dai_link->ops = priv->ops; - return asoc_simple_set_dailink_name(dev, dai_link, name); + return simple_util_set_dailink_name(dev, dai_link, name); } -static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, +static int graph_dai_link_of_dpcm(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li) @@ -181,8 +181,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, if (li->cpu) { struct snd_soc_card *card = simple_priv_to_card(priv); - struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); - struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); + struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0); + struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0); int is_single_links = 0; /* Codec is dummy */ @@ -209,14 +209,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, */ if (card->component_chaining && !soc_component_is_pcm(cpus)) { dai_link->no_pcm = 1; - dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; + dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup; } - asoc_simple_canonicalize_cpu(cpus, is_single_links); - asoc_simple_canonicalize_platform(platforms, cpus); + simple_util_canonicalize_cpu(cpus, is_single_links); + simple_util_canonicalize_platform(platforms, cpus); } else { struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, 0); - struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); + struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0); struct device_node *port; struct device_node *ports; @@ -224,7 +224,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, /* BE settings */ dai_link->no_pcm = 1; - dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; + dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup; ret = graph_parse_node(priv, codec_ep, li, NULL); if (ret < 0) @@ -258,16 +258,16 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, return ret; } -static int graph_dai_link_of(struct asoc_simple_priv *priv, +static int graph_dai_link_of(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li) { struct device *dev = simple_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); - struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); - struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); - struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); + struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0); + struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0); + struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0); char dai_name[64]; int ret, is_single_links = 0; @@ -284,8 +284,8 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, snprintf(dai_name, sizeof(dai_name), "%s-%s", cpus->dai_name, codecs->dai_name); - asoc_simple_canonicalize_cpu(cpus, is_single_links); - asoc_simple_canonicalize_platform(platforms, cpus); + simple_util_canonicalize_cpu(cpus, is_single_links); + simple_util_canonicalize_platform(platforms, cpus); ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name); if (ret < 0) @@ -296,9 +296,9 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, return 0; } -static inline bool parse_as_dpcm_link(struct asoc_simple_priv *priv, +static inline bool parse_as_dpcm_link(struct simple_util_priv *priv, struct device_node *codec_port, - struct asoc_simple_data *adata) + struct simple_util_data *adata) { if (priv->force_dpcm) return true; @@ -312,19 +312,19 @@ static inline bool parse_as_dpcm_link(struct asoc_simple_priv *priv, * or has convert-xxx property */ if ((of_get_child_count(codec_port) > 1) || - asoc_simple_is_convert_required(adata)) + simple_util_is_convert_required(adata)) return true; return false; } -static int __graph_for_each_link(struct asoc_simple_priv *priv, +static int __graph_for_each_link(struct simple_util_priv *priv, struct link_info *li, - int (*func_noml)(struct asoc_simple_priv *priv, + int (*func_noml)(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li), - int (*func_dpcm)(struct asoc_simple_priv *priv, + int (*func_dpcm)(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li)) @@ -337,7 +337,7 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, struct device_node *codec_ep; struct device_node *codec_port; struct device_node *codec_port_old = NULL; - struct asoc_simple_data adata; + struct simple_util_data adata; int rc, ret = 0; /* loop for all listed CPU port */ @@ -392,13 +392,13 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, return 0; } -static int graph_for_each_link(struct asoc_simple_priv *priv, +static int graph_for_each_link(struct simple_util_priv *priv, struct link_info *li, - int (*func_noml)(struct asoc_simple_priv *priv, + int (*func_noml)(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li), - int (*func_dpcm)(struct asoc_simple_priv *priv, + int (*func_dpcm)(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li)) @@ -425,7 +425,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, return ret; } -static int graph_count_noml(struct asoc_simple_priv *priv, +static int graph_count_noml(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li) @@ -454,7 +454,7 @@ static int graph_count_noml(struct asoc_simple_priv *priv, return 0; } -static int graph_count_dpcm(struct asoc_simple_priv *priv, +static int graph_count_dpcm(struct simple_util_priv *priv, struct device_node *cpu_ep, struct device_node *codec_ep, struct link_info *li) @@ -487,7 +487,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, return 0; } -static int graph_get_dais_count(struct asoc_simple_priv *priv, +static int graph_get_dais_count(struct simple_util_priv *priv, struct link_info *li) { /* @@ -541,7 +541,7 @@ static int graph_get_dais_count(struct asoc_simple_priv *priv, graph_count_dpcm); } -int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) +int audio_graph_parse_of(struct simple_util_priv *priv, struct device *dev) { struct snd_soc_card *card = simple_priv_to_card(priv); struct link_info *li; @@ -561,7 +561,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) if (!li->link) return -EINVAL; - ret = asoc_simple_init_priv(priv, li); + ret = simple_util_init_priv(priv, li); if (ret < 0) return ret; @@ -572,11 +572,11 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) return ret; } - ret = asoc_simple_parse_widgets(card, NULL); + ret = simple_util_parse_widgets(card, NULL); if (ret < 0) return ret; - ret = asoc_simple_parse_routing(card, NULL); + ret = simple_util_parse_routing(card, NULL); if (ret < 0) return ret; @@ -587,13 +587,13 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) if (ret < 0) goto err; - ret = asoc_simple_parse_card_name(card, NULL); + ret = simple_util_parse_card_name(card, NULL); if (ret < 0) goto err; snd_soc_card_set_drvdata(card, priv); - asoc_simple_debug_info(priv); + simple_util_debug_info(priv); ret = devm_snd_soc_register_card(dev, card); if (ret < 0) @@ -603,7 +603,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) return 0; err: - asoc_simple_clean_reference(card); + simple_util_clean_reference(card); return dev_err_probe(dev, ret, "parse error\n"); } @@ -611,7 +611,7 @@ EXPORT_SYMBOL_GPL(audio_graph_parse_of); static int graph_probe(struct platform_device *pdev) { - struct asoc_simple_priv *priv; + struct simple_util_priv *priv; struct device *dev = &pdev->dev; struct snd_soc_card *card; @@ -623,7 +623,7 @@ static int graph_probe(struct platform_device *pdev) card = simple_priv_to_card(priv); card->dapm_widgets = graph_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(graph_dapm_widgets); - card->probe = asoc_graph_card_probe; + card->probe = graph_util_card_probe; if (of_device_get_match_data(dev)) priv->dpcm_selectable = 1; @@ -646,7 +646,7 @@ static struct platform_driver graph_card = { .of_match_table = graph_of_match, }, .probe = graph_probe, - .remove = asoc_simple_remove, + .remove = simple_util_remove, }; module_platform_driver(graph_card); diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.c b/sound/soc/generic/audio-graph-card2-custom-sample.c index a3142be9323e..4dc65e249ecb 100644 --- a/sound/soc/generic/audio-graph-card2-custom-sample.c +++ b/sound/soc/generic/audio-graph-card2-custom-sample.c @@ -12,10 +12,10 @@ /* * Custom driver can have own priv - * which includes asoc_simple_priv. + * which includes simple_util_priv. */ struct custom_priv { - struct asoc_simple_priv simple_priv; + struct simple_util_priv simple_priv; /* custom driver's own params */ int custom_params; @@ -26,7 +26,7 @@ struct custom_priv { static int custom_card_probe(struct snd_soc_card *card) { - struct asoc_simple_priv *simple_priv = snd_soc_card_get_drvdata(card); + struct simple_util_priv *simple_priv = snd_soc_card_get_drvdata(card); struct custom_priv *custom_priv = simple_to_custom(simple_priv); struct device *dev = simple_priv_to_dev(simple_priv); @@ -35,10 +35,10 @@ static int custom_card_probe(struct snd_soc_card *card) custom_priv->custom_params = 1; /* you can use generic probe function */ - return asoc_graph_card_probe(card); + return graph_util_card_probe(card); } -static int custom_hook_pre(struct asoc_simple_priv *priv) +static int custom_hook_pre(struct simple_util_priv *priv) { struct device *dev = simple_priv_to_dev(priv); @@ -48,7 +48,7 @@ static int custom_hook_pre(struct asoc_simple_priv *priv) return 0; } -static int custom_hook_post(struct asoc_simple_priv *priv) +static int custom_hook_post(struct simple_util_priv *priv) { struct device *dev = simple_priv_to_dev(priv); struct snd_soc_card *card; @@ -63,7 +63,7 @@ static int custom_hook_post(struct asoc_simple_priv *priv) return 0; } -static int custom_normal(struct asoc_simple_priv *priv, +static int custom_normal(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -78,7 +78,7 @@ static int custom_normal(struct asoc_simple_priv *priv, return audio_graph2_link_normal(priv, lnk, li); } -static int custom_dpcm(struct asoc_simple_priv *priv, +static int custom_dpcm(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -93,7 +93,7 @@ static int custom_dpcm(struct asoc_simple_priv *priv, return audio_graph2_link_dpcm(priv, lnk, li); } -static int custom_c2c(struct asoc_simple_priv *priv, +static int custom_c2c(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -121,26 +121,26 @@ static struct graph2_custom_hooks custom_hooks = { static int custom_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct device *dev = simple_priv_to_dev(priv); dev_info(dev, "custom startup\n"); - return asoc_simple_startup(substream); + return simple_util_startup(substream); } /* You can use custom ops */ static const struct snd_soc_ops custom_ops = { .startup = custom_startup, - .shutdown = asoc_simple_shutdown, - .hw_params = asoc_simple_hw_params, + .shutdown = simple_util_shutdown, + .hw_params = simple_util_hw_params, }; static int custom_probe(struct platform_device *pdev) { struct custom_priv *custom_priv; - struct asoc_simple_priv *simple_priv; + struct simple_util_priv *simple_priv; struct device *dev = &pdev->dev; int ret; @@ -176,7 +176,7 @@ static struct platform_driver custom_card = { .of_match_table = custom_of_match, }, .probe = custom_probe, - .remove = asoc_simple_remove, + .remove = simple_util_remove, }; module_platform_driver(custom_card); diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index b1c675c6b6db..5d856942bcae 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -282,7 +282,7 @@ static enum graph_type __graph_get_type(struct device_node *lnk) } -static enum graph_type graph_get_type(struct asoc_simple_priv *priv, +static enum graph_type graph_get_type(struct simple_util_priv *priv, struct device_node *lnk) { enum graph_type type = __graph_get_type(lnk); @@ -298,7 +298,7 @@ static enum graph_type graph_get_type(struct asoc_simple_priv *priv, switch (type) { case GRAPH_DPCM: - if (asoc_graph_is_ports0(lnk)) + if (graph_util_is_ports0(lnk)) str = "DPCM Front-End"; else str = "DPCM Back-End"; @@ -360,9 +360,9 @@ static struct device_node *graph_get_next_multi_ep(struct device_node **port) } static const struct snd_soc_ops graph_ops = { - .startup = asoc_simple_startup, - .shutdown = asoc_simple_shutdown, - .hw_params = asoc_simple_hw_params, + .startup = simple_util_startup, + .shutdown = simple_util_shutdown, + .hw_params = simple_util_hw_params, }; static void graph_parse_convert(struct device_node *ep, @@ -370,12 +370,12 @@ static void graph_parse_convert(struct device_node *ep, { struct device_node *port = of_get_parent(ep); struct device_node *ports = of_get_parent(port); - struct asoc_simple_data *adata = &props->adata; + struct simple_util_data *adata = &props->adata; if (of_node_name_eq(ports, "ports")) - asoc_simple_parse_convert(ports, NULL, adata); - asoc_simple_parse_convert(port, NULL, adata); - asoc_simple_parse_convert(ep, NULL, adata); + simple_util_parse_convert(ports, NULL, adata); + simple_util_parse_convert(port, NULL, adata); + simple_util_parse_convert(ep, NULL, adata); of_node_put(port); of_node_put(ports); @@ -396,7 +396,7 @@ static void graph_parse_mclk_fs(struct device_node *ep, of_node_put(ports); } -static int __graph_parse_node(struct asoc_simple_priv *priv, +static int __graph_parse_node(struct simple_util_priv *priv, enum graph_type gtype, struct device_node *ep, struct link_info *li, @@ -406,32 +406,32 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct snd_soc_dai_link_component *dlc; - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; int ret, is_single_links = 0; if (is_cpu) { - dlc = asoc_link_to_cpu(dai_link, idx); + dlc = snd_soc_link_to_cpu(dai_link, idx); dai = simple_props_to_dai_cpu(dai_props, idx); } else { - dlc = asoc_link_to_codec(dai_link, idx); + dlc = snd_soc_link_to_codec(dai_link, idx); dai = simple_props_to_dai_codec(dai_props, idx); } graph_parse_mclk_fs(ep, dai_props); - ret = asoc_graph_parse_dai(dev, ep, dlc, &is_single_links); + ret = graph_util_parse_dai(dev, ep, dlc, &is_single_links); if (ret < 0) return ret; - ret = asoc_simple_parse_tdm(ep, dai); + ret = simple_util_parse_tdm(ep, dai); if (ret < 0) return ret; - ret = asoc_simple_parse_tdm_width_map(dev, ep, dai); + ret = simple_util_parse_tdm_width_map(dev, ep, dai); if (ret < 0) return ret; - ret = asoc_simple_parse_clk(dev, ep, dai, dlc); + ret = simple_util_parse_clk(dev, ep, dai, dlc); if (ret < 0) return ret; @@ -440,7 +440,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, */ if (!dai_link->name) { struct snd_soc_dai_link_component *cpus = dlc; - struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, idx); + struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, idx); char *cpu_multi = ""; char *codec_multi = ""; @@ -453,22 +453,22 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, case GRAPH_NORMAL: /* run is_cpu only. see audio_graph2_link_normal() */ if (is_cpu) - asoc_simple_set_dailink_name(dev, dai_link, "%s%s-%s%s", + simple_util_set_dailink_name(dev, dai_link, "%s%s-%s%s", cpus->dai_name, cpu_multi, codecs->dai_name, codec_multi); break; case GRAPH_DPCM: if (is_cpu) - asoc_simple_set_dailink_name(dev, dai_link, "fe.%pOFP.%s%s", + simple_util_set_dailink_name(dev, dai_link, "fe.%pOFP.%s%s", cpus->of_node, cpus->dai_name, cpu_multi); else - asoc_simple_set_dailink_name(dev, dai_link, "be.%pOFP.%s%s", + simple_util_set_dailink_name(dev, dai_link, "be.%pOFP.%s%s", codecs->of_node, codecs->dai_name, codec_multi); break; case GRAPH_C2C: /* run is_cpu only. see audio_graph2_link_c2c() */ if (is_cpu) - asoc_simple_set_dailink_name(dev, dai_link, "c2c.%s%s-%s%s", + simple_util_set_dailink_name(dev, dai_link, "c2c.%s%s-%s%s", cpus->dai_name, cpu_multi, codecs->dai_name, codec_multi); break; @@ -482,7 +482,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, * if DPCM-BE case */ if (!is_cpu && gtype == GRAPH_DPCM) { - struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, idx); + struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, idx); struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, idx); struct device_node *rport = of_get_parent(ep); struct device_node *rports = of_get_parent(rport); @@ -497,16 +497,16 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, if (is_cpu) { struct snd_soc_dai_link_component *cpus = dlc; - struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, idx); + struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, idx); - asoc_simple_canonicalize_cpu(cpus, is_single_links); - asoc_simple_canonicalize_platform(platforms, cpus); + simple_util_canonicalize_cpu(cpus, is_single_links); + simple_util_canonicalize_platform(platforms, cpus); } return 0; } -static int graph_parse_node(struct asoc_simple_priv *priv, +static int graph_parse_node(struct simple_util_priv *priv, enum graph_type gtype, struct device_node *port, struct link_info *li, int is_cpu) @@ -590,7 +590,7 @@ static void graph_parse_daifmt(struct device_node *node, update_daifmt(INV); } -static void graph_link_init(struct asoc_simple_priv *priv, +static void graph_link_init(struct simple_util_priv *priv, struct device_node *port, struct link_info *li, int is_cpu_node) @@ -638,13 +638,13 @@ static void graph_link_init(struct asoc_simple_priv *priv, daiclk = snd_soc_daifmt_clock_provider_flipped(daiclk); dai_link->dai_fmt = daifmt | daiclk; - dai_link->init = asoc_simple_dai_init; + dai_link->init = simple_util_dai_init; dai_link->ops = &graph_ops; if (priv->ops) dai_link->ops = priv->ops; } -int audio_graph2_link_normal(struct asoc_simple_priv *priv, +int audio_graph2_link_normal(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -678,7 +678,7 @@ int audio_graph2_link_normal(struct asoc_simple_priv *priv, } EXPORT_SYMBOL_GPL(audio_graph2_link_normal); -int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, +int audio_graph2_link_dpcm(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -687,7 +687,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, struct device_node *rport = of_graph_get_remote_port(ep); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); - int is_cpu = asoc_graph_is_ports0(lnk); + int is_cpu = graph_util_is_ports0(lnk); int ret; if (is_cpu) { @@ -713,7 +713,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, /* * setup CPU here, Codec is already set as dummy. * see - * asoc_simple_init_priv() + * simple_util_init_priv() */ dai_link->dynamic = 1; dai_link->dpcm_merged_format = 1; @@ -744,12 +744,12 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, /* * setup Codec here, CPU is already set as dummy. * see - * asoc_simple_init_priv() + * simple_util_init_priv() */ /* BE settings */ dai_link->no_pcm = 1; - dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; + dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup; ret = graph_parse_node(priv, GRAPH_DPCM, rport, li, 0); if (ret < 0) @@ -771,7 +771,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, } EXPORT_SYMBOL_GPL(audio_graph2_link_dpcm); -int audio_graph2_link_c2c(struct asoc_simple_priv *priv, +int audio_graph2_link_c2c(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -807,7 +807,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, * Card2 can use original Codec2Codec settings if DT has. * It will use default settings if no settings on DT. * see - * asoc_simple_init_for_codec2codec() + * simple_util_init_for_codec2codec() * * Add more settings here if needed */ @@ -868,7 +868,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, } EXPORT_SYMBOL_GPL(audio_graph2_link_c2c); -static int graph_link(struct asoc_simple_priv *priv, +static int graph_link(struct simple_util_priv *priv, struct graph2_custom_hooks *hooks, enum graph_type gtype, struct device_node *lnk, @@ -940,7 +940,7 @@ static int graph_counter(struct device_node *lnk) return 1; } -static int graph_count_normal(struct asoc_simple_priv *priv, +static int graph_count_normal(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -969,7 +969,7 @@ static int graph_count_normal(struct asoc_simple_priv *priv, return 0; } -static int graph_count_dpcm(struct asoc_simple_priv *priv, +static int graph_count_dpcm(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -991,7 +991,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, * }; */ - if (asoc_graph_is_ports0(lnk)) { + if (graph_util_is_ports0(lnk)) { /* * DON'T REMOVE platforms * see @@ -1009,7 +1009,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, return 0; } -static int graph_count_c2c(struct asoc_simple_priv *priv, +static int graph_count_c2c(struct simple_util_priv *priv, struct device_node *lnk, struct link_info *li) { @@ -1051,7 +1051,7 @@ static int graph_count_c2c(struct asoc_simple_priv *priv, return 0; } -static int graph_count(struct asoc_simple_priv *priv, +static int graph_count(struct simple_util_priv *priv, struct graph2_custom_hooks *hooks, enum graph_type gtype, struct device_node *lnk, @@ -1094,10 +1094,10 @@ static int graph_count(struct asoc_simple_priv *priv, return ret; } -static int graph_for_each_link(struct asoc_simple_priv *priv, +static int graph_for_each_link(struct simple_util_priv *priv, struct graph2_custom_hooks *hooks, struct link_info *li, - int (*func)(struct asoc_simple_priv *priv, + int (*func)(struct simple_util_priv *priv, struct graph2_custom_hooks *hooks, enum graph_type gtype, struct device_node *lnk, @@ -1124,7 +1124,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, return 0; } -int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, +int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev, struct graph2_custom_hooks *hooks) { struct snd_soc_card *card = simple_priv_to_card(priv); @@ -1135,7 +1135,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, if (!li) return -ENOMEM; - card->probe = asoc_graph_card_probe; + card->probe = graph_util_card_probe; card->owner = THIS_MODULE; card->dev = dev; @@ -1151,7 +1151,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, if (ret < 0) goto err; - ret = asoc_simple_init_priv(priv, li); + ret = simple_util_init_priv(priv, li); if (ret < 0) goto err; @@ -1162,11 +1162,11 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, goto err; } - ret = asoc_simple_parse_widgets(card, NULL); + ret = simple_util_parse_widgets(card, NULL); if (ret < 0) goto err; - ret = asoc_simple_parse_routing(card, NULL); + ret = simple_util_parse_routing(card, NULL); if (ret < 0) goto err; @@ -1175,7 +1175,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, if (ret < 0) goto err; - ret = asoc_simple_parse_card_name(card, NULL); + ret = simple_util_parse_card_name(card, NULL); if (ret < 0) goto err; @@ -1187,7 +1187,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, goto err; } - asoc_simple_debug_info(priv); + simple_util_debug_info(priv); ret = devm_snd_soc_register_card(dev, card); err: @@ -1202,7 +1202,7 @@ EXPORT_SYMBOL_GPL(audio_graph2_parse_of); static int graph_probe(struct platform_device *pdev) { - struct asoc_simple_priv *priv; + struct simple_util_priv *priv; struct device *dev = &pdev->dev; /* Allocate the private data and the DAI link array */ @@ -1226,7 +1226,7 @@ static struct platform_driver graph_card = { .of_match_table = graph_of_match, }, .probe = graph_probe, - .remove = asoc_simple_remove, + .remove = simple_util_remove, }; module_platform_driver(graph_card); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index ecbd26dd7dfa..36ce3a4343f9 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -14,7 +14,7 @@ #include #include -static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data, +static void simple_fixup_sample_fmt(struct simple_util_data *data, struct snd_pcm_hw_params *params) { int i; @@ -43,7 +43,7 @@ static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data, void simple_util_parse_convert(struct device_node *np, char *prefix, - struct asoc_simple_data *data) + struct simple_util_data *data) { char prop[128]; @@ -65,13 +65,13 @@ void simple_util_parse_convert(struct device_node *np, EXPORT_SYMBOL_GPL(simple_util_parse_convert); /** - * asoc_simple_is_convert_required() - Query if HW param conversion was requested + * simple_util_is_convert_required() - Query if HW param conversion was requested * @data: Link data. * * Returns true if any HW param conversion was requested for this DAI link with * any "convert-xxx" properties. */ -bool simple_util_is_convert_required(const struct asoc_simple_data *data) +bool simple_util_is_convert_required(const struct simple_util_data *data) { return data->convert_rate || data->convert_channels || @@ -116,7 +116,7 @@ int simple_util_parse_daifmt(struct device *dev, EXPORT_SYMBOL_GPL(simple_util_parse_daifmt); int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np, - struct asoc_simple_dai *dai) + struct simple_util_dai *dai) { u32 *array_values, *p; int n, i, ret; @@ -209,7 +209,7 @@ int simple_util_parse_card_name(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(simple_util_parse_card_name); -static int asoc_simple_clk_enable(struct asoc_simple_dai *dai) +static int simple_clk_enable(struct simple_util_dai *dai) { if (dai) return clk_prepare_enable(dai->clk); @@ -217,7 +217,7 @@ static int asoc_simple_clk_enable(struct asoc_simple_dai *dai) return 0; } -static void asoc_simple_clk_disable(struct asoc_simple_dai *dai) +static void simple_clk_disable(struct simple_util_dai *dai) { if (dai) clk_disable_unprepare(dai->clk); @@ -225,7 +225,7 @@ static void asoc_simple_clk_disable(struct asoc_simple_dai *dai) int simple_util_parse_clk(struct device *dev, struct device_node *node, - struct asoc_simple_dai *simple_dai, + struct simple_util_dai *simple_dai, struct snd_soc_dai_link_component *dlc) { struct clk *clk; @@ -260,8 +260,8 @@ int simple_util_parse_clk(struct device *dev, } EXPORT_SYMBOL_GPL(simple_util_parse_clk); -static int asoc_simple_check_fixed_sysclk(struct device *dev, - struct asoc_simple_dai *dai, +static int simple_check_fixed_sysclk(struct device *dev, + struct simple_util_dai *dai, unsigned int *fixed_sysclk) { if (dai->clk_fixed) { @@ -278,28 +278,28 @@ static int asoc_simple_check_fixed_sysclk(struct device *dev, int simple_util_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; unsigned int fixed_sysclk = 0; int i1, i2, i; int ret; for_each_prop_dai_cpu(props, i1, dai) { - ret = asoc_simple_clk_enable(dai); + ret = simple_clk_enable(dai); if (ret) goto cpu_err; - ret = asoc_simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk); + ret = simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk); if (ret) goto cpu_err; } for_each_prop_dai_codec(props, i2, dai) { - ret = asoc_simple_clk_enable(dai); + ret = simple_clk_enable(dai); if (ret) goto codec_err; - ret = asoc_simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk); + ret = simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk); if (ret) goto codec_err; } @@ -324,13 +324,13 @@ int simple_util_startup(struct snd_pcm_substream *substream) for_each_prop_dai_codec(props, i, dai) { if (i >= i2) break; - asoc_simple_clk_disable(dai); + simple_clk_disable(dai); } cpu_err: for_each_prop_dai_cpu(props, i, dai) { if (i >= i1) break; - asoc_simple_clk_disable(dai); + simple_clk_disable(dai); } return ret; } @@ -338,35 +338,35 @@ EXPORT_SYMBOL_GPL(simple_util_startup); void simple_util_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; int i; for_each_prop_dai_cpu(props, i, dai) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, i); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, i); if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(cpu_dai)) snd_soc_dai_set_sysclk(cpu_dai, 0, 0, SND_SOC_CLOCK_OUT); - asoc_simple_clk_disable(dai); + simple_clk_disable(dai); } for_each_prop_dai_codec(props, i, dai) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, i); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, i); if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(codec_dai)) snd_soc_dai_set_sysclk(codec_dai, 0, 0, SND_SOC_CLOCK_IN); - asoc_simple_clk_disable(dai); + simple_clk_disable(dai); } } EXPORT_SYMBOL_GPL(simple_util_shutdown); -static int asoc_simple_set_clk_rate(struct device *dev, - struct asoc_simple_dai *simple_dai, +static int simple_set_clk_rate(struct device *dev, + struct simple_util_dai *simple_dai, unsigned long rate) { if (!simple_dai) @@ -386,8 +386,8 @@ static int asoc_simple_set_clk_rate(struct device *dev, return clk_set_rate(simple_dai->clk, rate); } -static int asoc_simple_set_tdm(struct snd_soc_dai *dai, - struct asoc_simple_dai *simple_dai, +static int simple_set_tdm(struct snd_soc_dai *dai, + struct simple_util_dai *simple_dai, struct snd_pcm_hw_params *params) { int sample_bits = params_width(params); @@ -427,10 +427,10 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai, int simple_util_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct asoc_simple_dai *pdai; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct simple_util_dai *pdai; struct snd_soc_dai *sdai; - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); unsigned int mclk, mclk_fs = 0; int i, ret; @@ -443,13 +443,13 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, mclk = params_rate(params) * mclk_fs; for_each_prop_dai_codec(props, i, pdai) { - ret = asoc_simple_set_clk_rate(rtd->dev, pdai, mclk); + ret = simple_set_clk_rate(rtd->dev, pdai, mclk); if (ret < 0) return ret; } for_each_prop_dai_cpu(props, i, pdai) { - ret = asoc_simple_set_clk_rate(rtd->dev, pdai, mclk); + ret = simple_set_clk_rate(rtd->dev, pdai, mclk); if (ret < 0) return ret; } @@ -479,15 +479,15 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, } for_each_prop_dai_codec(props, i, pdai) { - sdai = asoc_rtd_to_codec(rtd, i); - ret = asoc_simple_set_tdm(sdai, pdai, params); + sdai = snd_soc_rtd_to_codec(rtd, i); + ret = simple_set_tdm(sdai, pdai, params); if (ret < 0) return ret; } for_each_prop_dai_cpu(props, i, pdai) { - sdai = asoc_rtd_to_cpu(rtd, i); - ret = asoc_simple_set_tdm(sdai, pdai, params); + sdai = snd_soc_rtd_to_cpu(rtd, i); + ret = simple_set_tdm(sdai, pdai, params); if (ret < 0) return ret; } @@ -499,9 +499,9 @@ EXPORT_SYMBOL_GPL(simple_util_hw_params); int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); - struct asoc_simple_data *data = &dai_props->adata; + struct simple_util_data *data = &dai_props->adata; struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); @@ -514,14 +514,13 @@ int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, channels->max = data->convert_channels; if (data->convert_sample_format) - asoc_simple_fixup_sample_fmt(data, params); + simple_fixup_sample_fmt(data, params); return 0; } EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup); -static int asoc_simple_init_dai(struct snd_soc_dai *dai, - struct asoc_simple_dai *simple_dai) +static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simple_dai) { int ret; @@ -552,13 +551,13 @@ static int asoc_simple_init_dai(struct snd_soc_dai *dai, return 0; } -static inline int asoc_simple_component_is_codec(struct snd_soc_component *component) +static inline int simple_component_is_codec(struct snd_soc_component *component) { return component->driver->endianness; } -static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, - struct simple_dai_props *dai_props) +static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, + struct simple_dai_props *dai_props) { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_component *component; @@ -576,7 +575,7 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, /* Only Codecs */ for_each_rtd_components(rtd, i, component) { - if (!asoc_simple_component_is_codec(component)) + if (!simple_component_is_codec(component)) return 0; } @@ -611,23 +610,23 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; int i, ret; for_each_prop_dai_codec(props, i, dai) { - ret = asoc_simple_init_dai(asoc_rtd_to_codec(rtd, i), dai); + ret = simple_init_dai(snd_soc_rtd_to_codec(rtd, i), dai); if (ret < 0) return ret; } for_each_prop_dai_cpu(props, i, dai) { - ret = asoc_simple_init_dai(asoc_rtd_to_cpu(rtd, i), dai); + ret = simple_init_dai(snd_soc_rtd_to_cpu(rtd, i), dai); if (ret < 0) return ret; } - ret = asoc_simple_init_for_codec2codec(rtd, props); + ret = simple_init_for_codec2codec(rtd, props); if (ret < 0) return ret; @@ -738,7 +737,7 @@ int simple_util_parse_pin_switches(struct snd_soc_card *card, EXPORT_SYMBOL_GPL(simple_util_parse_pin_switches); int simple_util_init_jack(struct snd_soc_card *card, - struct asoc_simple_jack *sjack, + struct simple_util_jack *sjack, int is_hp, char *prefix, char *pin) { @@ -795,7 +794,7 @@ int simple_util_init_jack(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(simple_util_init_jack); -int simple_util_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) +int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix) { struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_component *component; @@ -844,14 +843,14 @@ int simple_util_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) } EXPORT_SYMBOL_GPL(simple_util_init_aux_jacks); -int simple_util_init_priv(struct asoc_simple_priv *priv, +int simple_util_init_priv(struct simple_util_priv *priv, struct link_info *li) { struct snd_soc_card *card = simple_priv_to_card(priv); struct device *dev = simple_priv_to_dev(priv); struct snd_soc_dai_link *dai_link; struct simple_dai_props *dai_props; - struct asoc_simple_dai *dais; + struct simple_util_dai *dais; struct snd_soc_dai_link_component *dlcs; struct snd_soc_codec_conf *cconf = NULL; int i, dai_num = 0, dlc_num = 0, cnf_num = 0; @@ -912,7 +911,7 @@ int simple_util_init_priv(struct asoc_simple_priv *priv, dais += li->num[i].cpus; } else { /* DPCM Be's CPU = dummy */ - dai_link[i].cpus = &asoc_dummy_dlc; + dai_link[i].cpus = &snd_soc_dummy_dlc; dai_props[i].num.cpus = dai_link[i].num_cpus = 1; } @@ -934,7 +933,7 @@ int simple_util_init_priv(struct asoc_simple_priv *priv, } } else { /* DPCM Fe's Codec = dummy */ - dai_link[i].codecs = &asoc_dummy_dlc; + dai_link[i].codecs = &snd_soc_dummy_dlc; dai_props[i].num.codecs = dai_link[i].num_codecs = 1; } @@ -962,7 +961,7 @@ int simple_util_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - asoc_simple_clean_reference(card); + simple_util_clean_reference(card); return 0; } @@ -970,14 +969,14 @@ EXPORT_SYMBOL_GPL(simple_util_remove); int graph_util_card_probe(struct snd_soc_card *card) { - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(card); int ret; - ret = asoc_simple_init_hp(card, &priv->hp_jack, NULL); + ret = simple_util_init_hp(card, &priv->hp_jack, NULL); if (ret < 0) return ret; - ret = asoc_simple_init_mic(card, &priv->mic_jack, NULL); + ret = simple_util_init_mic(card, &priv->mic_jack, NULL); if (ret < 0) return ret; diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 190f11366e84..a88812ab3ed1 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -23,13 +23,12 @@ #define PREFIX "simple-audio-card," static const struct snd_soc_ops simple_ops = { - .startup = asoc_simple_startup, - .shutdown = asoc_simple_shutdown, - .hw_params = asoc_simple_hw_params, + .startup = simple_util_startup, + .shutdown = simple_util_shutdown, + .hw_params = simple_util_hw_params, }; -static int asoc_simple_parse_platform(struct device_node *node, - struct snd_soc_dai_link_component *dlc) +static int simple_parse_platform(struct device_node *node, struct snd_soc_dai_link_component *dlc) { struct of_phandle_args args; int ret; @@ -52,10 +51,10 @@ static int asoc_simple_parse_platform(struct device_node *node, return 0; } -static int asoc_simple_parse_dai(struct device *dev, - struct device_node *node, - struct snd_soc_dai_link_component *dlc, - int *is_single_link) +static int simple_parse_dai(struct device *dev, + struct device_node *node, + struct snd_soc_dai_link_component *dlc, + int *is_single_link) { struct of_phandle_args args; struct snd_soc_dai *dai; @@ -117,15 +116,15 @@ static int asoc_simple_parse_dai(struct device *dev, static void simple_parse_convert(struct device *dev, struct device_node *np, - struct asoc_simple_data *adata) + struct simple_util_data *adata) { struct device_node *top = dev->of_node; struct device_node *node = of_get_parent(np); - asoc_simple_parse_convert(top, PREFIX, adata); - asoc_simple_parse_convert(node, PREFIX, adata); - asoc_simple_parse_convert(node, NULL, adata); - asoc_simple_parse_convert(np, NULL, adata); + simple_util_parse_convert(top, PREFIX, adata); + simple_util_parse_convert(node, PREFIX, adata); + simple_util_parse_convert(node, NULL, adata); + simple_util_parse_convert(np, NULL, adata); of_node_put(node); } @@ -148,7 +147,7 @@ static void simple_parse_mclk_fs(struct device_node *top, of_node_put(node); } -static int simple_parse_node(struct asoc_simple_priv *priv, +static int simple_parse_node(struct simple_util_priv *priv, struct device_node *np, struct link_info *li, char *prefix, @@ -159,35 +158,35 @@ static int simple_parse_node(struct asoc_simple_priv *priv, struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct snd_soc_dai_link_component *dlc; - struct asoc_simple_dai *dai; + struct simple_util_dai *dai; int ret; if (cpu) { - dlc = asoc_link_to_cpu(dai_link, 0); + dlc = snd_soc_link_to_cpu(dai_link, 0); dai = simple_props_to_dai_cpu(dai_props, 0); } else { - dlc = asoc_link_to_codec(dai_link, 0); + dlc = snd_soc_link_to_codec(dai_link, 0); dai = simple_props_to_dai_codec(dai_props, 0); } simple_parse_mclk_fs(top, np, dai_props, prefix); - ret = asoc_simple_parse_dai(dev, np, dlc, cpu); + ret = simple_parse_dai(dev, np, dlc, cpu); if (ret) return ret; - ret = asoc_simple_parse_clk(dev, np, dai, dlc); + ret = simple_util_parse_clk(dev, np, dai, dlc); if (ret) return ret; - ret = asoc_simple_parse_tdm(np, dai); + ret = simple_util_parse_tdm(np, dai); if (ret) return ret; return 0; } -static int simple_link_init(struct asoc_simple_priv *priv, +static int simple_link_init(struct simple_util_priv *priv, struct device_node *node, struct device_node *codec, struct link_info *li, @@ -197,18 +196,18 @@ static int simple_link_init(struct asoc_simple_priv *priv, struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); int ret; - ret = asoc_simple_parse_daifmt(dev, node, codec, + ret = simple_util_parse_daifmt(dev, node, codec, prefix, &dai_link->dai_fmt); if (ret < 0) return 0; - dai_link->init = asoc_simple_dai_init; + dai_link->init = simple_util_dai_init; dai_link->ops = &simple_ops; - return asoc_simple_set_dailink_name(dev, dai_link, name); + return simple_util_set_dailink_name(dev, dai_link, name); } -static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, +static int simple_dai_link_of_dpcm(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, @@ -230,8 +229,8 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, prefix = PREFIX; if (li->cpu) { - struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); - struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); + struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0); + struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0); int is_single_links = 0; /* Codec is dummy */ @@ -246,17 +245,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, snprintf(dai_name, sizeof(dai_name), "fe.%s", cpus->dai_name); - asoc_simple_canonicalize_cpu(cpus, is_single_links); - asoc_simple_canonicalize_platform(platforms, cpus); + simple_util_canonicalize_cpu(cpus, is_single_links); + simple_util_canonicalize_platform(platforms, cpus); } else { - struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); + struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0); struct snd_soc_codec_conf *cconf; /* CPU is dummy */ /* BE settings */ dai_link->no_pcm = 1; - dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; + dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup; cconf = simple_props_to_codec_conf(dai_props, 0); @@ -288,7 +287,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, return ret; } -static int simple_dai_link_of(struct asoc_simple_priv *priv, +static int simple_dai_link_of(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, @@ -296,9 +295,9 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, { struct device *dev = simple_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); - struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); - struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); - struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); + struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0); + struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0); + struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0); struct device_node *cpu = NULL; struct device_node *node = NULL; struct device_node *plat = NULL; @@ -327,15 +326,15 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, if (ret < 0) goto dai_link_of_err; - ret = asoc_simple_parse_platform(plat, platforms); + ret = simple_parse_platform(plat, platforms); if (ret < 0) goto dai_link_of_err; snprintf(dai_name, sizeof(dai_name), "%s-%s", cpus->dai_name, codecs->dai_name); - asoc_simple_canonicalize_cpu(cpus, single_cpu); - asoc_simple_canonicalize_platform(platforms, cpus); + simple_util_canonicalize_cpu(cpus, single_cpu); + simple_util_canonicalize_platform(platforms, cpus); ret = simple_link_init(priv, node, codec, li, prefix, dai_name); @@ -348,13 +347,13 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, return ret; } -static int __simple_for_each_link(struct asoc_simple_priv *priv, +static int __simple_for_each_link(struct simple_util_priv *priv, struct link_info *li, - int (*func_noml)(struct asoc_simple_priv *priv, + int (*func_noml)(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, bool is_top), - int (*func_dpcm)(struct asoc_simple_priv *priv, + int (*func_dpcm)(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, bool is_top)) @@ -378,7 +377,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, /* loop for all dai-link */ do { - struct asoc_simple_data adata; + struct simple_util_data adata; struct device_node *codec; struct device_node *plat; struct device_node *np; @@ -419,7 +418,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, * or has convert-xxx property */ if (dpcm_selectable && - (num > 2 || asoc_simple_is_convert_required(&adata))) { + (num > 2 || simple_util_is_convert_required(&adata))) { /* * np * |1(CPU)|0(Codec) li->cpu @@ -459,13 +458,13 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, return ret; } -static int simple_for_each_link(struct asoc_simple_priv *priv, +static int simple_for_each_link(struct simple_util_priv *priv, struct link_info *li, - int (*func_noml)(struct asoc_simple_priv *priv, + int (*func_noml)(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, bool is_top), - int (*func_dpcm)(struct asoc_simple_priv *priv, + int (*func_dpcm)(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, bool is_top)) @@ -494,12 +493,12 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, static void simple_depopulate_aux(void *data) { - struct asoc_simple_priv *priv = data; + struct simple_util_priv *priv = data; of_platform_depopulate(simple_priv_to_dev(priv)); } -static int simple_populate_aux(struct asoc_simple_priv *priv) +static int simple_populate_aux(struct simple_util_priv *priv) { struct device *dev = simple_priv_to_dev(priv); struct device_node *node; @@ -517,20 +516,20 @@ static int simple_populate_aux(struct asoc_simple_priv *priv) return devm_add_action_or_reset(dev, simple_depopulate_aux, priv); } -static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li) +static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li) { struct snd_soc_card *card = simple_priv_to_card(priv); int ret; - ret = asoc_simple_parse_widgets(card, PREFIX); + ret = simple_util_parse_widgets(card, PREFIX); if (ret < 0) return ret; - ret = asoc_simple_parse_routing(card, PREFIX); + ret = simple_util_parse_routing(card, PREFIX); if (ret < 0) return ret; - ret = asoc_simple_parse_pin_switches(card, PREFIX); + ret = simple_util_parse_pin_switches(card, PREFIX); if (ret < 0) return ret; @@ -542,7 +541,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li) if (ret < 0) return ret; - ret = asoc_simple_parse_card_name(card, PREFIX); + ret = simple_util_parse_card_name(card, PREFIX); if (ret < 0) return ret; @@ -555,7 +554,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li) return ret; } -static int simple_count_noml(struct asoc_simple_priv *priv, +static int simple_count_noml(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, bool is_top) @@ -579,7 +578,7 @@ static int simple_count_noml(struct asoc_simple_priv *priv, * ignored by snd_soc_rtd_add_component(). * * see - * simple-card-utils.c :: asoc_simple_canonicalize_platform() + * simple-card-utils.c :: simple_util_canonicalize_platform() */ li->num[li->link].cpus = 1; li->num[li->link].platforms = 1; @@ -591,7 +590,7 @@ static int simple_count_noml(struct asoc_simple_priv *priv, return 0; } -static int simple_count_dpcm(struct asoc_simple_priv *priv, +static int simple_count_dpcm(struct simple_util_priv *priv, struct device_node *np, struct device_node *codec, struct link_info *li, bool is_top) @@ -622,7 +621,7 @@ static int simple_count_dpcm(struct asoc_simple_priv *priv, return 0; } -static int simple_get_dais_count(struct asoc_simple_priv *priv, +static int simple_get_dais_count(struct simple_util_priv *priv, struct link_info *li) { struct device *dev = simple_priv_to_dev(priv); @@ -690,27 +689,27 @@ static int simple_get_dais_count(struct asoc_simple_priv *priv, static int simple_soc_probe(struct snd_soc_card *card) { - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); + struct simple_util_priv *priv = snd_soc_card_get_drvdata(card); int ret; - ret = asoc_simple_init_hp(card, &priv->hp_jack, PREFIX); + ret = simple_util_init_hp(card, &priv->hp_jack, PREFIX); if (ret < 0) return ret; - ret = asoc_simple_init_mic(card, &priv->mic_jack, PREFIX); + ret = simple_util_init_mic(card, &priv->mic_jack, PREFIX); if (ret < 0) return ret; - ret = asoc_simple_init_aux_jacks(priv, PREFIX); + ret = simple_util_init_aux_jacks(priv, PREFIX); if (ret < 0) return ret; return 0; } -static int asoc_simple_probe(struct platform_device *pdev) +static int simple_probe(struct platform_device *pdev) { - struct asoc_simple_priv *priv; + struct simple_util_priv *priv; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; struct snd_soc_card *card; @@ -739,7 +738,7 @@ static int asoc_simple_probe(struct platform_device *pdev) if (!li->link) return -EINVAL; - ret = asoc_simple_init_priv(priv, li); + ret = simple_util_init_priv(priv, li); if (ret < 0) return ret; @@ -752,7 +751,7 @@ static int asoc_simple_probe(struct platform_device *pdev) } } else { - struct asoc_simple_card_info *cinfo; + struct simple_util_info *cinfo; struct snd_soc_dai_link_component *cpus; struct snd_soc_dai_link_component *codecs; struct snd_soc_dai_link_component *platform; @@ -770,7 +769,7 @@ static int asoc_simple_probe(struct platform_device *pdev) !cinfo->codec || !cinfo->platform || !cinfo->cpu_dai.name) { - dev_err(dev, "insufficient asoc_simple_card_info settings\n"); + dev_err(dev, "insufficient simple_util_info settings\n"); return -EINVAL; } @@ -788,7 +787,7 @@ static int asoc_simple_probe(struct platform_device *pdev) dai_link->name = cinfo->name; dai_link->stream_name = cinfo->name; dai_link->dai_fmt = cinfo->daifmt; - dai_link->init = asoc_simple_dai_init; + dai_link->init = simple_util_dai_init; memcpy(dai_props->cpu_dai, &cinfo->cpu_dai, sizeof(*dai_props->cpu_dai)); memcpy(dai_props->codec_dai, &cinfo->codec_dai, @@ -797,7 +796,7 @@ static int asoc_simple_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); - asoc_simple_debug_info(priv); + simple_util_debug_info(priv); ret = devm_snd_soc_register_card(dev, card); if (ret < 0) @@ -806,7 +805,7 @@ static int asoc_simple_probe(struct platform_device *pdev) devm_kfree(dev, li); return 0; err: - asoc_simple_clean_reference(card); + simple_util_clean_reference(card); return ret; } @@ -819,17 +818,17 @@ static const struct of_device_id simple_of_match[] = { }; MODULE_DEVICE_TABLE(of, simple_of_match); -static struct platform_driver asoc_simple_card = { +static struct platform_driver simple_card = { .driver = { .name = "asoc-simple-card", .pm = &snd_soc_pm_ops, .of_match_table = simple_of_match, }, - .probe = asoc_simple_probe, - .remove = asoc_simple_remove, + .probe = simple_probe, + .remove = simple_util_remove, }; -module_platform_driver(asoc_simple_card); +module_platform_driver(simple_card); MODULE_ALIAS("platform:asoc-simple-card"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c index e10e5bf28432..8c3eb4424efc 100644 --- a/sound/soc/generic/test-component.c +++ b/sound/soc/generic/test-component.c @@ -352,7 +352,7 @@ static const struct snd_pcm_hardware test_component_hardware = { static int test_component_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); mile_stone(component); From patchwork Tue Sep 26 06:23:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728186 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 32B85EE020C for ; Tue, 26 Sep 2023 06:28: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 2344CEE6; Tue, 26 Sep 2023 08:27:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2344CEE6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709678; bh=9ZJD7Xw0srOzAW+ZIctLbNc1Gnlt8pRV5yetj3MpNOI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=OLVJBZxm/DuPRkkQL07dWfLGyUTFrVVdQ1IQPyzDEo3cL3ox1ycmGghzVzLzmX8YG P5zA43TlATX+cTdqvr/jTxvwLr5jora9HAhHYQ5prmkpHehCxbmLMVFQHe45OHgAeT ivcMJiUZsGm23+t5lq+jM1lKUAKXBn5oCdNXlJhE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 739D8F8060B; Tue, 26 Sep 2023 08:23:46 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id C3A6DF8061B; Tue, 26 Sep 2023 08:23:45 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CAE31F8060B; Tue, 26 Sep 2023 08:23:41 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::719]) (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 AF3DCF805AE for ; Tue, 26 Sep 2023 08:23:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AF3DCF805AE 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=QovLgrQc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S7E3i4ie5wAsuhHcEM6kc3DOLjof5u7NdifreSWjIk3VrduyByr5Fv0uNWhRj49UjketQokIzSwdwIXksyAZd/D7iejLSq6wPJBNDjr918d1vrsj9hiZLmMzV1R8ub7Z4qMJ44o8lJdJZntiGQLdvqB7rjZo4rFPbdSagVA3ru7JmNBYT0I3VrnbPFZ4iHqKaQhTNqBhqohXIzew3ghBQsr1n8IHe6riCr0j+8dPlc1V03odp1kgXnUMkZH2mu2fKxLsN3uwXP7hXU1aUE8jZzytBXDkr4/404x3v0TBNlsPcnrHo//WpLzLzhk3pGhPfI8swMlHVtL0hkMO0fiJGA== 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=/TuO6gVMOUM/410LpFX2HqBTW2mI1s1WXHGhBF58NSA=; b=RU7TDFl5AQhkarOapwIzGHRfCIwpwJKHAa54jOuPgLgHDURWKtX7nU6MVgXveR48lqfoaalMpnumk1SrCS1nUQuFACCyqroEY/rkFrodBdwEtXJvpyjtN3Jce5pPCGMqtoOiEcBpudNfhx877UKGDYTtobjt3VrANPDXFoq9ENKdCBquTie/5kpnSJxdF5XZ3Yw63eVWkZvrI5U3SFj9Ym5/8kqcHGTOwOD7B0QBlawFA/UmC5wDhScwUGK7mRazPKjTqW1401zYSgz1WSxTSSRol7XoZVn7TK2YGlyd6CQtXdjB/iJwO5XmlD2SvIprZetU1jYpBXBraq+g/gTE4g== 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=/TuO6gVMOUM/410LpFX2HqBTW2mI1s1WXHGhBF58NSA=; b=QovLgrQcYIUmaN1JFOZOAq+W1IK5vDLi0GcqZgmpvumuXT1bUIFBkDZWT9XC3UHWwLaU/Kh9sRu4FkFkEFqr+E6FfDQW4J7NJCRoxaUY5R8x9eWwe+0Fx+MQ5hcdQ/yX7ji55jtBxQTdX1F982qTHWlEb3XxknUasy4B84pOXVU= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:07 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:07 +0000 Message-ID: <87cyy5h2r9.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Andreas_F=C3=A4rber=22?= , Alper Nebi Yasak , Jaroslav Kysela , Liam Girdwood , Manivannan Sadhasivam , Mark Brown , Sylwester Nawrocki , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 26/54] ASoC: samsung: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:06 +0000 X-ClientProxiedBy: TYCP286CA0298.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::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_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: 03d777d9-ddb1-4644-bec5-08dbbe590c18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0yqRQ8cW1Ok4Qx42HZGft9vBQrMhBFB41NVo5ezVujucj4LNBP+QyiMFyGDaDp4em5IN3MiAayS9JTdRnJaAcvw6VwVuNeU1F2S1AQi8+2FgX9DqeZJXlW8d9zvhksQgzK+I5MJ8PKnKwZiS3PT9fcgGPfIdvFWBR3Wlwo5VJekURa9pjM8OhSXTencp20lbslJAf/AVDQU4sq3EhrmjDtVDPHfmpF6uMa/udAEd/9XoTiIwZsLAc9vpMLbl0OflNMpvd3yYkB01BBCl2V1/a1ufrAWaXAadx+JKUUwJhxGi2/lTLWu4y3BsX5wHa3KdOMBPpyTEX+K/npi72UN7IzjfqezcaCy9TNEvSWIsb1RsnFEKa09etZxFc2kfdQinNq/d03+FVwn55p+rOzlB+YHCLZl5ZKLcdpQevlgMUWgJlSlXA9vGvtLEDLp6F4lrmbWNRuYUtI2WZjF3RguW9JledXWB+ezHOKt50C/2Qgo6DFzYqS2oWhHpKsg4bvKoGAXc9hInWuWNpQnoewghNX2+sD56Dm52/apsC2QOP0n8whSmJcTJHjORoR8iJs5PW5GFtVnGF0uBVNkZUEgRqm+uoHx0wSqIhKzULtDXaEtV7k4NOoM1QdLXanBgnA25GZuYj2Jq9kS50gcyMwruZQ== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(30864003)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9/kuMuYlyM1WYpZVhk8ZlXx93diRRCphiECZ9REYgXW4cED6UBOu2lE/EJewweDT/UeZAV26XTpEMcAS8V2ae30W8z7hsND6otgvlkrxev/GSsqLbCtlv1AQPaZbt8k/LwNadrDzdqbhBlmkLHX9MvAmBOhT/ysuEOK93cva1DuO7cpyoUwuyjro7dzzsUsvQCMgRT1IFCVoUEZwTmzmLntER3RgwFLZ914BJ6VHiFEO5duSygOFmRzfwz3Ed0eCKgjUXkzUH/LhxGI9UR0QbgEI3YKm63hw+1QGmBKo25WZiJ38QwrKh5DsVqydOMP9lO+jwIS4jYEGVoeBKeby2c5d+7928EAcSeRwE6lb9CsePq8sDJAVICP6KBmDibX2mj8yC+Cc3idRttNVP/s4oElt+5WIMNiRtEM6zWczGxwBF6pNLTz1HTuh0lhCNM/WRaIpCuzS7P/HrMOG3EBSdO0GQXPugVrxFy7zUqQ1vNRWkVPBXdSvs5ZlWHbxBpJl2vqU2yDUiH33IlpvXNhwVGyjy3XTuXw1Q4QCVgnC9KS3+gWOrRY9UURb99ASEorPMIjcNZtKTpHfFsI6s4AZRVT6sjWJQH1LaTJUdk5IwpAqtxC4fMBturhiSk/7rfbN0HypvUaQKbe2EiYt9prqs5aPf9xZ3JOQf4+RvF2xYCAllkqjiT5ReiQLRWpJNhlWfha3MMZu1RyzadAQApq60wg0P7Cv7GpM8WOMnsGgk4Za8o+EPCXj/z8foEE1A61Iy704yhBJAbxWN7J9GblwGFcHHJX10R9/5P46DsFhSHufDskwQsFeWfNAtQkNtY6PO/DGQSt18uKiXn6wu+ElKIvj6F5QY6ZDzqFLzR3P0qtpIxu39vMIGmBXVghCsX47AaXC12UXvvvBzQF+SGnhQmky+x3hGd7vp8KCD3QKOoOtL4xWhk/gao+Smjy2FGmVTfnQzXAtDvGbi6dlAZ7il0ksXmrRxkpwo94zgnLokh6O8GObnX7PzDSCpi3jY891cCsmLqBdC5HAqeRS1QSLR/87GMhCscgbfgdWo7E8O4aFlfGcxUWKGSIpBedTBYYBypj4jdCVZNH1ZeuWeOBIaFAyXfv1yOPTkFrymquYiorQ6yVof0Qfjj0VRx4axLIKMmB2hY54koNx3Rtcj1wOjb5sNgHqjXVqxbs3aiOVfJbXK7sKhbKrewF2k6EX94R90BgAF9UDndfNWdFpjb5mFBmSLmeBfWSAM/KGpzGukFhruB/k17KnNAOpvK0Eby9PX4iS0o2715HjI9FKxOZy/WJ2Y4NAA0UhizlXrqz/PA76x2YhCYLUoxhNzyVhVTHlGQ9xkgF1kKtaFk8dZgapQfNXyIz1WVmYUQuGeZdbNujnocV8g4lpLNWTK2Aad1CKLU7a7QIne/5jIylehPVoQ97dCyTvSUvK61WKNmF2zbEFc7hzKhinXS10dKzFDNTDohXkXq1vJrm6em/jcJv7+iJW7FQQMHrHlgMQTx8FbbI4FzC9m+m4uQ54+3X3puZgpe/NO/PE6bKlEBX4V0QoFQ+F5YMkbA/Msl6PVI+tF6jVtfPhDcy+uh7DPMkmvMYYApYaEcy9e3s1kGoq9Gv/VZ9UOE12pV4VEXIHePYBtJk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03d777d9-ddb1-4644-bec5-08dbbe590c18 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:07.3509 (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: XxFivblvKEX9b9oQRa1qyzFZdxsSWq8sM+BsJU2VaEpWbIZwlCeEOhyY6noqLEhcDfq3C0CloOAwEU0DBKemn39L6y0QNax64cRlHvWTe88ZaAnx3zPNdflFBC3WiLYu X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: 6RKWWTAIGIRZDFMUL2ILK6BMRU33L24G X-Message-ID-Hash: 6RKWWTAIGIRZDFMUL2ILK6BMRU33L24G X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/aries_wm8994.c | 12 ++++++------ sound/soc/samsung/arndale.c | 10 +++++----- sound/soc/samsung/bells.c | 16 ++++++++-------- sound/soc/samsung/i2s.c | 12 ++++++------ sound/soc/samsung/littlemill.c | 16 ++++++++-------- sound/soc/samsung/lowland.c | 4 ++-- sound/soc/samsung/midas_wm1811.c | 10 +++++----- sound/soc/samsung/odroid.c | 8 ++++---- sound/soc/samsung/pcm.c | 8 ++++---- sound/soc/samsung/smdk_spdif.c | 4 ++-- sound/soc/samsung/smdk_wm8994.c | 4 ++-- sound/soc/samsung/smdk_wm8994pcm.c | 6 +++--- sound/soc/samsung/snow.c | 4 ++-- sound/soc/samsung/spdif.c | 14 +++++++------- sound/soc/samsung/speyside.c | 8 ++++---- sound/soc/samsung/tm2_wm5110.c | 24 ++++++++++++------------ sound/soc/samsung/tobermory.c | 8 ++++---- 17 files changed, 84 insertions(+), 84 deletions(-) diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index dd3cd2c9644a..fa7dd04fe94e 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -166,7 +166,7 @@ static int aries_spk_cfg(struct snd_soc_dapm_widget *w, int ret = 0; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - component = asoc_rtd_to_codec(rtd, 0)->component; + component = snd_soc_rtd_to_codec(rtd, 0)->component; /** * We have an odd setup - the SPKMODE pin is pulled up so @@ -259,8 +259,8 @@ static const struct snd_soc_dapm_widget aries_dapm_widgets[] = { static int aries_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int pll_out; int ret; @@ -287,8 +287,8 @@ static int aries_hw_params(struct snd_pcm_substream *substream, static int aries_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* Switch sysclk to MCLK1 */ @@ -316,7 +316,7 @@ static const struct snd_soc_ops aries_ops = { static int aries_baseband_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int pll_out; int ret; diff --git a/sound/soc/samsung/arndale.c b/sound/soc/samsung/arndale.c index fdff83e72d29..80a57bff1d02 100644 --- a/sound/soc/samsung/arndale.c +++ b/sound/soc/samsung/arndale.c @@ -20,9 +20,9 @@ static int arndale_rt5631_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int rfs, ret; unsigned long rclk; @@ -55,8 +55,8 @@ static const struct snd_soc_ops arndale_rt5631_ops = { static int arndale_wm1811_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int rfs, rclk; /* Ensure AIF1CLK is >= 3 MHz for optimal performance */ diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 70b63d4faa99..365b1aca4855 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -60,7 +60,7 @@ static int bells_set_bias_level(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); component = codec_dai->component; if (dapm->dev != codec_dai->dev) @@ -106,7 +106,7 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); component = codec_dai->component; if (dapm->dev != codec_dai->dev) @@ -152,11 +152,11 @@ static int bells_late_probe(struct snd_soc_card *card) int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_AP_DSP]); - wm0010 = asoc_rtd_to_codec(rtd, 0)->component; + wm0010 = snd_soc_rtd_to_codec(rtd, 0)->component; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]); - component = asoc_rtd_to_codec(rtd, 0)->component; - aif1_dai = asoc_rtd_to_codec(rtd, 0); + component = snd_soc_rtd_to_codec(rtd, 0)->component; + aif1_dai = snd_soc_rtd_to_codec(rtd, 0); ret = snd_soc_component_set_sysclk(component, ARIZONA_CLK_SYSCLK, ARIZONA_CLK_SRC_FLL1, @@ -195,7 +195,7 @@ static int bells_late_probe(struct snd_soc_card *card) } rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_CP]); - aif2_dai = asoc_rtd_to_cpu(rtd, 0); + aif2_dai = snd_soc_rtd_to_cpu(rtd, 0); ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0); if (ret != 0) { @@ -207,8 +207,8 @@ static int bells_late_probe(struct snd_soc_card *card) return 0; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_SUB]); - aif3_dai = asoc_rtd_to_cpu(rtd, 0); - wm9081_dai = asoc_rtd_to_codec(rtd, 0); + aif3_dai = snd_soc_rtd_to_cpu(rtd, 0); + wm9081_dai = snd_soc_rtd_to_codec(rtd, 0); ret = snd_soc_dai_set_sysclk(aif3_dai, ARIZONA_CLK_SYSCLK, 0, 0); if (ret != 0) { diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 3af48c9b5ab7..0d61055ddc59 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -939,8 +939,8 @@ static int i2s_trigger(struct snd_pcm_substream *substream, { struct samsung_i2s_priv *priv = snd_soc_dai_get_drvdata(dai); int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct i2s_dai *i2s = to_info(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct i2s_dai *i2s = to_info(snd_soc_rtd_to_cpu(rtd, 0)); unsigned long flags; switch (cmd) { @@ -1580,8 +1580,8 @@ static void samsung_i2s_remove(struct platform_device *pdev) static void fsd_i2s_fixup_early(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct i2s_dai *i2s = to_info(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct i2s_dai *i2s = to_info(snd_soc_rtd_to_cpu(rtd, 0)); struct i2s_dai *other = get_other_dai(i2s); if (!is_opened(other)) { @@ -1593,9 +1593,9 @@ static void fsd_i2s_fixup_early(struct snd_pcm_substream *substream, static void fsd_i2s_fixup_late(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct samsung_i2s_priv *priv = snd_soc_dai_get_drvdata(dai); - struct i2s_dai *i2s = to_info(asoc_rtd_to_cpu(rtd, 0)); + struct i2s_dai *i2s = to_info(snd_soc_rtd_to_cpu(rtd, 0)); struct i2s_dai *other = get_other_dai(i2s); if (!is_opened(other)) diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index fafadcef234e..c5260e101c2a 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c @@ -23,7 +23,7 @@ static int littlemill_set_bias_level(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - aif1_dai = asoc_rtd_to_codec(rtd, 0); + aif1_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != aif1_dai->dev) return 0; @@ -70,7 +70,7 @@ static int littlemill_set_bias_level_post(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - aif1_dai = asoc_rtd_to_codec(rtd, 0); + aif1_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != aif1_dai->dev) return 0; @@ -104,8 +104,8 @@ static int littlemill_set_bias_level_post(struct snd_soc_card *card, static int littlemill_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; sample_rate = params_rate(params); @@ -182,7 +182,7 @@ static int bbclk_ev(struct snd_soc_dapm_widget *w, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]); - aif2_dai = asoc_rtd_to_cpu(rtd, 0); + aif2_dai = snd_soc_rtd_to_cpu(rtd, 0); switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -278,11 +278,11 @@ static int littlemill_late_probe(struct snd_soc_card *card) int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - component = asoc_rtd_to_codec(rtd, 0)->component; - aif1_dai = asoc_rtd_to_codec(rtd, 0); + component = snd_soc_rtd_to_codec(rtd, 0)->component; + aif1_dai = snd_soc_rtd_to_codec(rtd, 0); rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]); - aif2_dai = asoc_rtd_to_cpu(rtd, 0); + aif2_dai = snd_soc_rtd_to_cpu(rtd, 0); ret = snd_soc_dai_set_sysclk(aif1_dai, WM8994_SYSCLK_MCLK2, 32768, SND_SOC_CLOCK_IN); diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index a79df871ea13..702cb4cc1ce9 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -36,7 +36,7 @@ static struct snd_soc_jack_pin lowland_headset_pins[] = { static int lowland_wm5100_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = snd_soc_component_set_sysclk(component, WM5100_CLK_SYSCLK, @@ -70,7 +70,7 @@ static int lowland_wm5100_init(struct snd_soc_pcm_runtime *rtd) static int lowland_wm9081_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_dapm_nc_pin(&rtd->card->dapm, "LINEOUT"); diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index 2ec7e16ddfa2..bc4214530e95 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -53,8 +53,8 @@ static int midas_start_fll1(struct snd_soc_pcm_runtime *rtd, unsigned int rate) { struct snd_soc_card *card = rtd->card; struct midas_priv *priv = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *aif1_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *aif1_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; if (!rate) @@ -105,7 +105,7 @@ static int midas_stop_fll1(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct midas_priv *priv = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *aif1_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *aif1_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(aif1_dai, WM8994_SYSCLK_MCLK2, @@ -284,7 +284,7 @@ static int midas_set_bias_level(struct snd_soc_card *card, { struct snd_soc_pcm_runtime *rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - struct snd_soc_dai *aif1_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *aif1_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != aif1_dai->dev) return 0; @@ -305,7 +305,7 @@ static int midas_late_probe(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - struct snd_soc_dai *aif1_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *aif1_dai = snd_soc_rtd_to_codec(rtd, 0); struct midas_priv *priv = snd_soc_card_get_drvdata(card); int ret; diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index c93cb5a86426..c59273e2da2a 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -35,7 +35,7 @@ static int odroid_card_fe_startup(struct snd_pcm_substream *substream) static int odroid_card_fe_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct odroid_priv *priv = snd_soc_card_get_drvdata(rtd->card); unsigned long flags; int ret = 0; @@ -56,7 +56,7 @@ static const struct snd_soc_ops odroid_card_fe_ops = { static int odroid_card_be_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct odroid_priv *priv = snd_soc_card_get_drvdata(rtd->card); unsigned int pll_freq, rclk_freq, rfs; unsigned long flags; @@ -98,7 +98,7 @@ static int odroid_card_be_hw_params(struct snd_pcm_substream *substream, return ret; if (rtd->dai_link->num_codecs > 1) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 1); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 1); ret = snd_soc_dai_set_sysclk(codec_dai, 0, rclk_freq, SND_SOC_CLOCK_IN); @@ -115,7 +115,7 @@ static int odroid_card_be_hw_params(struct snd_pcm_substream *substream, static int odroid_card_be_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct odroid_priv *priv = snd_soc_card_get_drvdata(rtd->card); unsigned long flags; diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index d2cdc5c8e05b..573b2dee7f07 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -216,8 +216,8 @@ static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) static int s3c_pcm_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); unsigned long flags; dev_dbg(pcm->dev, "Entered %s\n", __func__); @@ -260,8 +260,8 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *socdai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); void __iomem *regs = pcm->regs; struct clk *clk; int sclk_div, sync_div; diff --git a/sound/soc/samsung/smdk_spdif.c b/sound/soc/samsung/smdk_spdif.c index 6f3eeb7bc834..2474eb619882 100644 --- a/sound/soc/samsung/smdk_spdif.c +++ b/sound/soc/samsung/smdk_spdif.c @@ -100,8 +100,8 @@ static int set_audio_clock_rate(unsigned long epll_rate, static int smdk_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned long pll_out, rclk_rate; int ret, ratio; diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 821ad1eb1b79..13fb1bd7f4c9 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -44,8 +44,8 @@ static struct smdk_wm8994_data smdk_board_data = { static int smdk_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int pll_out; int ret; diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c index d77dc54cae9c..5802f92ab8ba 100644 --- a/sound/soc/samsung/smdk_wm8994pcm.c +++ b/sound/soc/samsung/smdk_wm8994pcm.c @@ -43,9 +43,9 @@ static int smdk_wm8994_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned long mclk_freq; int rfs, ret; diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 334080e631af..7de6acb95701 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -30,7 +30,7 @@ static int snow_card_hw_params(struct snd_pcm_substream *substream, static const unsigned int pll_rate[] = { 73728000U, 67737602U, 49152000U, 45158401U, 32768001U }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snow_priv *priv = snd_soc_card_get_drvdata(rtd->card); int bfs, psr, rfs, bitwidth; unsigned long int rclk; @@ -109,7 +109,7 @@ static int snow_late_probe(struct snd_soc_card *card) rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); /* In the multi-codec case codec_dais 0 is MAX98095 and 1 is HDMI. */ - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); /* Set the MCLK rate for the codec */ return snd_soc_dai_set_sysclk(codec_dai, 0, diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 28dc1bbfc8e7..f44e3180e8d3 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -141,8 +141,8 @@ static int spdif_set_sysclk(struct snd_soc_dai *cpu_dai, static int spdif_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct samsung_spdif_info *spdif = to_info(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct samsung_spdif_info *spdif = to_info(snd_soc_rtd_to_cpu(rtd, 0)); unsigned long flags; dev_dbg(spdif->dev, "Entered %s\n", __func__); @@ -177,8 +177,8 @@ static int spdif_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *socdai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct samsung_spdif_info *spdif = to_info(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct samsung_spdif_info *spdif = to_info(snd_soc_rtd_to_cpu(rtd, 0)); void __iomem *regs = spdif->regs; struct snd_dmaengine_dai_dma_data *dma_data; u32 con, clkcon, cstas; @@ -194,7 +194,7 @@ static int spdif_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - snd_soc_dai_set_dma_data(asoc_rtd_to_cpu(rtd, 0), substream, dma_data); + snd_soc_dai_set_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream, dma_data); spin_lock_irqsave(&spdif->lock, flags); @@ -279,8 +279,8 @@ static int spdif_hw_params(struct snd_pcm_substream *substream, static void spdif_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct samsung_spdif_info *spdif = to_info(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct samsung_spdif_info *spdif = to_info(snd_soc_rtd_to_cpu(rtd, 0)); void __iomem *regs = spdif->regs; u32 con, clkcon; diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 22e2ad63d64d..43519572dc69 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -25,7 +25,7 @@ static int speyside_set_bias_level(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != codec_dai->dev) return 0; @@ -61,7 +61,7 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != codec_dai->dev) return 0; @@ -131,7 +131,7 @@ static void speyside_set_polarity(struct snd_soc_component *component, static int speyside_wm0010_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(dai, 0, MCLK_AUDIO_RATE, 0); @@ -143,7 +143,7 @@ static int speyside_wm0010_init(struct snd_soc_pcm_runtime *rtd) static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = dai->component; int ret; diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 5ebf17f3de1e..2417b91a328f 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -92,8 +92,8 @@ static int tm2_stop_sysclk(struct snd_soc_card *card) static int tm2_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(rtd->card); switch (params_rate(params)) { @@ -133,8 +133,8 @@ static const struct snd_soc_ops tm2_aif1_ops = { static int tm2_aif2_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; unsigned int asyncclk_rate; int ret; @@ -187,8 +187,8 @@ static int tm2_aif2_hw_params(struct snd_pcm_substream *substream, static int tm2_aif2_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret; /* disable FLL2 */ @@ -208,8 +208,8 @@ static const struct snd_soc_ops tm2_aif2_ops = { static int tm2_hdmi_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned int bfs; int bitwidth, ret; @@ -284,7 +284,7 @@ static int tm2_set_bias_level(struct snd_soc_card *card, rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - if (dapm->dev != asoc_rtd_to_codec(rtd, 0)->dev) + if (dapm->dev != snd_soc_rtd_to_codec(rtd, 0)->dev) return 0; switch (level) { @@ -315,8 +315,8 @@ static int tm2_late_probe(struct snd_soc_card *card) int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[TM2_DAI_AIF1]); - aif1_dai = asoc_rtd_to_codec(rtd, 0); - priv->component = asoc_rtd_to_codec(rtd, 0)->component; + aif1_dai = snd_soc_rtd_to_codec(rtd, 0); + priv->component = snd_soc_rtd_to_codec(rtd, 0)->component; ret = snd_soc_dai_set_sysclk(aif1_dai, ARIZONA_CLK_SYSCLK, 0, 0); if (ret < 0) { @@ -325,7 +325,7 @@ static int tm2_late_probe(struct snd_soc_card *card) } rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[TM2_DAI_AIF2]); - aif2_dai = asoc_rtd_to_codec(rtd, 0); + aif2_dai = snd_soc_rtd_to_codec(rtd, 0); ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0); if (ret < 0) { diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 9287a1d0eef1..2bdd81bf821a 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c @@ -23,7 +23,7 @@ static int tobermory_set_bias_level(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != codec_dai->dev) return 0; @@ -66,7 +66,7 @@ static int tobermory_set_bias_level_post(struct snd_soc_card *card, int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - codec_dai = asoc_rtd_to_codec(rtd, 0); + codec_dai = snd_soc_rtd_to_codec(rtd, 0); if (dapm->dev != codec_dai->dev) return 0; @@ -181,8 +181,8 @@ static int tobermory_late_probe(struct snd_soc_card *card) int ret; rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); - component = asoc_rtd_to_codec(rtd, 0)->component; - codec_dai = asoc_rtd_to_codec(rtd, 0); + component = snd_soc_rtd_to_codec(rtd, 0)->component; + codec_dai = snd_soc_rtd_to_codec(rtd, 0); ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK, 32768, SND_SOC_CLOCK_IN); From patchwork Tue Sep 26 06:23:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726440 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 522DCE8181F for ; Tue, 26 Sep 2023 06:28: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 A2288E80; Tue, 26 Sep 2023 08:27:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A2288E80 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709693; bh=eILXEVtZvUbFd4iagoYawmSmzRVRpgV0RPQf7ilyUGQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=spl3tGP53P4ib5FhWqiHcsf0etIfwm9yBRMC4RVs6uqnynJfnYSw73pFOONdP9WHH 2onU912bEfDGT4UTX9kZcX0+fAoEXaTpW19fxK7UdcAfj0XQFiwMn2DPoqX5FEwOBt adqwCxotwhjudEVfI4VFsIEaDMEeDyh1ONwGF1Ko= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 668B4F8055C; Tue, 26 Sep 2023 08:23:47 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 45307F80631; Tue, 26 Sep 2023 08:23:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AE087F8060B; Tue, 26 Sep 2023 08:23:42 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::724]) (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 A9920F805CB for ; Tue, 26 Sep 2023 08:23:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A9920F805CB 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=k0rVzzmu ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J67n2cYoFN6Xu4hVrpiEzvq/HNG3QRMQ10w6UTbRIo7GSM3vaglEwjZslHQ79w91xBp1S4GGklvr2HT9U4osR14NohJEnauCBp2y6cPgx3WChAyUya/0lswGhRJj/w8+/MDT2Ll1q6FJHqsGKRDkltouH0ne8+0uH31vohqL6xarSK3AHhjw35Jt2TfQXfBpza+fEFrS95A0hsuBTdk4LTy/WRcQ4ErVXCeCgeF7ba/51RFJA3IT6axU/btNeO5+pOFpK5OYvYviZWBI7ne251Y95PBMyi321q7j4Oc8gkd/hBuxBy0G9skEEPZVI5dGFfbu+vd3q2iEzCyc5bQ3mg== 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=YGEw6NxrWw1LVuGw0JtTvQzF1g/BPu2nyqupaipEadA=; b=N+y9aOq6eLNlCywkf7FeaDm0s6NKBfhropi3pS6x5jvdvx6N3gLkjm5Jck4XmOBXpoUDBaiKh6CrHx56HWLUldUzoeeKvqhTZbFYYi7IL8sKN9oiviNeNcIrawPuK8sT8GDOigNm4QFp7tV2JZMxr8fbt4DDyjJFRKZ/u2NrsR3iQ9T+wAeYNkepanPx8EFXiHeV6UjUfLoIeAC0JE8Zqw8779JXOx0DwdccM+Ug1X69wRjyFR5Ak/CvJpOxzlH0onxYjmxmod81UIR5WKIZpmDtHkp/iUAk8L2t8wapwFv2BZV8HI1s+KF+ebZR0tHQ4tK3wUCCa+pF78njBHJ0Ig== 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=YGEw6NxrWw1LVuGw0JtTvQzF1g/BPu2nyqupaipEadA=; b=k0rVzzmuJ5T6AWQj+jxbg/+FIfLt43TtQAXQh+wK/R1ebnClackOa22pzt3oA3swSxwzpcE9+Vgd68usMzSLGqkEK1BjKC0tNO3mXp4RX0KZr3Xy79+n7IQvzwuO4TP1FG0WkFmz8XhRm1PtLEtUkYl6sQnIVf8nRc7Sllo1s9M= 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 TYCPR01MB10364.jpnprd01.prod.outlook.com (2603:1096:400:240::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:12 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:12 +0000 Message-ID: <87bkdph2r3.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Max Filippov , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 27/54] ASoC: extensa: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:12 +0000 X-ClientProxiedBy: TY2PR02CA0045.apcprd02.prod.outlook.com (2603:1096:404:a6::33) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10364:EE_ X-MS-Office365-Filtering-Correlation-Id: de3b5347-289b-4370-e158-08dbbe590fb0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AB9OwkAFBRhBtflubt8Owedrm8XGU0wfD5MSpevqLgQSCrirQulB9Eng9FZJWFjHX8Mfq+XbsymYnjbqjgE9/qq/aiFddzTSF+35CKnZgnddpSLAuTQPup43bxWa4YBs3XhGE+Q8OHvyhS/bkloHGTtQbjUWzj0zofjYVWEWPUT9Lgjpb3qoAGDfclvjX3C62w5uZC3pjW7ffdo1pYrhS+J+wlEMzF92GfhkPfaABJzOzV0359ootjSq29qIDT0skE729S2HSDLZY0wx/sYuRl9t5MjCvpWmGaluSPqQd3SDc8uHQysRI3UR+4ri+koA2hqWVX8i+prAouQkINwSr9zjNIVCaIgUhze2W9mW4FvJTgWWu4mRd6jw1aocGb4mCnDGl0Zz+fQYAGsmZGOo8UXp/Bga/4C3S+oNDYW4EfEIM7VzaBIIA39SvPLv7nZr49izoZFGg6qz8urDErQh5W9i0Q9w4jBjAswUIevFeNlTrd7zQn5wSjy8qs/WAs+N9V88XdzCISDHHgXAp2rsvGV5nrYUmJtnnv2hGEHNL4YAgboL+7qjT24qszM4ijaMQRdupOjVRkBp6PK70NznD8osRq2OIekqFLFjut4v4Zm8ODTNYYEaD+AMZ0ls15VUxxpNZ/1HERrB/yKTF6P+Yg== 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:(13230031)(396003)(136003)(376002)(39860400002)(366004)(346002)(230922051799003)(1800799009)(186009)(451199024)(52116002)(478600001)(6512007)(41300700001)(38100700002)(38350700002)(316002)(26005)(2616005)(5660300002)(83380400001)(66476007)(66556008)(6486002)(6506007)(110136005)(8676002)(4326008)(66946007)(8936002)(2906002)(86362001)(36756003)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b8tAZfh48xYBoQKCxdpfgofm1hdqE3n0tywlYpDACGZe60G24u5ArI7ChtKSNy44VHD1FxAmd26mjH18J3Wv9SmaETHb91LEL9dGFuN9sdlkd/iwn0ARixpWHc1A79EJA6b/uh8Jc6dFQthnX0Lu7xjUcxKWoQOaM3rKUOLQwiMzqjf9SD8Zw2kBmeDcS5HNOvyM4zGvkfjnZ80yAnuAqt76YR+qXx+/9ms5MT3wTWDZ17zBsxJzXV0jN16WuHgyeqYqVc7p5jDvFVQfc5nkp+8q7wySKydr8f/BSxcgkTbnHfoBNa7J3N5cQGm6AURFRcANAZtvFm6Kyd0nbp5HHzr9KonTCTGlXI2ZPDuOGOPD4pBoNuPsXaoS2sjBpfwe7LBJbz+HIb/xi0G7vuuwf8aIxb6wholFZrNzRqCzQvSZDlQJJXXYRKue+ET18twG+A5eeLUBJhw4C/Bl7CVihsvMFgrnj22lbU4G76RzTWKFeUhLpBExPJd7IWO6hilx10x9y+/j6lwDzZFCSX4Y3Wlz6io73II8IuQqYgg9/49Zh+OS1PuMd51NNbXC8FdzsTAWx0JV9byhaiE5QzBLs6eqSXkwlJhwnM3NOyer+ecPbFmBFb9rDGXsV+XsLWHfbEE9iEAAM9XgE4Z3HUKcTJwY1gbgqC5hiWwIiZupFVcio0WjDAagGmQw/Wi6ezAkDiOqUUOUwpFnWAcW1wRaC2uwszxDCEn0I0wYorH8NAZJAR7kLrBlRczENzwtP5dXHP1fpFLVb3ygmwWlbkgZw39WKr2TTyIBoZd9w2zKTyIU96AOvMtCOUDBtI2UECYrUwiDfLeQoKd40EMMloLzkGJctNvny5ZdI0w751IUKCh1sEAsAc/WBn4b1lpMs/m5Cd/9asPTSCK+o4vNlK4L7VodCAZdOESTCx+EFXR+h+pE8gxiSVxW5yPW3F3/RmogojBCx9Bzd2p2Xw6M95KqD/2S8Gi5t8Q96tSuQpcZR1qI+IOyX5B4h/ME7VQpZUmSs6HrIq67JOkjcCrCLpSMNik314smnjgIgiMffR8K0uzZUo/SWyjbN9anbt4FyU8518EmYQSb5NQDD64w6X/jr+Ot0+Wml6bKGLmFTBvaqbtWTrzVwTJUsFO074HAVfFc6LCgMUTTYZz6GDM8X6GwHBkGb/wfyecr/4o8F5JGAzuQ3dVDHXLHMrv08KjziYkQ0mEL4HgaTxgQ4qGej1GOObd5WorZU44gh3K8uOhuJmIzbTAOIK8WMYcUExxnuqh2EIqa7rwTUE10z0FCaFp0kDVOQioNn2GxCniZMcF/1VSQMFt4//dUDDtdTETb8DC4eBXmLEZVy96qePbfczGMkx7Ku/zuJjxh1ce+MH79uOA68QWksJsSmBQf3/kBWf+epsRfvkV0Ff9mpVyb0bpELT7c+4P6ErQS4TUILUdBOajO3aziVdXoQuFrXWDX7aZlqUwipS275wXW1Bby2TovYP82H7RdQ5WhEWCSW953yZsMBLPolffrN89MocEQhPenm5eEwR+9aqq91CNvBVEXllTQBF+GIuc89aaxUk8hI2M1QZ8DvxXP3H9JoqFkTW+Jx9rQCnjqXV3EJiiMmoYcY7XyM/yiTvkXSBblbr0GDf4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: de3b5347-289b-4370-e158-08dbbe590fb0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:12.8653 (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: NYunO1DUnIANKr0UwgZJaO9nZErAR+ZtzW+h/+skp+NbGvRI+2NeyOa6VGYh2V1LFdwVYp8JbBaaLUEykGs0+9L4L66PsaAAMxke5N3XVOoMZHzgQnovE5/vOCpoOqPw X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10364 Message-ID-Hash: 3ML5BFAOGSFGN275RUGYFQ3THJUMWGVF X-Message-ID-Hash: 3ML5BFAOGSFGN275RUGYFQ3THJUMWGVF X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/xtensa/xtfpga-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c index 287407714af4..6e2b72d7a65d 100644 --- a/sound/soc/xtensa/xtfpga-i2s.c +++ b/sound/soc/xtensa/xtfpga-i2s.c @@ -369,11 +369,11 @@ static int xtfpga_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); void *p; snd_soc_set_runtime_hwparams(substream, &xtfpga_pcm_hardware); - p = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + p = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); runtime->private_data = p; return 0; From patchwork Tue Sep 26 06:23:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728185 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 0B6D4EE020C for ; Tue, 26 Sep 2023 06:28: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 41DEBF14; Tue, 26 Sep 2023 08:27:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 41DEBF14 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709712; bh=zf8OKXFFd4Wroxp0L5s/4wLAFdYDzgytUtdYqvd6ijs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=mdQUpbW9/1upQDxAS9M2DBnkXHVqmP0DFRuCARC9TrG3YRrT1/JIXz40RfStjEesX ZV7WnsWzf+9MR5vlfY2d7gBDzFCSZ/w5by/MFax8R0xT41+GDQKt/gudCGfF43+H5j cBTfnZMyutWn0AVzf0mzjIG3Ys/Zah8cwOkTxNHs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 216B4F80651; Tue, 26 Sep 2023 08:23:51 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DBBA7F805A8; Tue, 26 Sep 2023 08:23:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 78122F805CB; Tue, 26 Sep 2023 08:23:43 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20722.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::722]) (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 5BBEBF8047D for ; Tue, 26 Sep 2023 08:23:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5BBEBF8047D 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=SuO7j22A ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YRcaSoH4smgwd6O2vLQR75WlWcCOqdS8cz4O8Sg/+pJ/9Rw/qxynmmUKm3OxsNZ+HYBHx8VDxAxer/M8Mf2UDnWVMy/5tTaQ1xhRgOlA6nyd5ItiyIYf3CLYf7UxuCqO6K6pwirQT0YmcjFrT3P4nYvmoJS+0XT61qRTko1ZkZhlydCThWEZJaBwqxVUEk7oH4IBcxQtWtIklT6Z4sXxZsCbymQhB0VPT9Cdcwpfb8lv1Y7yDPRhNpAYQa8oExvEwbY3fdFyNf2TxXKKnM9Lejn5GBMFRr6zsfeRRqSJFszSv/haNV4qVewD7dVyhWlhETJSqTqUdUyWgSKStd3QFQ== 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=13P8ejIRGUW0GrW61sdH3GylMp23EMWGnGgp0Jflqt0=; b=XIec2BbMFuDUErb6YuHisPu7oJjVIWv5rsV0Nwk5fdMK7SRiAMDF4pos6LZqmOQbaKk5vlO+//9hwi+8MT0vhZJA4KVdbFevZHVMfQf9FWckCgISzGwEIV04NlcHsE3DgCloU9g5RDwKDYJ1xDp+JfCzracqB9tHzbA0drDiYdm3bo6L/OTWGF2P5wzg5Wn4ZTrpkfvP4VZkQFlEvtZg1lDAxHdYrIsHFgvmoFQAXN/aqNvDlNq4DPRd+ntvFNlbde7urljmpKqhD2nNav1nmOVHyT7wCJIwTz2D5xGjjsIuZpV+hBtzlsSvzJ+A0hLupusuttwtXVTQOwtZYgT9Yw== 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=13P8ejIRGUW0GrW61sdH3GylMp23EMWGnGgp0Jflqt0=; b=SuO7j22A41RcIdB+uKrfbHsUdaboVBgyTv228O9cRf+rM6i9Qfc4EL2cICwfhf/EQEmCZdSJCqchOUQoVlOr0xZ27qr/vPEuH23wdTodeZT8u0QBc5/IjGpvg37/d7hXOdnI4On4z/jYwG6SiPPf2JE+GaNZi7li9Se+LVFZmWI= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:19 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:19 +0000 Message-ID: <87a5t9h2qy.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 28/54] ASoC: kirkwood: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:18 +0000 X-ClientProxiedBy: TYCP286CA0309.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38b::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: e4a4127c-c3ee-4605-512a-08dbbe591357 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Td4xKrZfCGkNOAhR/j0ecx7CLWa4I5wFBuzaAunsQMuMTVl4zbiheyv7eEeAtG273v74YZGA+SE4PeGnybW0B2k+UYE6PIUPhW8hYCz87Mtyty9HjeH4/VPnEUnRhtUz07C8/oEZkDL2L+fH/GwpVibHHtgg3Se3hdGsqU75k6S2Zd53iXaONXiHaaxREp9aBxUde4vAzatuupIY00cYTslsSYBNmAP88zq/Fb2c9r2ccmh38BEM9w4HjQAR08zfPnjPTSAGMwfgE4QmRXUmCttaHzpXoT0Qe6Z+r20IvR/2ep3u+SKJ5C0Y5H0JoQYBDZyKqpiibpAY2v5FZCC2HrHP49rBepY7ZJLnWUHcsjXbieEEtPUCTYB7VAV9y4AJQDwSsvNqjrK4MWLw3uLo9Bvf6HQ0veD4L96rym9W5ivrQ0C609QCeJONMvEs1JrDsLUfoexwacZqfSabHcQCnJfuWrtrXPY2S/yNmBQWEdarGxq0z3Dtoe/Q14yBHRwjfSBNQBzufGyk8zcJQ/rtQYHqdW6CbluEvXHRvRG1ODbN1yrc2k/TMkY8iTl34JdtGlS+2CZ4IeBnoLCDq/qUvTBhoXIcKU7jTFN+ZSblMZSdb1L6FZbi/QlHA6B/bWXn1AHBJ2CuyfX/zOfhkLaTLQ== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5nCuYDnIAeqIEpVkL5FcJpt/5pH/bGHRWKMlstrx44FahwmJcycKM9I35fxVOzNxmdfK6PWXCRMrsj6pypc3YpiAU/P5BdpIBh8V1Cy0hnyQAQdQSaG+JUrMgIT2yxFbfY5ExNw7WQwrzEyWRMmlwlCj2e6m2Z3jBatp2JD8PHO/Pq0U8IzHDsUHGbVKcmbDjRprurbrF54lLfwmSWA/3aAPtU9Zx0lvCLV50kciXRAnXhQYcYnRj5iXovqKcv8XSa4vhO/IYZxb8I5Q1x92wgNcPz9Me6jZxWfEcrNL3Hi+ZjcMdX8VU9xfA5RToVYQ3CAxu848JiJckT5cKPjTW2/tT3uRtgqlIADAkqmODX+4Ycbn9wbeCDH2PezAcN+UekvELLEb+gG8TeSNaeSeypwiQMMb6cwl6jHI5ZDWUwV4tzWQKBaMIVQ3o8N5YI6EpKl+ewUrC+KDiEOov1MKLCFACQW2TCpGZVy4OtsrxL3c1LCpFeKH/YqjzHfUbRbpTTv/AMnczr4V0SZgp7SLfUkzsTMD0BLhMozzvENYJutwY7xRBiru79a0WwtEUU97Pe1xKg97YCNege4sOcCjttdZ/EoqdNA3MuDSEXngwxygAU9KA+X+XIWd+r/58VLaVJUrMZgCsMoFyi2wVIs2Rj8JA8FO8YGpOAVJddO6ft1HHJJTOq/fu+Mxi/toP4qiZvuT+S9JvigvYxUX+mtJ/keK5kEqkZsqG6vTUHt6ZQv82xV1uNyf8QiierDoEFYtly8dtfCH3LZkB1iTAUb5Yf/kks9xNZf/WM0m+S7FzCDPj8wC9yiVSrkvl59rQZInRI0YkFeT7xheFxuCVk4xX800zzdsnQKe8w0P9dkc1Q8386J9Hnk/ShuvE+MIXwfJJBcARHd8TJSdQoVjSb4a+p8qGmJYRcyhHqhTetAFXerTfJsNfiVLRU0se2PQwEeYJd9B2cuYtbIftKHdi5YJpoBn2LNMlUiNKs09feUkrGGdIRpMjDTE/PLqLX8mIqCRc6heIcK5ZO7zlRmCfnKfSa+Dhe+SzpH+KgH1Mgz/mV88zw1XFcM9oy7y4xziskmfCB8hL4mH0VSh6fFbOl6bM3LZiu3lAXfNHcqDa48QvBVRyv0LU3dOsM05ZeEV3S0dOwqdP0lWWGynqUDJlWo6Ti0XWbq+wvSJ0Xm84GAl2Y/Ep/JDNZX1L7xEnufJzHVqQxcsVuU00L5ncelvr7TrAlehJfOK7UJxjiYj/99O7RCJpAX1PVus1tBR8/62TALFcKKZY+I7+K0UKuOs7Z0lKxUu/RGdOgdhUEt2qvzRgcKFCxQV47vDTmzTNtDx4F1rRjxW8t3l+5/x0BMcaOwVREc+120bq4hgcBLgK25rguQ2bN4GEXqJhG98TMry+K2INHiC8DfjJojfqCVBgcKtF2KrKaLqd/w3t9dCOHsFN9RIq57OA1J56MQShxbzgk8BDE2q1qyRTCMbIfl87RqnZMPQqwBBIRPlGcMEVctqwg5Vcqeg1doreM2mdt4COxNyeX+2qX6hQN5Khge0I5IxX1MdAp/Nhy/e/iG4Wd+5F1RDNzUIKBoysp0oJEGMthlpqXe/ieDN+sZV23P7LO7xdFfx79zUQGyDvklQ+ZlJ+6s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4a4127c-c3ee-4605-512a-08dbbe591357 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:18.9897 (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: nEEkGrt8k1MINYRP+I8GTE+2BleLgl5hBPmwwIOKrUC2ZaoykBC1FFR6lcCf/BaQhShBZ6s3nT+ebdrcWL+8SM26FU1MUL/zPXTiRNzkJPO+aN8I+rEvgKeEZyEk0CE6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: 3MIJU7D2ZIY62WJPQNJHLQFPREUM45FG X-Message-ID-Hash: 3MIJU7D2ZIY62WJPQNJHLQFPREUM45FG X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/kirkwood/armada-370-db.c | 4 ++-- sound/soc/kirkwood/kirkwood-dma.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c index 81326426da33..79ee7599f06a 100644 --- a/sound/soc/kirkwood/armada-370-db.c +++ b/sound/soc/kirkwood/armada-370-db.c @@ -18,8 +18,8 @@ static int a370db_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int freq; switch (params_rate(params)) { diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index 640cebd2983e..dd2f806526c1 100644 --- a/sound/soc/kirkwood/kirkwood-dma.c +++ b/sound/soc/kirkwood/kirkwood-dma.c @@ -20,7 +20,7 @@ static struct kirkwood_dma_data *kirkwood_priv(struct snd_pcm_substream *subs) { struct snd_soc_pcm_runtime *soc_runtime = subs->private_data; - return snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(soc_runtime, 0)); + return snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(soc_runtime, 0)); } static const struct snd_pcm_hardware kirkwood_dma_snd_hw = { From patchwork Tue Sep 26 06:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726439 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 2D21FE8181F for ; Tue, 26 Sep 2023 06:28: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 05842EB9; Tue, 26 Sep 2023 08:27:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 05842EB9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709729; bh=VK/7lx5CD3PCBo3eHOOAg043eX85koVKwbclAlsLWio=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=W/ORybkUKdH3sRoDdxxK10ktGi0D67wCHFyDV+Amr+2oAGB0afwRmhRzLlb92NWKz IClgiFqmFWn2ZecIWVomZfxJbXCx5RmEBfUz7ALLnJAVlXcljhZv5TGp6WwWLazVZd z5zU3QlflVn0DT7lU+9sOLR8bE/CPzEVCjypXkMs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DDEDCF8063C; Tue, 26 Sep 2023 08:23:52 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DAAD6F8063D; Tue, 26 Sep 2023 08:23:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B9C32F805CB; Tue, 26 Sep 2023 08:23:44 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20722.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::722]) (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 AFC66F805A8 for ; Tue, 26 Sep 2023 08:23:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AFC66F805A8 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=Qf/7vCHk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Px6cTSHLU+RGow7QS/szapX6TEw55Sia3a8BBupTUd1AKFhMYTLmpSLCJ6QT+/l32LOZd2JmhRKNxGmdL8q5BWLW4KF4twqhNEgzVkqaHWuEtG9TQDH3WJPwbvCFrZVWKoGuMiRe3XFHK+dG4ZmHaTf3DyUTaosa56tYdkJL2bNiEJxqS+TrhsE6UHjW7cR6UsU+62R/LG5fLtnu7a9p9QEvWaStWiyZeSEmW+FY3eWRrdt0y+1M+G9qfXVCZ33+L6XBk03EsZGYnMTb+pDl6hHk0UFAMLbpSO9Rdo/Sa9TKpxPy2JFILIxgWUJ6d1Ur3G423n3vrTxbiP+30Wm9MA== 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=d8uvhqIMueOFs3ABrCGKlChMaIP73x7Ow1e1bk+2mg0=; b=BZ+prr+k61l2dL1eqav6pr2wvlpYQX9iZFbdXC+x1vUqVAeA0UTOkVD06dAyzRKqcE11j/62LghjlB7D9QeCpeC1j9dkFkhRVppmYKSK+p/kPeXUzhVAUWTDoaQcfhy0w1IUJusfv6m4a0Wy1ejR6A6/d+Cmb2G0+jkXqqHge8j1IOpYLiyTikn4gkgK9TsUcJUq6DAlzik7jb+rXaLz/2UK+N3BVlysGonHmJeBUtuQouCC9dLb+Wt8MKNT58m8uNvxuyaS0m8OMyKp83qJT9RYIxMmYbu4/zNUJJbDZcLAnv3xzGmGfsowUN0P/QFsCngZtA1ncpPcnULSvmNdSg== 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=d8uvhqIMueOFs3ABrCGKlChMaIP73x7Ow1e1bk+2mg0=; b=Qf/7vCHkE4BZOB17Lewl4WTJTN63UptquCd3AVmR32BVCdA4uVOwjvW5toXZY8bL8pP3PxQr5fCVCpiqkqhQBcq71N+dmEa1N80teNCNn6iI3LzW8nDnzWFLavbumbPSvwd5d/o5bHwRV2Ac6Fb4IQhmCXmzfoabTo47GADjMLs= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:25 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:25 +0000 Message-ID: <878r8th2qs.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , YingKun Meng Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 29/54] ASoC: loongson: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:24 +0000 X-ClientProxiedBy: TYCP286CA0141.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: f39c8e0a-6e8d-4e49-b4b7-08dbbe5916ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ak5nFjaN2TNlKckKiF+73h3/LFKJ+8k48O/9RA/D8ycbcb8UhbDJOwfj8Syo6d329S2akQuV3BQ2YXw/3E8rZFt5mN2GEmm8Aa8ggaz/HgOBP9D3ZhPyjzrgzcdjvAbODL+TAhkcRMWCr7MrKuJZvs9A6AQmf7dRSIg74JgLclMJGae4YBPxuaQtEhBIObBVq1ZnpjI6VpRtVFxgtXoyn535A4DA7zEgVQP7auX7p2zid/CotNxEbyRNRtpTB98G/YuPNPY/GYUG3TdstrA0kiHBdyNmeN8DEx6rM+Ufcq42pr3Czp1gQ9O7M5DuSdVoPXjuR9G/k7lnNMoBC7376MFbAjjQrRww6Ck70y9TQ24xaPusS389dEuhdnOimYdmeXAA8G9TpcRlt06M7BaP826BJrXSDWhSxp3S8s/WZBJYRzr9sy1MDDFJMwi4K0tQkFxRgFUDMkOmhVo1UIfrmnjwMJUpBQ1ZW4cyw5MXuMOuohJuv/8NA4HVuon8+qdnmL8TK1GF2kCRc7fbbbiK8MEvcHaTJGgUd3meDWynCxXyr1qsBZkRlJj78+i4YKmw9CI7UQXfbU6Y/YcFhcAVj9cgz5m4J0H7J6oWaWPUTc2Lm6B+Yvv4Yzi08bTJ5IGL3KjgywS+4ifgr8CIyqcjng== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SUwkPzQCxC+0XFwrPH2krDde23ucpuo2PCF5fczsc0MYM/dXaCUC26IFVzxKwFXCLdBnSY/VdjLHc8o27lVwD26C0CKo/snwILWafaRmflHuw6D4IFbAHOp/xPtUO1uyMaFOtWew9lLdlZbfd1AouLuimqj/9cVRCD5qp6dYEmkf1gKhApL6Wu3P/6kpT2PE6EtD79eb7lRICHnv1u3KK02njofEvo0FebS86a+IQmXsGCZ2Xw4XnULUPshs8vdpfCWep1n73/SrOjV8bQv2A6GdojM/EJHKTy9VPAj+mvElN94BM79Ss23LOEDyfnOucehzPQXzYoDVY9Oe4KZVwOmAJ8UFn10DLwo34uJ40Yvs1Z+bQzqTzuXktCa4Z8JJPHBz9157WljaY0ZtXbTgcKp39FWjzUYVwRfLVRRCIgXoNEHMEM+fr99APzUU9vjF0LZD4KGYSpKZxs5w8D4XskPk5D/YWaVZGzoAqTTlZDzjVuvqCRNehmNBavaXDPvZD1L6gkVWLC0/fcydhZdiXJWbDjyzjGyfVXJLI16jAsdfd4qQHndkYODZrhi33nMMQAaMVit3cb8vggLfP194CFCvYp+GeXyHs6DC8AWYAdlxGmsOAd659oBVRvSuw9v7VwWrOywlkx2IVyLdtKOp6CzlkRIBsBV6PMN1FytTtnOS/mNAe7/fpVPRNGfYuOIF+UcZYNbUbD6B+z6/sSVyIffo4cCKl/1V/8JVSJTHELMChL+p+3doNZcHtY7pHkkA04b+Ad3asHU1B6LABtHn0lvPOmo8jEkDCfvZ54ptIQxI2EeWXYikTkw+3Intc2SeHS5v05qpoY6Owgo7y5NHxefFlbSkFCl5ncgYeZkKhWJcorq+tAcdbHefdtCgRFlQ4p6nXacrnMuBji1h5hx9bNPw7/hJzF0WN5yD2IPXFg7Z77miqUncLB/lJvkmLECEBJBGlUMIrVmNZ499NI/Cs712fL/U27A4oJ1VVD4LPDNW9mTwzi6AA6x2r/Bd5j76sv2r0WRFvOu+TJgxEyftrEeU80JPaQsFTe3tpH0VrbRoT96+YZnYNcou8vPC13lmjRZwHO3M5TKcsQHNVP9Hw736kMXt9acgPzS5KY5A4wOGV3Rs2fRdRNYHWJ6XZ4ZXRZne6yNst2geqvvoAS1JgD1gmAwUKG7gYLIX+PS2yTBdsE5xIi7Sm1G1+jT8s0CHluvijMOVS3V2JeOpZ72kaUrEtCpHA349v9Jzi9Z/Ri1WlnupRkJwJSykfMAprxiyCU7U4Itpw/8Z01pSX7c02I0gz/EoYA83UQDF2Dr3kGJBo5cMDIwq2v+lqF8PIvqk+HqNvGytJ+EY4O+ZqsyUytVVIAgZdR9byEz0qGRPWjI2wBMLoaGEg048tpdfLi/ACNlpK7ATI7+czNlHoncS9SdYiHEMwlXOOd0nEBb/H6MY2v1T3T8s2UB8Go5sLXwWJnfk632cU1uNatyou+5Qjl+PD/EzCZobBiXkcyeDRZIt77OVCq5lZ3Dg0/3f0vZere6yzarVVyULh0J0pb5a0NP9TMZ7dZccD5XJYC8At0BK1F+4Rj3HnyDiyily68om59hvLKsDCNAGf+NUuNOh5wSGYPWM+6zzDjVyHhKi4rE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f39c8e0a-6e8d-4e49-b4b7-08dbbe5916ac X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:25.2264 (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: hkhrUICkzNpcur/zFasmCNOu5cZBESOSYA+H5jK2qxKV4vkV9+vSWj+diyZIdbjPYPRKN2NXyBaHstoJfikqS0mzPIf6MZLU5F9yno4705rbsYJapDvBOSUOM7SGbDH8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: SZ7ZOSEWJU527JEPIVB3NJKTSEP4PN7Q X-Message-ID-Hash: SZ7ZOSEWJU527JEPIVB3NJKTSEP4PN7Q X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/loongson/loongson_card.c | 4 ++-- sound/soc/loongson/loongson_dma.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c index 406ee8db1a3c..e8432d466f60 100644 --- a/sound/soc/loongson/loongson_card.c +++ b/sound/soc/loongson/loongson_card.c @@ -24,8 +24,8 @@ static int loongson_card_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct loongson_card_data *ls_card = snd_soc_card_get_drvdata(rtd->card); int ret, mclk; diff --git a/sound/soc/loongson/loongson_dma.c b/sound/soc/loongson/loongson_dma.c index 65b6719e61c5..8090662e8ff2 100644 --- a/sound/soc/loongson/loongson_dma.c +++ b/sound/soc/loongson/loongson_dma.c @@ -267,7 +267,7 @@ static int loongson_pcm_open(struct snd_soc_component *component, goto pos_err; } - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); prtd->dma_data = dma_data; substream->runtime->private_data = prtd; @@ -321,7 +321,7 @@ static int loongson_pcm_new(struct snd_soc_component *component, if (!substream) continue; - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); ret = devm_request_irq(card->dev, dma_data->irq, loongson_pcm_dma_irq, From patchwork Tue Sep 26 06:23: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: 728184 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 45EB4E8181F for ; Tue, 26 Sep 2023 06:29: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 E8FD2EB3; Tue, 26 Sep 2023 08:28:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E8FD2EB3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709772; bh=4E0qIzXLeaURR14CTeTtIpAkcBuC9R42uwlRgrIIrrs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=J+zGAmt3tMDrFmnqSDGVCfMQl9jQ4Yp5HkqhqEP7iniMKPSTI53wMbEQIJ1s1hiar EdxI6WPbbX4biVUGggvk79e9uxbqTHiovR97ySfyU3W9oifld8Ji6mW8sUlDJ/V1HQ LjxG1eyWxB7F8Smv7KI1tc2fBi+0XAlYonm4QAhw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 491E0F80563; Tue, 26 Sep 2023 08:24:14 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 5FDE4F805AE; Tue, 26 Sep 2023 08:24:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 78077F80578; Tue, 26 Sep 2023 08:24:09 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20726.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::726]) (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 67C8CF805AE for ; Tue, 26 Sep 2023 08:23:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 67C8CF805AE 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=PZ7CKsMi ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GHvAl6inpNbQwEmSCJYMfVc1UDcQ24UE8qQ4gN9BoUEyubY6w3sbcapiw3S7GjvEmXlyeyWftYnE1f4ar2Nr0vMtGFiQeLkBHSyTF4+p2S4x3kOQ8pAlAWSwi+OQfy+TDQfF7HBSsDk71FdWpqgNv+LRWwZ8Uoda7NiZ2fqgG4w8+xpiQ/s4dEZ5HOl6c9asGQdnJ24Bv2QESaDSfcXlm3BzX69OeJNXTJGCfJHy0xrhLgtyGEAJzPjkXFoYnIvFy/SqVYjsiDOQVmXBX94jpEf+vrNXA2EmJ0K+ZBOqssK+M/U3VNCfuaPieEUTSPEQbpVaQKfsyCmYk8/QFGIE0A== 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=LJugF1yr62rFnjR8txIGiF2BJOKeRTKyica+lMvGcio=; b=DYrUnVKUuGCrfdc7M+TPMUtfA4cQwVW865U3kGfboEDO/OvAlLbs03xLRMduVWovPD7zTS5TIwYX0bV2NPIHRnWlfhdfMOlrempXPpKnqr7Nj8WeyPO0vjz4Cp/n3WngXIGPIZ7WpsQrYXlrDjrJRkrH2HmzneZJ/3HixeQ9iYWji+kF4PGuZ4tQCdvyyA+03QGwdjmz2N4F0bTOVqhP/6JTsx45E30y1jMGhRvJEi3pVjxqLRtEDPPAgcXqd9UbOpcYja7pGH6PaXWpLkVHlFxAvTiFsvZpOzuOkoSNRCZpGUB/Cvw2kgua6mFvMyA8D+/FTjBJkzdJkujBGGKBNQ== 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=LJugF1yr62rFnjR8txIGiF2BJOKeRTKyica+lMvGcio=; b=PZ7CKsMi3BvPNKUio99aDCJo54CNzIipaeh/aSlBJw/sxzNiz8bz+MJBA/KqlvzGR2tiUdxgWoVDAejFMMcbpWQ6cFvpH+ZXlzguyCK/wl4qk7OxTl9QutA3jBHdCW9UHbFKaEYhJ5sVejTJ1je6vy6T+wc0BmD9CivJfdsDRFY= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:36 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:36 +0000 Message-ID: <877codh2qg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22N=C3=ADcolas_F=2E_R=2E_A=2E_Prado=22?= , Ajye Huang , Alper Nebi Yasak , AngeloGioacchino Del Regno , Jaroslav Kysela , Liam Girdwood , Mark Brown , Matthias Brugger , Ricardo Ribalda Delgado , Takashi Iwai , Trevor Wu Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 30/54] ASoC: mediatek: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:35 +0000 X-ClientProxiedBy: TYCP286CA0127.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: f37e50e8-bbf6-4e46-b467-08dbbe591d71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y2MB7Yl2zKzPiC6G2QRNodTlA8cJeMl6mrlrtG8Eat/8wQBRj5hH0h8mz4ezsm3vLru+7rotDCTpOQme5oq3qmWp3g2Ax6ee4j7Ts0Yr50q1A4Eoa0+Yk4/ToU36mtDDjfbIMPNN8VzaZXh3dmJqnC18TUMKzDLfiVFZSuzlJtMiN/wM0C4oc2DAOvjHJsbISNDt8L2nqQRLNmmvVuBo75GIWGI+w/wBNQSfYhJmgObzX8WEz87pKioGya/kbvES6hWaV1Lu/fKSlaRd3y9NTb64TuDt73PhrfFQhBKxPc5UqsAEYN9Tm13/CGB9DFBge/aTZOAwYrv2FfdmrrsKNILLomg2JLpFrCzCmcVrAGY9auUnCQHdmL1qN9YmMypMmqQOZRkOIBb22n8dAvEG7waJZfcR4ahA877vqzvsS+tvgqjnzPBvZMo5jB9RljHFsX3M6Ml2TrHpOf+N7uYJqbVv6D1QBEq9foi9e7cFFwMUoyXDgkn+0kxiVmAdT4VXyfNY6nGuwz7tQEQKvmvM0riCHb/bjgB4XYY14AJn9vxwchQrtsLWbh460WuRQCY2rdsOsaJ7tPyo6Y04WMjWObbvoofKtFdyux4bOT8xImQK1RTY9X8rLiPcUtBLXuNYkDVmeE7yKJQ4rFx4hicdRavIP8CEl8BazUep0SRDpjE= 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(921005)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(30864003)(41300700001)(7416002)(21314003)(559001)(579004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fVaTDurvRJT5qjY5WZqxyn+uT4ihPWXL0KqIjPmb5hOOmUm8oG0X4m20T/ID1PZQXEhMu2TKgPSuRVwP0lBrVv+dTByNvfh3wwejEXannLfSsnmM/0iToTy5mmP1zUkKuu19Xcj0RAW8iIT7lLJuxypoz04x9N8UDpd2LXq1CmmuAYguOhbme+u6sWAABSMucUsJAYVvoQTsv46GXVRiNAuKGW/GETJFb/2IKIWJsrJ6z+CWImM1Kw0VYlIOheGOUpr13eMuUyu1JWYt8fsD04/ke814k+fVqeUdBg1hAdhkQ74RCGJesbQqs8NADgb7at5yjcw0BhNzNYl3+83dcUviMsYr5+H4URVj3gt4R54KrFEtLBb98vIOippdswf9mnJAmAQG9CLcn0JaZisV+nMTmtEH80oz+XDnuQld/Sxjs7g7QcJeZ2ayjL4a8GVSVBDnB9oB/0BUYlhpwuJsVx+wmp4JycHotNjfatSHsLbG44D8e0Ewqoi32Ju/JSM2+j/Zh3jueZTCTSVi4ZivTXAI7kX/ZK11CM7LqPi/uZ0UIzNQImcPN67JdtgOfKi3dVF1u6c8dTXfnD7yzsuVpTzXiKFF6JfdCEuKo+i9d4fy6IWymEF7i+WcLOxz3CAB57rhaDAviluH9ZWGSuf5LbJINXXnAOMl+TBQgsD5pig/Tu5SgeoTN2LHhV0S6RNYTnKMrjDIsKWqfT5hG6ONNYbzkmHxujkI8MR3EaZKawq7dY4AbbWIlZJakrml7Nc5ZZK3lRp5Yxy64lslSYC8xChB0zw2j39jBlfZDYLGAIdnaJPVNJrdu9OvHA6W09ZK4+V3pqZ2bXbdrwZ8qTbnw3c6VxqQkYeVCpq0iB7pup330V+pIxEH+/5V5BJ02Pyh3ACpiwcPzhsE/bnmUAGBTCh/OhVJuVsSX42f/J1HCSmJUwM8KcfRcq+OIABIsVRzaBeFwj925rkhZ6ciOfCIpQi7nnmkDvEcsa9wu+FYGvP/gWck+PdINM5CFTq1mEvFDg89cFbq19/uSw0L3L9AXf6tgFWhFMwAEMIIy8nm6RyF64k4C4Gn/B1o1qVzhWmJIqiG8kVPkpxIz8ew6h/plTjOF2sLyiumxIioSyptL4rqWof6yTXJgoOhc+tagVQxhQ+mENDCcZuGHveRCPa7y4H/3kVrOfCotqblrDxkG3O3D2ApnXP9pzYZW9BhJLag6ZpMdkvHcUy56hOyUVraYxESA7qQ5dgoxO8a7IRUuWFCzTF1r5+EbUqVl21pw5aTEcvGKrBiy8x/uqyu2tqNoQCJhtPvME12yEbzxGGZGNAkD0z1IuuyzVQoGTE1fIfkX8ME92fyBPNVuSLB/RsgsivyzolpTaYKBaG2vdIthVKv1PHh/6Atu4tc97YfdDNkcSkdzwiULBWoehmCxEkyxO9OgCr6DebvqcHZoMq6neF+MGGhzR3mXg6EV6B5YMRnUJdVFxaamwatafdN4tn+1uqHnPFIE3EUk7/hgzSSWSkoUab3YFzNavIE3fA1zbnTfm/cvYhTpHxFpFDh4TzX/PqCaYG97JLOMYMc4MozlvSlAR5GOSQCdZjiYpbbbMdg3EXx4ydL4QUb5QJL3hK5seXD10FkOMEPpqbnAvNaD98= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f37e50e8-bbf6-4e46-b467-08dbbe591d71 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:36.1423 (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: mYLcGBqwscKlIMzyTdppXYjV/ccKtpAyvwYFVOQj72KfqYUENT/aQHCC9mU6vpgdvyOQ7PPo1hbdewPLzCLWVBSBofml5VCZAMJm/m+gJk+Q/W1JWrr7dBa/I4eNA5e/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: PCY4UAMSJV3373VNRV3T6EDK2K2K6CBH X-Message-ID-Hash: PCY4UAMSJV3373VNRV3T6EDK2K2K6CBH X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 22 ++++++++-------- .../mediatek/common/mtk-afe-platform-driver.c | 4 +-- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +-- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 6 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 ++--- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 6 ++--- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 4 +-- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 ++--- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 4 +-- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 6 ++--- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 8 +++--- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 6 ++--- .../mediatek/mt8183/mt8183-da7219-max98357.c | 14 +++++----- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 18 ++++++------- sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 12 ++++----- .../mediatek/mt8186/mt8186-mt6366-common.c | 2 +- .../mt8186/mt8186-mt6366-da7219-max98357.c | 14 +++++----- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 12 ++++----- sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 8 +++--- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 22 ++++++++-------- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 6 ++--- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 22 ++++++++-------- sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 10 +++---- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 26 +++++++++---------- 24 files changed, 124 insertions(+), 124 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-afe-fe-dai.c b/sound/soc/mediatek/common/mtk-afe-fe-dai.c index 395be97f13ae..3044d9ab3d4d 100644 --- a/sound/soc/mediatek/common/mtk-afe-fe-dai.c +++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.c @@ -37,10 +37,10 @@ static int mtk_regmap_write(struct regmap *map, int reg, unsigned int val) int mtk_afe_fe_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct snd_pcm_runtime *runtime = substream->runtime; - int memif_num = asoc_rtd_to_cpu(rtd, 0)->id; + int memif_num = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[memif_num]; const struct snd_pcm_hardware *mtk_afe_hardware = afe->mtk_afe_hardware; int ret; @@ -98,9 +98,9 @@ EXPORT_SYMBOL_GPL(mtk_afe_fe_startup); void mtk_afe_fe_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - struct mtk_base_afe_memif *memif = &afe->memif[asoc_rtd_to_cpu(rtd, 0)->id]; + struct mtk_base_afe_memif *memif = &afe->memif[snd_soc_rtd_to_cpu(rtd, 0)->id]; int irq_id; irq_id = memif->irq_usage; @@ -120,9 +120,9 @@ int mtk_afe_fe_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; int ret; unsigned int channels = params_channels(params); @@ -196,10 +196,10 @@ EXPORT_SYMBOL_GPL(mtk_afe_fe_hw_free); int mtk_afe_fe_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime * const runtime = substream->runtime; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; struct mtk_base_afe_irq *irqs = &afe->irqs[memif->irq_usage]; const struct mtk_base_irq_data *irq_data = irqs->irq_data; @@ -263,9 +263,9 @@ EXPORT_SYMBOL_GPL(mtk_afe_fe_trigger); int mtk_afe_fe_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int pbuf_size; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { @@ -523,7 +523,7 @@ EXPORT_SYMBOL_GPL(mtk_memif_set_rate); int mtk_memif_set_rate_substream(struct snd_pcm_substream *substream, int id, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.c b/sound/soc/mediatek/common/mtk-afe-platform-driver.c index 01501d5747a7..32edcb6d5219 100644 --- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c +++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c @@ -80,9 +80,9 @@ EXPORT_SYMBOL_GPL(mtk_afe_add_sub_dai_control); snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - struct mtk_base_afe_memif *memif = &afe->memif[asoc_rtd_to_cpu(rtd, 0)->id]; + struct mtk_base_afe_memif *memif = &afe->memif[snd_soc_rtd_to_cpu(rtd, 0)->id]; const struct mtk_base_memif_data *memif_data = memif->data; struct regmap *regmap = afe->regmap; struct device *dev = afe->dev; diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c index c9d4420e9b4c..86885117f7f7 100644 --- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c +++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c @@ -494,10 +494,10 @@ static int mt2701_dlm_fe_trigger(struct snd_pcm_substream *substream, static int mt2701_memif_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int fs; - if (asoc_rtd_to_cpu(rtd, 0)->id != MT2701_MEMIF_ULBT) + if (snd_soc_rtd_to_cpu(rtd, 0)->id != MT2701_MEMIF_ULBT) fs = mt2701_afe_i2s_fs(rate); else fs = (rate == 16000 ? 1 : 0); diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c index 08ef109744c7..fc80e2cfb5b9 100644 --- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c +++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c @@ -127,9 +127,9 @@ static const struct snd_soc_ops mt2701_cs42448_48k_fe_ops = { static int mt2701_cs42448_be_ops_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int mclk_rate; unsigned int rate = params_rate(params); unsigned int div_mclk_over_bck = rate > 192000 ? 2 : 4; diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c index a184032c15b6..8a6643bfe830 100644 --- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c +++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c @@ -24,9 +24,9 @@ static const struct snd_kcontrol_new mt2701_wm8960_controls[] = { static int mt2701_wm8960_be_ops_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); unsigned int mclk_rate; unsigned int rate = params_rate(params); unsigned int div_mclk_over_bck = rate > 192000 ? 2 : 4; diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c b/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c index 43038444c43d..da7267c684b1 100644 --- a/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c +++ b/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c @@ -139,18 +139,18 @@ static const struct snd_pcm_hardware mt6797_afe_hardware = { static int mt6797_memif_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; return mt6797_rate_transform(afe->dev, rate, id); } static int mt6797_irq_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c index 06269f7e3756..b6291b7c811e 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -480,10 +480,10 @@ static int mt8173_afe_hdmi_trigger(struct snd_pcm_substream *substream, int cmd, static int mt8173_memif_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - struct mtk_base_afe_memif *memif = &afe->memif[asoc_rtd_to_cpu(rtd, 0)->id]; + struct mtk_base_afe_memif *memif = &afe->memif[snd_soc_rtd_to_cpu(rtd, 0)->id]; int fs; if (memif->data->id == MT8173_AFE_MEMIF_DAI || diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c index bfb2094758ff..3c5c22132c92 100644 --- a/sound/soc/mediatek/mt8173/mt8173-max98090.c +++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c @@ -52,8 +52,8 @@ static const struct snd_kcontrol_new mt8173_max98090_controls[] = { static int mt8173_max98090_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); return snd_soc_dai_set_sysclk(codec_dai, 0, params_rate(params) * 256, SND_SOC_CLOCK_IN); @@ -67,7 +67,7 @@ static int mt8173_max98090_init(struct snd_soc_pcm_runtime *runtime) { int ret; struct snd_soc_card *card = runtime->card; - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; /* enable jack detection */ ret = snd_soc_card_jack_new_pins(card, "Headphone", SND_JACK_HEADSET, diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index e502cd1670ba..fe1235d3de64 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -54,7 +54,7 @@ static struct snd_soc_jack_pin mt8173_rt5650_rt5514_jack_pins[] = { static int mt8173_rt5650_rt5514_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int i, ret; @@ -84,7 +84,7 @@ static struct snd_soc_jack mt8173_rt5650_rt5514_jack; static int mt8173_rt5650_rt5514_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; int ret; rt5645_sel_asrc_clk_src(component, diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index ffb094284bfb..892387c4dd18 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -58,7 +58,7 @@ static struct snd_soc_jack_pin mt8173_rt5650_rt5676_jack_pins[] = { static int mt8173_rt5650_rt5676_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int i, ret; @@ -88,8 +88,8 @@ static struct snd_soc_jack mt8173_rt5650_rt5676_jack; static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; - struct snd_soc_component *component_sub = asoc_rtd_to_codec(runtime, 1)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component_sub = snd_soc_rtd_to_codec(runtime, 1)->component; int ret; rt5645_sel_asrc_clk_src(component, diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index 18cf84bb25c7..0be737a11701 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -68,7 +68,7 @@ static struct snd_soc_jack_pin mt8173_rt5650_jack_pins[] = { static int mt8173_rt5650_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int mclk_clock; struct snd_soc_dai *codec_dai; int i, ret; @@ -114,8 +114,8 @@ static struct snd_soc_jack mt8173_rt5650_jack, mt8173_rt5650_hdmi_jack; static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; - const char *codec_capture_dai = asoc_rtd_to_codec(runtime, 1)->name; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; + const char *codec_capture_dai = snd_soc_rtd_to_codec(runtime, 1)->name; int ret; rt5645_sel_asrc_clk_src(component, @@ -166,7 +166,7 @@ static int mt8173_rt5650_hdmi_init(struct snd_soc_pcm_runtime *rtd) if (ret) return ret; - return snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, + return snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, &mt8173_rt5650_hdmi_jack, NULL); } diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c index 90422ed2bbcc..9e432ed9124b 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c @@ -142,18 +142,18 @@ static const struct snd_pcm_hardware mt8183_afe_hardware = { static int mt8183_memif_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; return mt8183_rate_transform(afe->dev, rate, id); } static int mt8183_irq_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index 701fbcc0f2c9..a0b4eeece9b7 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -47,12 +47,12 @@ static struct snd_soc_jack_pin mt8183_da7219_max98357_jack_pins[] = { static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 128; unsigned int mclk_fs = rate * mclk_fs_ratio; - return snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), + return snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk_fs, SND_SOC_CLOCK_OUT); } @@ -63,7 +63,7 @@ static const struct snd_soc_ops mt8183_mt6358_i2s_ops = { static int mt8183_da7219_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 256; @@ -71,7 +71,7 @@ static int mt8183_da7219_i2s_hw_params(struct snd_pcm_substream *substream, unsigned int freq; int ret = 0, j; - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk_fs, SND_SOC_CLOCK_OUT); if (ret < 0) dev_err(rtd->dev, "failed to set cpu dai sysclk\n"); @@ -104,7 +104,7 @@ static int mt8183_da7219_i2s_hw_params(struct snd_pcm_substream *substream, static int mt8183_da7219_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret = 0, j; @@ -132,7 +132,7 @@ static int mt8183_da7219_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int rate = params_rate(params); struct snd_soc_dai *codec_dai; int ret = 0, i; @@ -383,7 +383,7 @@ static int mt8183_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *rtd) if (ret) return ret; - return snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, + return snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, &priv->hdmi_jack, NULL); } diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 850f4d949d97..1771c26b0445 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -43,12 +43,12 @@ struct mt8183_mt6358_ts3a227_max98357_priv { static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 128; unsigned int mclk_fs = rate * mclk_fs_ratio; - return snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), + return snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk_fs, SND_SOC_CLOCK_OUT); } @@ -60,7 +60,7 @@ static int mt8183_mt6358_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 128; unsigned int mclk_fs = rate * mclk_fs_ratio; @@ -84,7 +84,7 @@ mt8183_mt6358_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, } } - return snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), + return snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk_fs, SND_SOC_CLOCK_OUT); } @@ -302,7 +302,7 @@ SND_SOC_DAILINK_DEFS(tdm, static int mt8183_mt6358_tdm_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mt8183_mt6358_ts3a227_max98357_priv *priv = snd_soc_card_get_drvdata(rtd->card); int ret; @@ -321,7 +321,7 @@ static int mt8183_mt6358_tdm_startup(struct snd_pcm_substream *substream) static void mt8183_mt6358_tdm_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct mt8183_mt6358_ts3a227_max98357_priv *priv = snd_soc_card_get_drvdata(rtd->card); int ret; @@ -345,7 +345,7 @@ static int mt8183_mt6358_ts3a227_max98357_wov_startup( struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct mt8183_mt6358_ts3a227_max98357_priv *priv = snd_soc_card_get_drvdata(card); @@ -358,7 +358,7 @@ static void mt8183_mt6358_ts3a227_max98357_wov_shutdown( struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct mt8183_mt6358_ts3a227_max98357_priv *priv = snd_soc_card_get_drvdata(card); @@ -388,7 +388,7 @@ mt8183_mt6358_ts3a227_max98357_hdmi_init(struct snd_soc_pcm_runtime *rtd) if (ret) return ret; - return snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, + return snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, &priv->hdmi_jack, NULL); } diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c b/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c index b86159f70a33..bfcfc68ac64d 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c @@ -43,7 +43,7 @@ static int mt8186_fe_startup(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct snd_pcm_runtime *runtime = substream->runtime; - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; const struct snd_pcm_hardware *mtk_afe_hardware = afe->mtk_afe_hardware; int ret; @@ -85,7 +85,7 @@ static void mt8186_fe_shutdown(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct mt8186_afe_private *afe_priv = afe->platform_priv; - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; int irq_id = memif->irq_usage; @@ -106,7 +106,7 @@ static int mt8186_fe_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; unsigned int channels = params_channels(params); unsigned int rate = params_rate(params); int ret; @@ -157,7 +157,7 @@ static int mt8186_fe_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_pcm_runtime * const runtime = substream->runtime; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct mt8186_afe_private *afe_priv = afe->platform_priv; - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; int irq_id = memif->irq_usage; struct mtk_base_afe_irq *irqs = &afe->irqs[irq_id]; @@ -256,7 +256,7 @@ static int mt8186_memif_fs(struct snd_pcm_substream *substream, struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; return mt8186_rate_transform(afe->dev, rate, id); } @@ -293,7 +293,7 @@ static int mt8186_fe_prepare(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_pcm_runtime * const runtime = substream->runtime; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; int irq_id = memif->irq_usage; struct mtk_base_afe_irq *irqs = &afe->irqs[irq_id]; diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-common.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-common.c index 4e66603d4cdb..fa08eb0654d8 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-common.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-common.c @@ -18,7 +18,7 @@ int mt8186_mt6366_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *cmpnt_afe = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct mt8186_afe_private *afe_priv = afe->platform_priv; struct snd_soc_dapm_context *dapm = &rtd->card->dapm; diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index aa8e00bba19b..f795190f92a2 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -77,7 +77,7 @@ static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd) struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv; struct snd_soc_jack *jack = &priv->headset_jack; struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = mt8186_dai_i2s_set_share(afe, "I2S1", "I2S0"); @@ -111,7 +111,7 @@ static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd) static int mt8186_da7219_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 256; @@ -119,7 +119,7 @@ static int mt8186_da7219_i2s_hw_params(struct snd_pcm_substream *substream, unsigned int freq; int ret, j; - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk_fs, SND_SOC_CLOCK_OUT); if (ret < 0) { dev_err(rtd->dev, "failed to set cpu dai sysclk: %d\n", ret); @@ -159,7 +159,7 @@ static int mt8186_da7219_i2s_hw_params(struct snd_pcm_substream *substream, static int mt8186_da7219_i2s_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret = 0, j; @@ -189,7 +189,7 @@ static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *r snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv; @@ -281,7 +281,7 @@ static int mt8186_mt6366_da7219_max98357_playback_startup(struct snd_pcm_substre .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; @@ -327,7 +327,7 @@ static int mt8186_mt6366_da7219_max98357_capture_startup(struct snd_pcm_substrea .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index 9c11016f032c..6be33892be0a 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -169,7 +169,7 @@ static int mt8186_rt5682s_init(struct snd_soc_pcm_runtime *rtd) struct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv; struct snd_soc_jack *jack = &priv->headset_jack; struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = mt8186_dai_i2s_set_share(afe, "I2S1", "I2S0"); @@ -202,8 +202,8 @@ static int mt8186_rt5682s_i2s_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 128; unsigned int mclk_fs = rate * mclk_fs_ratio; @@ -253,7 +253,7 @@ static int mt8186_mt6366_rt1019_rt5682s_hdmi_init(struct snd_soc_pcm_runtime *rt snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv; @@ -345,7 +345,7 @@ static int mt8186_mt6366_rt1019_rt5682s_playback_startup(struct snd_pcm_substrea .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; @@ -391,7 +391,7 @@ static int mt8186_mt6366_rt1019_rt5682s_capture_startup(struct snd_pcm_substream .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; diff --git a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c index 5e14655c5617..46d6a5540403 100644 --- a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c +++ b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c @@ -98,7 +98,7 @@ static int mt8188_memif_fs(struct snd_pcm_substream *substream, struct mtk_base_afe_memif *memif = NULL; struct mtk_dai_memif_priv *memif_priv = NULL; int fs = mt8188_afe_fs_timing(rate); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; if (id < 0) return -EINVAL; @@ -303,7 +303,7 @@ static int mt8188_afe_fe_startup(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_pcm_runtime *runtime = substream->runtime; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int ret; ret = mtk_afe_fe_startup(substream, dai); @@ -336,7 +336,7 @@ static int mt8188_afe_fe_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; const struct mtk_base_memif_data *data = memif->data; const struct mt8188_afe_channel_merge *cm = mt8188_afe_found_cm(dai); @@ -360,7 +360,7 @@ static int mt8188_afe_fe_trigger(struct snd_pcm_substream *substream, int cmd, const struct mt8188_afe_channel_merge *cm = mt8188_afe_found_cm(dai); struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_pcm_runtime * const runtime = substream->runtime; - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; struct mtk_base_afe_irq *irqs = &afe->irqs[memif->irq_usage]; const struct mtk_base_irq_data *irq_data = irqs->irq_data; diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index e2416b981e1f..1564eaa1b290 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -338,7 +338,7 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *cmpnt_afe = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_dapm_widget *pin_w = NULL, *w; struct mtk_base_afe *afe; struct mt8188_afe_private *afe_priv; @@ -500,7 +500,7 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) static int mt8188_mt6359_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; /* set mtkaif protocol */ mt6359_set_mtkaif_protocol(cmpnt_codec, @@ -556,7 +556,7 @@ static int mt8188_dptx_hw_params(struct snd_pcm_substream *substream, unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 256; unsigned int mclk_fs = rate * mclk_fs_ratio; - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); return snd_soc_dai_set_sysclk(dai, 0, mclk_fs, SND_SOC_CLOCK_OUT); } @@ -581,7 +581,7 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) { struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8188_mt6359_priv *priv = soc_card_data->mach_priv; - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret = 0; ret = snd_soc_card_jack_new_pins(rtd->card, "HDMI Jack", @@ -607,7 +607,7 @@ static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) { struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8188_mt6359_priv *priv = soc_card_data->mach_priv; - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret = 0; ret = snd_soc_card_jack_new_pins(rtd->card, "DP Jack", SND_JACK_LINEOUT, @@ -655,7 +655,7 @@ static int mt8188_max98390_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; unsigned int bit_width = params_width(params); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; int i; @@ -728,7 +728,7 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_card *card = rtd->card; struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card); struct mt8188_mt6359_priv *priv = soc_card_data->mach_priv; - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack = &priv->headset_jack; int ret; @@ -774,7 +774,7 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } @@ -782,8 +782,8 @@ static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd) static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int rate = params_rate(params); unsigned int bit_width = params_width(params); int clk_freq, ret; @@ -816,7 +816,7 @@ static const struct snd_soc_ops mt8188_nau8825_ops = { static int mt8188_sof_be_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *cmpnt_afe = NULL; struct snd_soc_pcm_runtime *runtime; diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c index d0520e7e1d79..bdd1e91824d9 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c @@ -42,11 +42,11 @@ static const struct snd_pcm_hardware mt8192_afe_hardware = { static int mt8192_memif_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; return mt8192_rate_transform(afe->dev, rate, id); } @@ -59,7 +59,7 @@ static int mt8192_get_dai_fs(struct mtk_base_afe *afe, static int mt8192_irq_fs(struct snd_pcm_substream *substream, unsigned int rate) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index 5e163e23a207..fe3562ea83ce 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -58,9 +58,9 @@ static struct snd_soc_jack_pin mt8192_jack_pins[] = { static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 128; @@ -93,10 +93,10 @@ static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, static int mt8192_rt5682x_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int rate = params_rate(params); unsigned int mclk_fs_ratio = 128; unsigned int mclk_fs = rate * mclk_fs_ratio; @@ -149,7 +149,7 @@ static int mt8192_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *cmpnt_afe = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct mt8192_afe_private *afe_priv = afe->platform_priv; int phase; @@ -306,7 +306,7 @@ static int mt8192_mt6359_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *cmpnt_afe = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct mt8192_afe_private *afe_priv = afe->platform_priv; @@ -327,7 +327,7 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd) snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mt8192_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_jack *jack = &priv->headset_jack; int ret; @@ -360,7 +360,7 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd) static int mt8192_mt6359_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mt8192_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card); int ret; @@ -406,7 +406,7 @@ mt8192_mt6359_cap1_startup(struct snd_pcm_substream *substream) .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; @@ -453,7 +453,7 @@ mt8192_mt6359_rt5682_startup(struct snd_pcm_substream *substream) .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c index a0f2012211fb..1e33863c85ca 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c @@ -88,7 +88,7 @@ static int mt8195_memif_fs(struct snd_pcm_substream *substream, struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; int fs = mt8195_afe_fs_timing(rate); @@ -284,7 +284,7 @@ mt8195_afe_paired_memif_clk_prepare(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct mt8195_afe_private *afe_priv = afe->platform_priv; - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int clk_id; if (id != MT8195_AFE_MEMIF_DL8 && id != MT8195_AFE_MEMIF_DL10) @@ -313,7 +313,7 @@ mt8195_afe_paired_memif_clk_enable(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct mt8195_afe_private *afe_priv = afe->platform_priv; - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int clk_id; if (id != MT8195_AFE_MEMIF_DL8 && id != MT8195_AFE_MEMIF_DL10) @@ -345,7 +345,7 @@ static int mt8195_afe_fe_startup(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_pcm_runtime *runtime = substream->runtime; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int ret = 0; mt8195_afe_paired_memif_clk_prepare(substream, dai, 1); @@ -382,7 +382,7 @@ static int mt8195_afe_fe_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); - int id = asoc_rtd_to_cpu(rtd, 0)->id; + int id = snd_soc_rtd_to_cpu(rtd, 0)->id; struct mtk_base_afe_memif *memif = &afe->memif[id]; const struct mtk_base_memif_data *data = memif->data; const struct mt8195_afe_channel_merge *cm = mt8195_afe_found_cm(dai); diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index ceca882ecff7..9138f38861ff 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -146,7 +146,7 @@ static int mt8195_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *cmpnt_afe = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct mt8195_afe_private *afe_priv = afe->platform_priv; struct mtkaif_param *param = &afe_priv->mtkaif_params; @@ -307,7 +307,7 @@ static int mt8195_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) static int mt8195_mt6359_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; /* set mtkaif protocol */ mt6359_set_mtkaif_protocol(cmpnt_codec, @@ -338,7 +338,7 @@ static int mt8195_hdmitx_dptx_startup(struct snd_pcm_substream *substream) .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; @@ -369,7 +369,7 @@ static int mt8195_dptx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); return snd_soc_dai_set_sysclk(cpu_dai, 0, params_rate(params) * 256, SND_SOC_CLOCK_OUT); @@ -384,7 +384,7 @@ static int mt8195_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8195_mt6359_priv *priv = soc_card_data->mach_priv; struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT, @@ -400,7 +400,7 @@ static int mt8195_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8195_mt6359_priv *priv = soc_card_data->mach_priv; struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, @@ -442,7 +442,7 @@ static int mt8195_playback_startup(struct snd_pcm_substream *substream) .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; @@ -488,7 +488,7 @@ static int mt8195_capture_startup(struct snd_pcm_substream *substream) .mask = 0, }; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; int ret; @@ -520,8 +520,8 @@ static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int rate = params_rate(params); int bitwidth; int ret; @@ -563,7 +563,7 @@ static const struct snd_soc_ops mt8195_rt5682_etdm_ops = { static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; + snd_soc_rtd_to_codec(rtd, 0)->component; struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct mt8195_mt6359_priv *priv = soc_card_data->mach_priv; struct snd_soc_jack *jack = &priv->headset_jack; @@ -603,7 +603,7 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) static int mt8195_rt1011_etdm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; struct snd_soc_card *card = rtd->card; int srate, i, ret; @@ -636,7 +636,7 @@ static const struct snd_soc_ops mt8195_rt1011_etdm_ops = { static int mt8195_sof_be_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *cmpnt_afe = NULL; struct snd_soc_pcm_runtime *runtime; From patchwork Tue Sep 26 06:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726438 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 992CBEE020C for ; Tue, 26 Sep 2023 06:29:53 +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 917B6FCB; Tue, 26 Sep 2023 08:29:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 917B6FCB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709791; bh=4rfzFU13D9pRjlCMxBFXyVrUxUyQB6CguSmje4jFwLc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=gITc1M1Cfe15yNOAkNEdLkk6VklNiIdQ7GSxXNi2edJD38bQImChUUMFoL6hifpTq 8wynVsKi5RwtDG8LPWRb+g3J8O9XwhtM85FW4ezoE6DA1p/Jegb3VHJnrmClFC6G0h 2yUqQTrP4VtIIeT2qDa8FqrQVojR7zTi12+mxI2w= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 052CDF80551; Tue, 26 Sep 2023 08:24:16 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 09582F8068F; Tue, 26 Sep 2023 08:24:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D692DF80564; Tue, 26 Sep 2023 08:24:10 +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 3F128F805E3 for ; Tue, 26 Sep 2023 08:23:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3F128F805E3 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=arA+JePB ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n47j3h3cPeksvNsGblGTYW+zh+kN0ppL4WEFW5l0TrHe17+4FGz1C4rDWhYrviZqlFGwW9zBF4/HZvYe3vgtumCIhBlXy1t+nRHi4U02lDmUtlzSMrVQaBrUB+EH+x9NsBd0gddH+plSJpsifejUj8+eG7JLIn9HaMbQE5CXE/SGB+zWoLjfYOi7KVYZoBJfcUh4Od/EVLC5lSd5UaLuVz6NFD/Tk0uNVtq13g8S2llVDXahDwi30MjHrvaKgP7a/YqAJb+Tdl9OWIp19ImRdLU0ox/O9yfoAKTCVTIe1RXunyjdrBxJnEwl8JXh53YvjQzaOL/f/dvf2/Z1+X8qxg== 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=LD5grfTtkRq4nbBfn/AKspHCx4hYDINip0/Py7OSUw8=; b=J7jVFiA+JeDyR7fVwlP+4dQ7YiKl3FZ6no/epwZt6NVcqu27tz7KzaeIlndeZMm1zIv67TVGVENUuzsv8hOeFT7R+5My2wA3TGcOfIx3R+ymza0uToYwLZngo8/qe1/HKRWXKWHGdIO1OXnLD8evcszcYfTBCK8SdtTg5YJKMNWzqpGvXecMh5tRBnHvgM+5NQglp725s9gQoflBLsSi2uXciF0iuFmEF+zCi/7FTQ5rwVnkFmBMy/8K2oHewSYL+50eT2ggkI28A/JdT9MoMDsdJWev9Mr6YK+hvKZQxAuY5dSw1hqZGnfSJ/G4bBE8jbpLumVvpZY+WR7OkofIfw== 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=LD5grfTtkRq4nbBfn/AKspHCx4hYDINip0/Py7OSUw8=; b=arA+JePBd40oDydy2Q31nNT7ESigqILTOVPQdhJDf+SHdF32mT1LZ4ILuLZT5dMBvQaml39s+IYnNgJevBjNCnB9Vj/lygpHcRKTgKhS/K9l4DtBwd05TQUt68FwD5r7v8lstVAbs3ZAlDpngRkLg9MOjJdDIcdcjfb+N3+bJmE= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:42 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:42 +0000 Message-ID: <875y3xh2qa.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alper Nebi Yasak , Heiko Stuebner , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 31/54] ASoC: rockchip: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:42 +0000 X-ClientProxiedBy: TYCPR01CA0066.jpnprd01.prod.outlook.com (2603:1096:405:2::30) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 33297591-c5dd-4a0d-e022-08dbbe592179 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bi7SBsmA86utmcdg2+BBgbhsJRKpeWxspYhwfTctJbhbutfoHby85SJUpXMg1jC40p6RxKu29muVhNyEL8cx2mfl4+0zj2mSojPI9YbPlF/zFNEYsWapYdZq9qluwM7YPat/y9SzRJTIZ+n/4EMSmQVeykjCHXuQRqra7DsJ17yI5LY2E5PVx8DCyA/Xl2Mux+QjNRZiOnekn1DFeIunYFST5lCthnprBG/N5BcLk2Q7Q2acXWWq8+HbM98TZtlKWg3CndR203DdJdlRUNLqbml3Z4r59qjaHb/KeqeIR0lYttHXT/B20Pr80spIH01W5Fqyra5C5/ArxBUWg6aH1PK9scVpzHTOPEf34P6HJtGH0/EvdJNTKPfIeOYKludQrj4Zoo9UhXLm39ijJ0YyqySv+6+Ox8Ph+1lno7ow0mi6vNQVkcRwSdoPyvAL3i8j+7O9fZQfLcMY9Vmeby7T9QqLRn7cFib1AkZjilJQlem2UiNf751aqSFWpw+YhIrDJdYC21xc3O3aWflHu05tOslOpoIZBx0RxsJ2qPp1E/Bc0cfYIqjh70frc6WoZqlVq+KQP8LkAVUYSWsMGAd9+anBt1EO34vmmsheku4Y0O1tWQlUTyASkoX6US9wwCzqg43w0WqiF3NdxEkBBtVmsA== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VVC4gitVSFOAVz/N1UPkGTq9w5i8lXDosR3vU7kMlIpy0Vkm0kQxMaA7HJ3mInyDc9g2bkKboxkHhDLdn5ZLUQl6V4v4aM5LLtQkJedePOMe1/asYbT1YZAXdYGN35eZ3f/VEqj3MnzAmJpfRvF0Cn42QeMH6hs6WvQ96eLpYW6J/B5QhBdIhIfxUOnyBfx1gizxnCEcPsPC0iK0/gaMIZDmbWP+3FybVSDfcjWcNwHb6B6K5rq7vpNilPiur6XteXrO/bFCaVH0Pe+Q3FIX12+BRyjkimXNK6paidZ6yqEDNfZuGKU11HfYbkZk3gPAcYBXSclWeWb/0R7zrlv+DDmS04krNrwbmUSRhVHneUG8izm2TZj1Tz1h3BnFVNgV5Mt9Mqd7TIHXrbE2y+Nwt0KGU7LTVEEM7zTbyZ7pPn3VztcjPU58tSN9SMPNaWbmlSDIZdqSq75nbdWL+U5HpojrKUWaj08Rn39IZvgkqDh1QYEA6RIFhNIG2iCthmP2FSjzN+2bW9IuSdJexe8vzikMOnTt8aK2FPGAQkTh7+4rsz8+xZgO4JzR08cEowoRyq0CYfhg55+GSjgPUWXkWPp/6yttawvbVCnkdoqhRgTys3GGGRnFELed2nXwcfaCceh6yoaICTcagO+Br0m4KY4onTxcONwvgCQ+rLOqe5P0huRi+MZV6pKpf2IvNwPoAyiHdhEvWGqo+zCqqHzz7ZWwd83KEoLXNKDW8L0NDl4IytOHBFl0yKm+VTKJ8ADLeejlaK+d6obmjO1GHkTmYuGbDw7C2D+0MlOdb8VyDMBb5vxI4r3WRSRXoN/r3UEO+lAGSxrhE2+kzdfv3Ce5EVI2nXJDR18JpQdcxWpBxecSddELZP5vt8M7o2woVPsp1y54Uqhhe5WGA+qmMULAKFWmJB0sGE3Fz8ovJMYmRw/rqCZxV9jE01jT3Br7Ca3hRzm5fmf2uHoAYXojur5/up7wGs48MNRKP7anMadsgpzcPIXiGBzLQ+WAYHxuo1+hE6PrDhdj/yYRG9vOPt26cXgGTVUdDsLgaNwKEOzu6MLOyx+jt4pM+mudg9hGc4Aos0KhPqgsjlrFRJLDSeCyEwAsNTiygjzMMKEtr95yRak7sGzIoKnJYJsfx2tlL9ML8WojCHiZ6qzxYcOGDxUWjMj68XCkOYDCVSiFdCHYUmR6UlvWIxtf2uNQwq0UTLrnWOTS7bM5b1V907tjc6l4bwX5+zcyb0lbJGJ6Z2dBsO6PNzp3n3gN2XughitsOnLkH0Vj1i57C4T3K2kBDGnAibbwdQiIWJre68QM9u6rw53mCDmhTJDAbBNZ9ch8sv7hqDXG/qQBtReA5Xqv961BsTG8ZY/r8faTbHgG3kiIXwgxi7AJSt+nkd0kYbjY2H7Lj18Ns8uxMnqEpuxX6Rl7tnc++1vGPa5hL4FvegxC269tujlw4aqeNpJmGidKaoYS2J46Nfmp4dyqak2TYWp10nRlqI0vLypkeOJH3OeDHVqRdwdE9s9EszAC1fYgi4vDuUDr+zZEl2YwvWcb3reow6Ci3+4NbRCg9gDB14O2cx/gj1V9WTGnUkCat5aYEjkkoSBrqpE23DdkZhcpAW4AkdfBmuP0ghoohdIU6Ea3c88= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33297591-c5dd-4a0d-e022-08dbbe592179 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:42.8334 (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: A3Gi1kZilslB32rtDWHO8wQ7jXgza596cPsVfIRVN3Z8+YlmeHgc1GrJVKoLuFsafTDqo1JteXIwl0ujxYMh1ydPlE/u1M5oeEx9Wu0fH5cDc4cVjCPVSexqAPkO3Axl X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: 7TTT5634QZTAKLVEQG25RB2QNWE2ZXJX X-Message-ID-Hash: 7TTT5634QZTAKLVEQG25RB2QNWE2ZXJX X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/rockchip/rk3288_hdmi_analog.c | 6 +++--- sound/soc/rockchip/rk3399_gru_sound.c | 26 ++++++++++++------------- sound/soc/rockchip/rockchip_i2s.c | 2 +- sound/soc/rockchip/rockchip_max98090.c | 8 ++++---- sound/soc/rockchip/rockchip_rt5645.c | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c index 0c6bd9a019db..5ff499c81d3f 100644 --- a/sound/soc/rockchip/rk3288_hdmi_analog.c +++ b/sound/soc/rockchip/rk3288_hdmi_analog.c @@ -66,9 +66,9 @@ static int rk_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { int ret = 0; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int mclk; switch (params_rate(params)) { diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 0f704d22d21b..4c3b8b363530 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -68,13 +68,13 @@ static const struct snd_kcontrol_new rockchip_controls[] = { static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int mclk; int ret; mclk = params_rate(params) * SOUND_FS; - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, mclk, 0); + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk, 0); if (ret) { dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n", __func__, mclk, ret); @@ -87,9 +87,9 @@ static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substrea static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int mclk; int ret; @@ -119,9 +119,9 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int mclk, ret; /* in bypass mode, the mclk has to be one of the frequencies below */ @@ -172,7 +172,7 @@ static struct snd_soc_jack cdn_dp_card_jack; static int rockchip_sound_cdndp_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_card *card = rtd->card; int ret; @@ -189,8 +189,8 @@ static int rockchip_sound_cdndp_init(struct snd_soc_pcm_runtime *rtd) static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* We need default MCLK and PLL settings for the accessory detection */ @@ -238,13 +238,13 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) static int rockchip_sound_dmic_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int mclk; int ret; mclk = params_rate(params) * SOUND_FS; - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, mclk, 0); + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), 0, mclk, 0); if (ret) { dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n", __func__, mclk, ret); diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 834fbb5cf810..74e7d6ee0f28 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -352,7 +352,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct rk_i2s_dev *i2s = to_info(dai); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); unsigned int val = 0; unsigned int mclk_rate, bclk_rate, div_bclk, div_lrck; diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 150ac524a590..17087b504a37 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -144,9 +144,9 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { int ret = 0; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int mclk; switch (params_rate(params)) { @@ -226,7 +226,7 @@ static struct snd_soc_jack rk_hdmi_jack; static int rk_hdmi_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; int ret; /* enable jack detection */ diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c index ef9fdf0386cb..d5cfef9be1af 100644 --- a/sound/soc/rockchip/rockchip_rt5645.c +++ b/sound/soc/rockchip/rockchip_rt5645.c @@ -65,9 +65,9 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { int ret = 0; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int mclk; switch (params_rate(params)) { @@ -125,7 +125,7 @@ static int rk_init(struct snd_soc_pcm_runtime *runtime) return ret; } - return rt5645_set_jack_detect(asoc_rtd_to_codec(runtime, 0)->component, + return rt5645_set_jack_detect(snd_soc_rtd_to_codec(runtime, 0)->component, &headset_jack, &headset_jack, &headset_jack); From patchwork Tue Sep 26 06:23:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728183 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 F39F4E8181F for ; Tue, 26 Sep 2023 06:30:07 +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 DB8A2A4E; Tue, 26 Sep 2023 08:29:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DB8A2A4E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709805; bh=EJLITAjwAz3AJqUhDsBw2K6ODEtqMkKEXDbIzymyydQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=YtJyXTdxmixM4s8Uk5qJNGY0J9N1nRLCn3+FXQj9IhziSdKZIMYSDl9JABCRGTkFR ocmBrX/LC/v8/ZTxjuM45plbJQziSINRwSouuJhJ9Fodj4FRMHo3XJ96YjBbYdXNu/ PVpr1nVNk7A1uw2ceEx8wr8ufdCuLDWY+eUEgnyk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4D84BF806A3; Tue, 26 Sep 2023 08:24:19 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id AA50CF806A4; Tue, 26 Sep 2023 08:24:18 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8EFF6F80578; Tue, 26 Sep 2023 08:24:12 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72e]) (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 DD21CF80553 for ; Tue, 26 Sep 2023 08:23:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DD21CF80553 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=d0gorcXw ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTP+vtl/tnTQ4MnkTzlUo9OZ9hsXxLYD61yWNShwLbqpvQHjbDz9Bf2J/0AggvodV9rDWQYjnwHNflEOnWOi53rzvnmOkqT2Ugw/QvXNNSnQPVKCY6vx47VRFLqVbISA2vvcP+1BDWkhf8U962VBo0aSbN16FcTahUpnZpXSTXOTNpT3r8L0PYhuQSZcaKG3pBDmpKKeT+ybPQKrgLzYhqvainReccnsDQcee7tTmd0eANvR/NPQIevNPhKXeD0BBWFssSg6IMbJIT7CT5qDcmf2G4rDlZSH+Cj0lanP6YnkDMijk/gmr9E3I1uixKMB4A60Ik/0qCRCZCvHe+K/+w== 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=b2iiQGbhY0n3kLizwmrGy2g/WHQXZzaNnK8gMe5he/Q=; b=mK86+1NCjhQaSw1ukb0z9JkX9jNob7AMufd7pJSEdTmWkOJBewkR943FQr0oa/ZJEfD83MOR6RWYg40ABlw9/fh+8EQUXANeY2MuHCrxysmQNX7mfKFkoNvUXVCPDY1Hc6pSJQUaN1JHxJPPVs8z29V67niuwNno6v2D33s3hgYO1+fxp2mPBEasUd+A/N1KhpPA6PBjLxPfSBWlyjn8N5+9Bsnpi4t+vAZH4BnjRx9wIOZeDBDj1jU50JxvjotbljEQFbzkLsNbRxS7+waNtTHRFRRxYkgPWr3BfJ4uimLGQYRejqBmP5MbtLiYpeqojhN+ARkVftASMHoTqTxGIQ== 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=b2iiQGbhY0n3kLizwmrGy2g/WHQXZzaNnK8gMe5he/Q=; b=d0gorcXwU5I3oFT9G+2SGuSeFihLi9tj13vIpYt0UxAND4iVShpGfqVinkuIAORWUg3TU5W8g4EgLJlh0TlEeiNY7bLvWbHiu1KjVSK3kzPzsd++Mjf2Iq1rTKoPlKY3sdxg40svYkl8G/IV0rd1hRmd/9OYo+xe/Gi6F976oE4= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:23:52 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:23:52 +0000 Message-ID: <874jjhh2q1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Hal Feng , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Walker Chen , Xingyu Wu Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 32/54] ASoC: starfive: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:23:51 +0000 X-ClientProxiedBy: TYCP286CA0188.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 3343e809-de34-43ec-5e25-08dbbe59270b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LKTnSUNzE+VRnSZ5nZBAx98yC1JUCgmqqqHmqsiMb7VFEeNkVSh6ablVWKP0svhyFMzM67Yt8XSF1csdaLrKKQrtQ70zL05QDUR6SSepCIy5cue+4toX6cb7rHhk430fvF5MF5LWu53hjGOuiBT92WBdTmTP/3Sp/rEP6O1ZrkOmWxBqvl+QlXqdgWm2EkLtQKkdo91Vu8fSoXsocuy6ZhMDd6dhw9blSg/H/Lvubfr3jKMwVnXXQ2W3gDTZ0mdAzXtfaR2qgjsXHLRs6FVvG7GYQyvuPqcQOZy3SP/FHZ6bNJFhmOym/SDsPsz+sqgMmI2YccJ1HaYSXV7/mGb3GxA0bq5WFxnXjKSYPmYzmTb90eEmVSyY/12cQen3GaTmVBp57sqwE+seU9IQd/822/oJR9F1QXDykVWQxZM+NkxAHHxNjvNXFBpmncPUXQKmpintXqS0lChoBnvqpQeXuFZ1e9xn9eTjOi2O9x8ykmVpXiZFcKZEV0Wz1qpjYYIYiuDzO/8RwcUD/H4YwmJTSvjcQYnab2DLXRg5vSvjn4e71Fg9hyvdCV2BmkhD4PMJQpPzykwzph93H4tVcEzo/5QQSggmT+e6XcyhuBPBGbJqpNOOFl8F7s/Cn905HQM/G+9sMrhqfPB2PonK7SItIg== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P2Dgv99LcQEnN6TcKloqb7mvWXZ0IPszMrF80qAZ1FcJ6Nk6DhRKegtC0OVmpu2F1lakMsST9ydQHBo5ygtD9WeAjoMWcXUSitgmujWu+m1SOKtzxa4VGmBPKBphPO9eHxLxf44GcE4Dk19aBEWB7ctAjiXLjmWEo37VB6ZvGtBlBn4g05eEqEErwsRjmjyGoBgWHIkTZlAfUSsvOkGjLNqmSfee8rZLlcoLcbh4rALmCZeBtAKPuXl86CjVBvAAp4fpgEQXeDNbrbTnU92+Y8HE80G7sOfeTr0PVJ5UycCI2YNfkz0l/L1OTbH8pbVSGl/u26AhO2w/+Xj3vOU/Lcr0tc7j3a4r/HzfrFQjiJSc/WDU0b2BTX4KvJ+OFn1KrPi6/Uvh57C59BEN2JmKeBzYHSbljyJW2lOd70EsnVKhWsPEjfx9bjbQYaXBzB68sjIhmfDkvrs6Ll6USQ4uTesUMHoICOmZXOER9VKpl+N2shEcU+t9GzWYCtCONHjJVjIsqkdHLTQaKu+EHs75S205XzEoLySvXDK/wr0m2b45DWYJlOOdBpltEZRCIkta3NChhEMAa6xwjGVovovN8zpb/n1mQGWTvYR24PRCctDHxrYY34v8V82OC9hHgL/ML3WfKuGoL8KuUs6w5tcKj0SmCkEz7ofJn9Ob1FUNI+Yo295gFD2WrCTSqLTwXDiEc/0kVmQ3xbk4E+dYDDzXP78XJjw2cbIQ2yZo6ilhf51VyKoijyZ8+TPqvZiGRDf2hyOW2MkrgWIWpSxlomEqkX1/vp19ZOCfS6HKOvKaMhVancSTie7pOg2P0IypPlOH3Pcxdk2bkc1rsUTSzdBMTg8Q3UPkcpQguBB8y6Rn9R02+8MLOEDmpmP44QRccJc1SEyPc1houkarDMvg1k6LDvqWNOtHKXG8teOG/f5w6X/4G0dXbX7u3NRtZfrcOLzpqg9Gk0yApq8rNv3YGx+vUH03/e29nzjheRn1wNrWyvO4uQS07DZ4wpWJNxrfqOFMEVTo9Dsfgl7lhgV7AxVA1g/wBQwzAjlEz3UhwJoil9bquR0t4r9Sy7xYbZBncCYvoIDfS13tkjrgh4UhqcseEsxcvFESXdiujGdxxXnW22n0brzXMQgI0Y1WF3ekQdvEvonOIhdIsmATNOPgld6Obkvl276tgJSuNOvZq38jmgBfV40LO8udC8NpIx93522Yzwdbf7fk/YXSFK6L2eKr6ZGIMR8niAVzuOWOS099mcLhaq/hw3MuK4tmezL2Glgdx2Hdjkx+gljdvV9Vms+Cl8IGx3mcpNXoLt8KjIMTE/wyXa3cjQC6C2fwC065/Q5V8yMkBTImXyJ4mdw1gH/IrthATsqqJ/oxgN+y3e76qCK1qL/Rj0Gfpy6PIQEzYvwGSjToUrPzYxSuXHfdXxtx+QqUZBpXo1BDY5YyctZCl5dI5LU3JgrMmlkH4KHgZW51KwMO5t8ivWhsn/guDfFrQZ18Owp1XQu5V4os2N6KkaMS1cD/3Py5pqMvkQIGsLhH1KkBAFVF0JeBGV0CnQjnpOi+YXKac4BtDNanSqxN+qJDdSmXWFPDUIKBL2b9jpJd52oGh/++9tGFXB9mAcyNUe+HlTSHXo7YD0H/FDCHUYg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3343e809-de34-43ec-5e25-08dbbe59270b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:23:52.7614 (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: tXMHson6lYzHpDfstXOMaUnu+w5exwcqfCQ/owWhx7+s3AEj2EJYhUPkny86uptBvy95f6A8C9in4CalJUIdcriJLurWEByiqRcf4QD8JcuiyqUPb+YF6Fwv+XO5lvn5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: 35EKGO5KSHT4F5K23K6RWVZ4J4TPIP4F X-Message-ID-Hash: 35EKGO5KSHT4F5K23K6RWVZ4J4TPIP4F X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/starfive/jh7110_pwmdac.c | 2 +- sound/soc/starfive/jh7110_tdm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/starfive/jh7110_pwmdac.c b/sound/soc/starfive/jh7110_pwmdac.c index 391544fe8568..65ee3e339494 100644 --- a/sound/soc/starfive/jh7110_pwmdac.c +++ b/sound/soc/starfive/jh7110_pwmdac.c @@ -213,7 +213,7 @@ static void jh7110_pwmdac_stop(struct jh7110_pwmdac_dev *dev) static int jh7110_pwmdac_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *dai_link = rtd->dai_link; dai_link->trigger_stop = SND_SOC_TRIGGER_ORDER_LDC; diff --git a/sound/soc/starfive/jh7110_tdm.c b/sound/soc/starfive/jh7110_tdm.c index 8c117794b028..1e0ff6720747 100644 --- a/sound/soc/starfive/jh7110_tdm.c +++ b/sound/soc/starfive/jh7110_tdm.c @@ -325,7 +325,7 @@ static const struct snd_soc_component_driver jh7110_tdm_component = { static int jh7110_tdm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *dai_link = rtd->dai_link; dai_link->trigger_stop = SND_SOC_TRIGGER_ORDER_LDC; From patchwork Tue Sep 26 06:24:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726437 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 BB1F5EE020C for ; Tue, 26 Sep 2023 06:30:25 +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 24F91FCC; Tue, 26 Sep 2023 08:29:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 24F91FCC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709823; bh=4bDDCcNCP7X8aDwA3lSguvFR+Mtb4RaYdA2oj96Dzdc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=X4ySWquNSW6Dm0Zm6atdqkVOgIuvfhtBVPUEODI1Be+WciyVhdBJl/QEwWealvtvL 3w34ingeoJ1df+sRZqd3zbd1ORwDefv8W2g3lcyub7r+xhgY0lBCbor3aeg0TWANVq hBoysFIoQpbr+e7GIVnhYzMFNzNux+gZEHizXLgs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DCF0CF806A1; Tue, 26 Sep 2023 08:24:23 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 32A97F806A5; Tue, 26 Sep 2023 08:24:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 46AA4F806A4; Tue, 26 Sep 2023 08:24:19 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20725.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::725]) (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 DD3F0F80166 for ; Tue, 26 Sep 2023 08:24:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DD3F0F80166 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=T4TZtvhT ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vq7hQMlSPzPDGuXpw98g1gpPbYfxoEDB7vbrUgK11Ub5BAK/uXuXsDMxOzIg2CMBduQEVNK1RR7WX8G3cNsWsCj+TnqapNRbJ/pLeN4aqqa3Wt/+M6BFi+1WWCvkc+m5r5YlKLFGuwU2Tjd1lScUuSn0TRHsb+u4bOmQKjBSA+8KOYgK42nWNI8kLKk5uZ2QigwK0E8EP12BnFY8n8UlGz27oWGVAZSulvO/qyXVYUKwZg17/l0gfh29enoqVaFW413heUrmkdxgmICnevMomI0YlCpO/2bl0Qv0d4GQsFCPKOmjD8/pzGCBkgQg9APUw0m62frdvUMx/cBfvahWTw== 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=Q2kcnjPGUbBVhOLAAYUiQc6GMPOwV1kPDA951QDgKZ0=; b=M2yb6Qzokw+m4uGJaKmR2c9S4SusrVjLrw0T84FdFGJbTJ6ko9l4J6/Am5I3VOKuUg7Al1k2qtFn+5x4U4rmvkx6tM55knpLHRKO01PxsjTXIwTOv6IbleLogCTd3yBfA5DdmI9WeuJha5LC6ATcchW/ABdbIoyIIiyZchUv/1JI7tb7yg8y/4FjK+UIiQfcwWCwERzPboVrUWFAC8c34NxdFabTYmYW0Iu9LzERczCvid/+p/+aIgVirkceCmpwrRTEQjt2cHBQneDDgKU7dumaXX12Ia0DDtAbIvxZSQ8jbAQdTGzmmpomEwc5HQRaKwSyKGveHsyRXnQnrKB1yw== 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=Q2kcnjPGUbBVhOLAAYUiQc6GMPOwV1kPDA951QDgKZ0=; b=T4TZtvhTt7PJ0RKdbgclIdejNz0+dHBWLvyUWyM7HSDGoi+VrdJXgzWXCX9/mp3hNpsLAMCY/eHu8JY+9BrDXFSqseW/8qX8TD8focA2Vu5UYkBgbAIK4Ln+tCkvHfOCt3sCPCEW/1rdTV6Tqbe/rUdTWyhJ2AjaG9qwAFnK0BA= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:24:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:24:03 +0000 Message-ID: <8734z1h2pp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Kunihiko Hayashi , Liam Girdwood , Mark Brown , Masami Hiramatsu , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 33/54] ASoC: uniphier: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:24:03 +0000 X-ClientProxiedBy: TYCP286CA0157.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: fbe15b2b-5539-4f08-45f9-08dbbe592dfb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8XiqoEdyRJJyfEPtuKc+qHNVCqdV8enSQy1+SKMQfUxHxQZTjEdnq7ti7CLnVqAp0QG6MtVgoWTQjIKXJfMOvkD+DURN79ca5P+WZJvjUYC/ltb/973AqHDEnT+Yv2QhUkdXApRzjkxMzdIXJJGHkKVNtIjobI0TmwARdx+KUbjVWCEkpa/TFCvMNkXSDaF6qv2/q1t3JS+udhhbEmJOFmmCHTjUeyO+m6R9Wd8mfPWI4F+t+Eesnw/WeHYs7uhVcFIrE43axmSi2QZFPiX3L/+iIvBoELoPNfK4P+2BIzoNEJQB2rcLOXdQp1LlpXZ07EhV1ke6Eb9y8Cpn0o/jPupOtYJQgSAW8/TRbqKR+L2pAfTFLHmWopn1A74M/VzSi5AUu7E/NPbu19t1hZrIwtefsA6DNuZNG9idJDcSkZKh/ZOWYX7CV2+21ONx8AW+MlFV+NaDPY8Vk7beOJi7BjWUjr9u3uhb9wgH5uUkmmHhv7wFMpDP5Qz9xy/7hLKVIvn7DgLNcNHgL7rBVbcgjIJauxFIu5gB+z4F9xwbbWxiq0yr9Z4IR5C5gCZiV5aLyJKF4Nyn1DK0DdZJbn9eoibMq1jfoSJbxx1+gfXxTvsYr/loAQ+flrBs+LPf+0TjBDEj6gJepfr/fI0L4l6mrQ== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FC5h5BK2dK90iTvbNQrvdooFtmDcAd4AtdwAm24/42+az687MinpcurDJHnmeyHTSFuU+GqIM8cYeU3ritppYTPZrijoSvZMtD6XcocMAN138ddvfFKBE9kPT9yKXpngm9K3NwSD6RuCyXnFnHpWFpjRmCjzadR97PGoSKrxGKI5dm1sJHpT/04GyOos/rNIWFs9ikt/LvLuLCF1wR55N25uQDZDFE642Ny62asFUjQK3TPXo7Bo4K3Jc/WTvWZ1fxwAm2ZGWrxw1iIfXeJDwNjbISgacBGSNBy33Cy2OWIiLtMe535zgQVmYvkHOhzqAHqr32haRhKKz/73QOtqpJ/eZclGRCDyeys152NTAnbuvTD7V7LHWqgwIPYJEtxAUJIie1r2yEZ5ikh+fq+4jbkKU3lXgbZKAby+hxZjNTinbhwJFU2UmB30/lodn+tCF3ffsDg7tPUe4LemxNMF+353AVE+W9QMqgCRvhvZgImYMYdSB5TyksaUBaZnWoe3awIkQB0WKqhcxinJGjuiPXoQM8dVDnrFBH3gWH8QpHNqxYBxUCaYiyyMUHgfLUyvmdifOu+voCxUb7Ww1AzTcN91+/lxwr6Zd4vHusIB/ZqpfHj7MuJa5r1ftukFnWCvgGVfIFx5vHrK3MNXnTXodNirrpFg9OL6pQsgDU+FlCKv61NALpCu8PvaTWaliEJ5/RFpoy4RbPUocJrOs5C6QFc6VfSL3L0gqWADEz5zMHvQHVuxyt2k+lJKo0UrVDb90IMH/nNtAHnR95Ih/w8AmbGkbetdr8RyQqTpDrgrmNdbs4DUoimksfK8OFooL2VZWdOt82B7da4RGn2PXWKng+B/o7UQDGpZBOFsMKR6uKFPnPknsEr3qXdpklMAqzyg2nv4iXL93bJAJkaX+ugPdOO+/xt87MyPV9ZDS/Knqr4xcakfdDmy1G74RC70Tbnm+ohGfOLOVvMEZy/y26rP2EngiRuvKSo/2Ijw7eLJqWHXzgj89Ji51GHjiytFu2wOVSaiQyZg23VJ5U4uViwYVt1OSY2Mc+1AtGo649gAc2/7vW8Rsgavfr3GR2jdP7zo631qelJonoLExf3ojgAumA61IntwIJa/LxA5LRaG8oQWh140kaqJj7p1uEgFDllKsoKBIWiOiQASSHiM2V+uc2wp2wi0ao/5qF/ATwkHGyQ/sZSY1Omlyo/9mD0nUcUSFOd3KExR/ocPkNOTwbudE4MJsLI+fRnn3gntJ6kz+i8Cd93QUyHxXh8Ba+HRCC9ZNw9ona6u5HxaWUkz7CjlN3YNNr3s+5riHMpIoQkZQipv0TQbRFre+8bZCnqDDIt9OF2yEX/8A96h3gNvQTHwvOvTlqLfuGB7z3tPDmFE568QpAlI4WAQ4T71D4YG9er8dAZL7MQNWtWYcUYvAW1YhCyBX/HdqQ74uVw4m9C9dzD23wnrPj15CAUY+wwGaAYxPUnDmxy8Lw5VaiaIUrE1VpUM8A7gfqRQrfHNbzwXwlrgtIRCnzsfXRpCx/WZKxzQBX+IFZe/ucZk21XsxW8xOWsf3fABoG7F55xdkTNNLrUG8XwsI6gtjDji4ZZTWJTFn6whMbozqFRlj3Jb2OgYcJMJRr+yqmMRmCYLGF0oArg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbe15b2b-5539-4f08-45f9-08dbbe592dfb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:24:03.6954 (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: qrH0foz8XoRLi7D1vJ0hHSt1QmchcVQavmkWy9Rphb7UTICZkWUo6VD2QogVfQ4D/0fUro3bAOcvd8CfHtW34ylQ5F6uxb7rzSHv2WSgWQXbxNK/1ejgz4UYFTTgluL+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: BGQ7ITAVQY7KDYETCEWOUNUZ3KHZYVUK X-Message-ID-Hash: BGQ7ITAVQY7KDYETCEWOUNUZ3KHZYVUK X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/uniphier/aio-compress.c | 22 +++++++++++----------- sound/soc/uniphier/aio-dma.c | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/soc/uniphier/aio-compress.c b/sound/soc/uniphier/aio-compress.c index 7d1492c15b57..4a19d4908ffd 100644 --- a/sound/soc/uniphier/aio-compress.c +++ b/sound/soc/uniphier/aio-compress.c @@ -25,7 +25,7 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd) { struct snd_compr *compr = rtd->compr; struct device *dev = compr->card->dev; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[compr->direction]; size_t size = AUD_RING_SIZE; int dma_dir = DMA_FROM_DEVICE, ret; @@ -58,7 +58,7 @@ static int uniphier_aio_comprdma_free(struct snd_soc_pcm_runtime *rtd) { struct snd_compr *compr = rtd->compr; struct device *dev = compr->card->dev; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[compr->direction]; int dma_dir = DMA_FROM_DEVICE; @@ -76,7 +76,7 @@ static int uniphier_aio_compr_open(struct snd_soc_component *component, struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; int ret; @@ -102,7 +102,7 @@ static int uniphier_aio_compr_free(struct snd_soc_component *component, struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; int ret; @@ -123,7 +123,7 @@ static int uniphier_aio_compr_get_params(struct snd_soc_component *component, struct snd_codec *params) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; *params = sub->cparams.codec; @@ -136,7 +136,7 @@ static int uniphier_aio_compr_set_params(struct snd_soc_component *component, struct snd_compr_params *params) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; struct device *dev = &aio->chip->pdev->dev; @@ -167,7 +167,7 @@ static int uniphier_aio_compr_hw_free(struct snd_soc_component *component, struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; sub->setting = 0; @@ -180,7 +180,7 @@ static int uniphier_aio_compr_prepare(struct snd_soc_component *component, { struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_compr_runtime *runtime = cstream->runtime; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; int bytes = runtime->fragment_size; unsigned long flags; @@ -219,7 +219,7 @@ static int uniphier_aio_compr_trigger(struct snd_soc_component *component, { struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_compr_runtime *runtime = cstream->runtime; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; struct device *dev = &aio->chip->pdev->dev; int bytes = runtime->fragment_size, ret = 0; @@ -253,7 +253,7 @@ static int uniphier_aio_compr_pointer(struct snd_soc_component *component, { struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_compr_runtime *runtime = cstream->runtime; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; int bytes = runtime->fragment_size; unsigned long flags; @@ -328,7 +328,7 @@ static int uniphier_aio_compr_copy(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_compr_runtime *runtime = cstream->runtime; struct device *carddev = rtd->compr->card->dev; - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[cstream->direction]; size_t cnt = min_t(size_t, count, aio_rb_space_to_end(sub) / 2); int bytes = runtime->fragment_size; diff --git a/sound/soc/uniphier/aio-dma.c b/sound/soc/uniphier/aio-dma.c index 3d9736e7381f..fe272befd967 100644 --- a/sound/soc/uniphier/aio-dma.c +++ b/sound/soc/uniphier/aio-dma.c @@ -108,8 +108,8 @@ static int uniphier_aiodma_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[substream->stream]; int bytes = runtime->period_size * runtime->channels * samples_to_bytes(runtime, 1); @@ -135,8 +135,8 @@ static int uniphier_aiodma_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[substream->stream]; struct device *dev = &aio->chip->pdev->dev; int bytes = runtime->period_size * @@ -171,8 +171,8 @@ static snd_pcm_uframes_t uniphier_aiodma_pointer( struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0)); struct uniphier_aio_sub *sub = &aio->sub[substream->stream]; int bytes = runtime->period_size * runtime->channels * samples_to_bytes(runtime, 1); From patchwork Tue Sep 26 06:24:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728182 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 56952EE020C for ; Tue, 26 Sep 2023 06:30:44 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7B315FCD; Tue, 26 Sep 2023 08:29:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7B315FCD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709842; bh=KnufS477o+O7s+Ah/XqA9BRf/wgSn+zD46k+jsi7tgc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=U8baxUbkoTV1KRkYIIp4iyfOXeE8NzlND7tCzmJCDthSc4gP1i0ien4CBpvQgGWwE x0FU4mslK8Lp2NsPsG9XZq0vD7EI3Q/mvouGJtmXjdvEJo4uNYIGjyp45VDgacWRme 2fw3I9lddUgiynsNse63nmBJ98xTlUo7oUVD0he4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A0B3EF806B4; Tue, 26 Sep 2023 08:24:26 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 4A9D3F806B4; Tue, 26 Sep 2023 08:24:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 83BE4F8068F; Tue, 26 Sep 2023 08:24:21 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072a.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72a]) (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 78766F806A1 for ; Tue, 26 Sep 2023 08:24:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 78766F806A1 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=mRyDAI1N ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=naR4xJ02PRdqwbooXSHkj+GwOEUegiihVal5f9iq0UJK71hI4tFSjWuHvOXqHRRz1XaviQZFi/m2BF7OzbBVHkGnpoLgccISLzW6zfaHhGrUrCXQdLnTFPiA5S4BS1Tns99+jlF6qHSBjaqIaYe4nN3Kb7Nd9yqA54kEG4VzBqTs3CwecalLrSca1hXBYVnH0cElWjJ72C2PrCV8hDV0qh23IdN2QN6XpOY/4KZVIzbueTnduC4mtblBSp6sCM2OMbjUfpf/5dB28C9IyToSxq3by+OqqCzsoEFsWkz62jXFzsYxZrVhvLIcCYaDl+AOjtssQVquB3K8MNWqOUheNA== 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=L43mtjnZpwETBzC2s0ZyHvGWSPWOBQH5ovHzieLEtFg=; b=XKIiBwtjMZzkD7Xb9AuEqU1+mZHubism4ZuNZ0Bx9DOx3ZA+V0jg4sioBpAjs0fZPtP4S/nydN8sdW5/jbqNP3LkABnF0eJZZP2K39kiOxolzXgvQkNC6ltQzP5nSrksw6U9yRzOJWAGBVRXCcyvP+Vcr/oKzb6QyuNht5kK9SZofJLhOd2L5/taBVklG2EaZzLe3Gvr2KKRFTjd/pTvsls9fGl5khC8rq14cAuq470GGwe3oSzek2NX5Hpl/EuWulSXa0cm6G333AebHLhKiN33n/XGXO9USABCZNcU1ESkmDGClQZbQeCA42+5YZS8qLIZGUxZ/3EbCNBbPe1W9g== 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=L43mtjnZpwETBzC2s0ZyHvGWSPWOBQH5ovHzieLEtFg=; b=mRyDAI1Nat1Yuxhp240cy8oapggeN6F9MVE1pQHNQ7xYpWcyrY8VLlQc/LPGDGkbvCaTY74c1HAav7Ko/bXjoCUwmChwd2vKR+RbxmWC2pvWFzAHsqXYZNCfKpprBYjT1O1QqO6qDvkPsH1fP8JrYYbwfL4yKFY8lJ3Hf8NdExU= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:24:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:24:14 +0000 Message-ID: <871qelh2pf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Charles Keepax , Mark Brown , Pierre-Louis Bossart , Rander Wang , Ranjani Sridharan , Vinod Koul Cc: Sanyog Kale , alsa-devel@alsa-project.org Subject: [PATCH v2 34/54] ASoC: soundwire: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:24:13 +0000 X-ClientProxiedBy: TY2PR06CA0017.apcprd06.prod.outlook.com (2603:1096:404:42::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_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b5f207f-2605-4e72-7454-08dbbe59346a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mAAw6uFtOt+wKNWIn9KUexzFF1XBFHciMyJdK9nDKGNWzTg2j4OPVa6sMPwQ73euYx9sSqiNoOKLL+nMqpbUeOc0iRmm3i9VQ8RBFXU9Mo4ZW2QUYGPjx6PmNGlNMh5QO7P3ZdMlUoax8kZHjaWlRnJclwGHyCvUw0tMZWvw0eyUl0X0++JdJFkENdMlXHduW/FLJmm3993Qrmvqaof7XBoBfa2rRTyjFE3sFEk7SM96iif7YwdlDUf8DYiIqQc80Gihq/Dv99Y2U3CyPdHtGIGpjDyLwspx4bSUkJmubC2ICP71MEM1U6Tli66e8YeMilWOGsHDlEWgDKPVFEJ5I5UDgux1Zhztt3M2IZuULneH/p/f/M1FI4pJSa8PSRGD9UCy04QnaYTzukC6ZDPNg3EKaCgZ55JSndULsmgNVt48DieeM1151a+18bo1kxkv/oJ6+p/c44CF8H9z94x9w2NSBCMf9ymvXnLSvCmqN8fcTCNu+2YfSe7d+iqdlGQU29dVlPkZny6lP8aOfmQDtlXFwVDMwO1CCJIEn28oN/QEhEdWTBxdGjEFfWu28VkV2CGDnZlH9jCs4QxmUj1Q6o82FXA/lZd187viL4D5hNSx1wNGQCkW9CvAD+/ziOjovlp/YmbTIeuIyfwn2vKXZQ== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Tg4f/9f7QhekiI83iLDdcXTn8qBtqG6stl4VSYjafRBnsNk9icPLizbc6qJ5fIO7ncJ7AYoE72ctnrDsldWAr1g5qfEmzPbVmR9tIOcFbWlT/z4jNKyzVjqXuuCBTfwc+fas5HRhtcJOs8rR9Uk2cd9mtPyroYcopKrTlLH5yQrRTs756v4bf4PYRGlQDdlESjfTnGLYIaJLr5WH5rO/afr1EFcmzFrt57nRBSCNlvUfSr4jTRVZ4GCmXRrcCkoKlceWuKsUDzdH9KlIYfJK1mZt4QMwJc415sPJW3WT94R0xG3vNCh4OsmxnYx1CdGgagojlp3m16/qJYB8dBKxB3isxyMOhaaLOlzVFeHH+E5tNLmoY5SQaDRPThEthUWWVJrWzjeZ9WtjAPmaDYuK8tqczOC68+ooNOy4aiqUK2GLZF6kMaTeYahsYmneNGX/1+gKfiawrtrhDTzns80XvVCzfA6QWamXfcOCg5gtCt6uzwzH+4esakN/mr5fMLRxNtoii6+qR02+Mlu3kwjSux4XbZNQttkO/qhcxxYnkjBWTxZweCQ55Wb8PGaSwf4cUJ92y36UREWXfmRyAjiJiFQeyaVcGnJwFuqKAfREeL4HlUSWeN6kb7e218sVo72VwAGxtGVMQFz/9PiLHQTWDdRuxeiX02vgdWs87xDKODi17EYustEdggmc5aDMcJ+VUWROGRlR6u01yyKZ544cIWNnsjHUgTOInfi3gzbSB/tfaQ8dj90tQn/6YJXX+logLEEKxJ9raXoSQ916LdMdeBw0sWbTquZ+aE4ixX2YhmVQC/HSC8htrJGwl42+jUoJDnUWwDabnmylpo+YTHIHC1b34fwTVIzfhOKAaqY80MHqZk4IlkLmqitObBrD7KCdBCDb2rFVBRdFZl0MrdArEghIjXEZg/3VK3/VWdzbBhFdgfP6GWpykDWdaH9mukwV64ZPsEQtgrvOHz3jHmAUavmxakoDZgTokzAIK7OFywDMa5ytz4zd7Oggs9b14ruz1vYu/K1oEpQW3ekSMXEkCYgxjHuODO425PAX7kr//zTwjATsRLfOScCnuawb+lwx1RZgfjiaAkm6Env6cu52VnRFptzZB/ehA6gEBTLxAoxcCkNuN/l8EEkJB4pTIydzopa+cvIi6oP0RrnPMk53VAL6wYZdxSJTzuDlFKei7cco0YheJrbOep4izHDRf5TlsaAiJbVGhvyPO96LKu1Ga0w4ghlxkmt+z9AYRi2e/LYht/p0KyZYBXOMGANkg3SokzXR2SJVOEtB+Ob+aOS0mRA6cIaZPGmYvf21OYYHJTaH2Wiep+3kN6mBmSJTiPe2OB6yQMfehggHeXPZCzLtYtnZHHgyZMgWj/J23Kl299iFCbD0CMf76hmjYALDm7O6r6M6sAjILonZbXEuKbyP1jfmUjmgbbY3eNbR1HUkaELvOy6xa+Xca8+x6yhDvwgZFhlDg6omwkgu4aOOfp7/hcTFsQqCTYVSbNWBdTcfjQEefDJ7s0r1XBdbzeUAidGpf0dbe0bMld4qmOmgtelm+sCRTKT+YktVTqx4E2TffZBPDpRhTAAaQLwGRUm/nmZi8mnTuMQg7+sEeFGFc5no6AWXpGM2Y741zZ3tuScY1uM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b5f207f-2605-4e72-7454-08dbbe59346a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:24:14.4657 (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: gDfXArKwWkF1oroCpeU2WwjGPJXw+y0HtDlbpkPOOmW6TqyTp++u1R+cSZQMW9o2s3M3qriWJMWwLJT+crUIg0yf2AFyCy1ZJcc1uLHpcZDX+7BQ+cTzIkDdCJFmpxlk X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: EGWPMYHV4QCU74KFGVOZNYBR2NHNDSKZ X-Message-ID-Hash: EGWPMYHV4QCU74KFGVOZNYBR2NHNDSKZ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Acked-by: Vinod Koul Signed-off-by: Kuninori Morimoto --- drivers/soundwire/intel.c | 2 +- drivers/soundwire/intel_ace2x.c | 2 +- drivers/soundwire/stream.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 26d8485427dd..1287a325c435 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -759,7 +759,7 @@ static int intel_prepare(struct snd_pcm_substream *substream, } if (dai_runtime->suspended) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_hw_params *hw_params; hw_params = &rtd->dpcm[substream->stream].hw_params; diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c index a9d25ae0b73f..82672fcbc2aa 100644 --- a/drivers/soundwire/intel_ace2x.c +++ b/drivers/soundwire/intel_ace2x.c @@ -327,7 +327,7 @@ static int intel_prepare(struct snd_pcm_substream *substream, } if (dai_runtime->suspended) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_hw_params *hw_params; hw_params = &rtd->dpcm[substream->stream].hw_params; diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index d77a8a0d42c8..69719b335bcb 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1819,7 +1819,7 @@ void sdw_shutdown_stream(void *sdw_substream) struct snd_soc_dai *dai; /* Find stream from first CPU DAI */ - dai = asoc_rtd_to_cpu(rtd, 0); + dai = snd_soc_rtd_to_cpu(rtd, 0); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); From patchwork Tue Sep 26 06:24:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726436 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 CE4C7EE020C for ; Tue, 26 Sep 2023 06:30: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 CDB47DF4; Tue, 26 Sep 2023 08:30:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CDB47DF4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709856; bh=3kwgorNOsPZQLd6z9rFkkKLfgCtLj9MeaJOetywnudw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=DkgJq9LEG6THqP1YV5WKVm3jgA5Ls461xwNpP0bk5oBQ+tZbJZe/3h6xXAZuKv5v/ weRAd2JFEZ8icI+eETkV3p+uL4qY4oIy86QA4t6nZL/W3rqRfVKqReHCFiUwNLq6gg B+3gLjzNkglXf7nIbPLjPln7/ENIYO31pZ+6qpn4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A7DFBF805EA; Tue, 26 Sep 2023 08:24:52 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 25EB2F805ED; Tue, 26 Sep 2023 08:24:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 649B7F8057F; Tue, 26 Sep 2023 08:24:47 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20708.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::708]) (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 BF12DF8047D for ; Tue, 26 Sep 2023 08:24:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BF12DF8047D 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=Ccs7qJ7m ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fyHyyPzestrHaPNaJlBemcyObSpbhZtmx2XuwSKN7cvK2LLncVaic820E/G9NB+xqNO5+3M4eIABLzLubFYKJ5s3L66Ydo7NxFdqyHHLkmovWZwVL+vW8ywghgqME0fxRtarsudul80zWs1UGXoXFqKp2J2MiZPykk2RTPqucs/QCIrGFq3BhDNURuGLEoj2vZvXpDx17/bbWVodSCtJx+f41s4mSJ+8JUH4c2LxCmny+rT8PhEDlhhJbPNoI4L2i8Bwm2injVgav/cLxVrKnDHVicnU3NO942W1mrpCIDSdoh3vJOSRXlrG/pg4q5xsmZm9GfA5hIco1k+A24zBAA== 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=lDytA5k55mKLgtFyD85ihSlgV9jX2EOO/OcGe8Jq5PM=; b=ZrqkpwrN/SXYQnH+KqAt/mtIr6wBsU29jh2+YdLBitEj1paGqEUCjra2C034ZI+cEuYE24QlvlRN5V5KqwHcGQvYjvgMTo8cc9fr9uV+i4uH0G6HFKTuXRVEBbE4hov5udHqEK3T6ku8WGts2Wtqb1BznJgz+sMf6cTh2zfS2TxGn/OIjPDVIkyHPVljcKgOR7Kz1T6KtwF/YpB1lHgapieCcEnkrUvaFeO4yjLPj9TVlQfuY5kajYkKJSN6jV9HGZNfamxHKONLzFtst6Q4ZXr0bzMWSo7v5EUCW9I0frZIZ8q3HfviQM0yqyctXqZs0lDfs0obJl/bDuy7I3XdKw== 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=lDytA5k55mKLgtFyD85ihSlgV9jX2EOO/OcGe8Jq5PM=; b=Ccs7qJ7mSurJ4vQXogTPzzH3qyBaxmmf0Jurv1OS9jYPnE6k2ebaVoPH/p19bCNRN9OQ9XySZUTYCvu0nmfPwGt72cfr9lvIr05xROqNIO8FcarbU8Xzase7YVnWk4ls5MxAHAU17owyKp+By/Hk3jFr8QpAKfZFjLOMaQ2UKeg= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:24:25 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:24:25 +0000 Message-ID: <87zg19fo4o.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Brent Lu , Cezary Rojewski , Curtis Malainey , Jaroslav Kysela , Kai Vehmanen , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai , Yong Zhi Cc: Takashi Iwai , alsa-devel@alsa-project.org Subject: [PATCH v2 35/54] ASoC: intel: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:24:24 +0000 X-ClientProxiedBy: TYWPR01CA0001.jpnprd01.prod.outlook.com (2603:1096:400:a9::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: a0b1cd7c-02d6-4876-90e2-08dbbe593ac6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UxfYrAkwmuVX9r06R06o0MbzTRfuxkDbIYHLOyvwi+ZeQStZxbROFuO8zGV7IGpo7qCF9Vq31UiWOw9g6rdYP4iQ88209DfZ25vDCwHN0NGaUz0WlNaScxI/SEX6yxPwCSB/ILeMLImE3r6VuFdCuVaWhWlWUXeR+k+KPmaTiuMQI1x/PbpnEOZo24mg3Xin8IKfxjUZF0pXfukN4lKwu3dvYv56FYdqomCqvsJLd2Fa/Swnzj0yb3zqDlwWe7nWlghV4CVvaQCtDH9uRAJB52z/2VhXlzqPiTly2uVIiZ7D222IwL2xU9kKYcTfu5Map2UskzZ4vB9ibypvzjtNFBQuxuAQNHvINHGwOG8c5fJqcAbQ9WzhHcOCkF8aIO++oau5wTd+LKR3fSRaOMomQRJJfmN2Pgr/RS8F0e89eKRUX9rOwWBNpIwUqSnCSq3ZNh6whKqNY/vy4tOTPyRd3sxAfWe1U+X+1prbA1IRgy2R4/YCNnU7bsJK6maCDyTc9qY/jbEjGs4m2SVZScBGk2Z9Hl6ylH5OJDjU41q10+yEUCiqyKrtU3txeuUcOGriHqRoKHNr4/Mr8wrM8JMhMBPS7RcyE1plC1+ceSwd0Oncl1Ek6qFTFXbiPIgYX4kehIwd4XVtyYm4AY8zZdQbkg9J47BuTakn5AIQ/yV4BSE= 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(921005)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(30864003)(41300700001)(7416002)(21314003)(559001)(579004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7ogzO6UR6pXu+cZiL4YJ0Dvol0XlBXpGSv+dZcNVHB/3/6Lt39Sxm6YYuzQnQwKh0COBKTGAjTnmdtKdb/hxtVZWUczV4VN8UDRiihMUCk5JfTJtRilAFVR3syUNujweyATQ2WBxdplivWmB3DLyPedtdhA5CUWXn0NkwaNfagVNznkFFdm4OybIRp2OLmCNfmxvNk042innkNv4mhK3hensCDsPvDuWWYJO58AJ5+9lBgAfQVEZ8r5J+yyy40WmqlhZuz5ltpEtmyv0S6nMy3X86IcjBHia1AXqOI0IikphLgB2OXKRskAgXUtJQHxa73ow1fBCwp2QTjHcXDMVErbykmFNy1bJj/+GLqFw7uvSd9zSx/RduInpbNFa94+ic/62dsmUVSMuG9N1802Euhe/gu46TALDMjgJQcA58pf1c5sAV9hQblkLp//ntHD5qtOd0OFMhsDiDCcIwMLo+BvXgofXhUeCPkuPKc/zAnsKxpMHr/Eli6bDf11oixXqBJuleu2i7jm014w+G2GYkT/TMDnt3CSY6JPJvqFSAK5sPvSueqfn0NuFEyo1hj808c8v4EaBQWAq/Sc7JVxbz0eZjPLAmYcYsYE2DxOkByhHHEB2D3qwGNxXLw+PE8Ip1j5mVUrcfrDZgJv3oLkvcOg8JMFgLexgDHw5amHo2gPo67dWNfaIF68nWomQrqp0dckT3B5AOH2NLRLuQ2xPmrRJRKjWE7ZrVHE0WIveDJ1zYiEAUUMKkRd1GUN020+AWPjGtXG4nzyCtWOEWkDg8S8TCX0r6TEHGeHWWY2hnhE4haperTN6OtAyutekdCwZXQab8i9MrDIyUSYPj7F/60s5hRX1TOcz8HgaDU+Zv9Fplx9q9cE3vRgOtKExTVP5ieRj+JqcwuF0gIQPQPq/Ooq/tNnNGghRKal6jCWPN1cz4wDyaqUN2olVaz9povCqSE90Y+Ig5umBrCvrExR/sM3MB6nq2yuoh4pkz0M2/WnUwGTNG2wllGi/Kba6ysvnlLodHUjRlHymO9uCuInktZk4p2m6vLHvl1MjNhvBMw2VsyULhhJRCcgXsKbDghBX6as0BLKnm/rUuvd7EmU/uH4wnGZg0HcZu53yQAN4jFw4ocItwJI7w/5TbdtMC5fNoL6S+6ZQoPlOMBiI6WnwZGt65zBM2N5uwBjjigYDAv5oPXRfatQhWqmjPwg8WClhxIU7bchuVLcOYUoAOtSQlMCneLJbcKGb54fIhRcjYs5MLUn91jLNSAAodrwQ/4Nwu7t5Tt1MxM4tXl1STqG35WM0TTha79JZHU75cjONxGsCPnNaauYTw/4EPXsTGH8BWizzPWuq2/xA8OBjXfkI6+iS1IXfkSQ03WbpxkFaILUifH1yBp95/JKSQ3YjfxxpDg9lmp6sKPbQJyMTNOFmjnOfTtT8w22GVvlimFru4pqVkOgykrTcAFWZhtMSfW0Tv9IRAPq8bbK/KRv221LEkaJeuH8ohpa+wpHjUxeVjGxFmyBKdK9kjyvs5VB2yJcOALDjUVINWm004X8T4uLfYZcP/Lx4hIlG9/zZJ9q5hOCiTmjyx755leKfc0uESGzqBu09O5QMJA+Z9beINk5EJdo4Nwfi4VVOBPH1CQnzDjE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0b1cd7c-02d6-4876-90e2-08dbbe593ac6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:24:25.2464 (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: DHYD32zWyirmgiITRNHlXPCjDi/c8GZQ0PlOKLiEi+QMKupudXfXEKZMsFq4hRl2BMSmxzo4+F+3iBFwuff0EEJtniTDbBjh5pZkJp4sSvdu13uos5v+mGjg9T/ZM0dd X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: HXTSSFDM6REVSJJNYSKAZEMFQDNER7ZA X-Message-ID-Hash: HXTSSFDM6REVSJJNYSKAZEMFQDNER7ZA X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 ++++++------ sound/soc/intel/boards/bdw-rt5650.c | 6 +++--- sound/soc/intel/boards/bdw-rt5677.c | 10 +++++----- sound/soc/intel/boards/bdw_rt286.c | 8 ++++---- sound/soc/intel/boards/bxt_da7219_max98357a.c | 8 ++++---- sound/soc/intel/boards/bxt_rt298.c | 10 +++++----- sound/soc/intel/boards/bytcht_cx2072x.c | 10 +++++----- sound/soc/intel/boards/bytcht_da7213.c | 12 ++++++------ sound/soc/intel/boards/bytcht_es8316.c | 8 ++++---- sound/soc/intel/boards/bytcht_nocodec.c | 4 ++-- sound/soc/intel/boards/bytcr_rt5640.c | 10 +++++----- sound/soc/intel/boards/bytcr_rt5651.c | 10 +++++----- sound/soc/intel/boards/bytcr_wm5102.c | 6 +++--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 8 ++++---- sound/soc/intel/boards/cht_bsw_nau8824.c | 8 ++++---- sound/soc/intel/boards/cht_bsw_rt5645.c | 16 ++++++++-------- sound/soc/intel/boards/cht_bsw_rt5672.c | 10 +++++----- sound/soc/intel/boards/cml_rt1011_rt5682.c | 12 ++++++------ sound/soc/intel/boards/ehl_rt5660.c | 8 ++++---- sound/soc/intel/boards/glk_rt5682_max98357a.c | 12 ++++++------ sound/soc/intel/boards/hsw_rt5640.c | 4 ++-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 8 ++++---- sound/soc/intel/boards/kbl_da7219_max98927.c | 10 +++++----- sound/soc/intel/boards/kbl_rt5660.c | 8 ++++---- sound/soc/intel/boards/kbl_rt5663_max98927.c | 12 ++++++------ .../intel/boards/kbl_rt5663_rt5514_max98927.c | 12 ++++++------ sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 ++-- .../soc/intel/boards/skl_nau88l25_max98357a.c | 14 +++++++------- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 18 +++++++++--------- sound/soc/intel/boards/skl_rt286.c | 10 +++++----- sound/soc/intel/boards/sof_cirrus_common.c | 2 +- sound/soc/intel/boards/sof_cs42l42.c | 12 ++++++------ sound/soc/intel/boards/sof_da7219.c | 8 ++++---- sound/soc/intel/boards/sof_es8336.c | 14 +++++++------- sound/soc/intel/boards/sof_maxim_common.c | 8 ++++---- sound/soc/intel/boards/sof_nau8825.c | 12 ++++++------ sound/soc/intel/boards/sof_pcm512x.c | 14 +++++++------- sound/soc/intel/boards/sof_realtek_common.c | 8 ++++---- sound/soc/intel/boards/sof_rt5682.c | 16 ++++++++-------- sound/soc/intel/boards/sof_sdw.c | 18 +++++++++--------- sound/soc/intel/boards/sof_sdw_cs42l42.c | 2 +- sound/soc/intel/boards/sof_sdw_cs42l43.c | 2 +- sound/soc/intel/boards/sof_sdw_hdmi.c | 2 +- sound/soc/intel/boards/sof_sdw_maxim.c | 4 ++-- sound/soc/intel/boards/sof_sdw_rt5682.c | 2 +- sound/soc/intel/boards/sof_sdw_rt700.c | 2 +- sound/soc/intel/boards/sof_sdw_rt711.c | 2 +- sound/soc/intel/boards/sof_sdw_rt_amp.c | 4 ++-- .../intel/boards/sof_sdw_rt_sdca_jack_common.c | 2 +- sound/soc/intel/boards/sof_ssp_amp.c | 8 ++++---- sound/soc/intel/boards/sof_wm8804.c | 4 ++-- sound/soc/intel/catpt/pcm.c | 12 ++++++------ sound/soc/intel/keembay/kmb_platform.c | 4 ++-- sound/soc/intel/skylake/skl-pcm.c | 18 +++++++++--------- 54 files changed, 234 insertions(+), 234 deletions(-) diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 6f986c7bbc8b..8652b4a20020 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -273,7 +273,7 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream) { struct sst_runtime_stream *stream = substream->runtime->private_data; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret_val; dev_dbg(rtd->dev, "setting buffer ptr param\n"); @@ -593,7 +593,7 @@ static int sst_soc_trigger(struct snd_soc_component *component, int ret_val = 0, str_id; struct sst_runtime_stream *stream; int status; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); dev_dbg(rtd->dev, "%s called\n", __func__); if (substream->pcm->internal) @@ -641,7 +641,7 @@ static snd_pcm_uframes_t sst_soc_pointer(struct snd_soc_component *component, struct sst_runtime_stream *stream; int ret_val, status; struct pcm_stream_info *str_info; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); stream = substream->runtime->private_data; status = sst_get_stream_status(stream); @@ -671,7 +671,7 @@ static snd_pcm_sframes_t sst_soc_delay(struct snd_soc_component *component, static int sst_soc_pcm_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_pcm *pcm = rtd->pcm; if (dai->driver->playback.channels_min || @@ -762,7 +762,7 @@ static int sst_soc_prepare(struct device *dev) /* set the SSPs to idle */ for_each_card_rtds(drv->soc_card, rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); if (snd_soc_dai_active(dai)) { send_ssp_cmd(dai, dai->name, 0); @@ -783,7 +783,7 @@ static void sst_soc_complete(struct device *dev) /* restart SSPs */ for_each_card_rtds(drv->soc_card, rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); if (snd_soc_dai_active(dai)) { sst_handle_vb_timer(dai, true); diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index d0682bc543c9..3ae26f21458f 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -103,8 +103,8 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* Workaround: set codec PLL to 19.2MHz that PLL source is @@ -167,7 +167,7 @@ static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) { struct bdw_rt5650_priv *bdw_rt5650 = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int ret; diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index f3e08d258ac1..304af3d06d01 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -153,8 +153,8 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_MCLK, 24576000, @@ -170,8 +170,8 @@ static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream, static int bdw_rt5677_dsp_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_PLL1, 24576000, @@ -227,7 +227,7 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd) { struct bdw_rt5677_priv *bdw_rt5677 = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); int ret; diff --git a/sound/soc/intel/boards/bdw_rt286.c b/sound/soc/intel/boards/bdw_rt286.c index 036579331d8f..7f20159c23e5 100644 --- a/sound/soc/intel/boards/bdw_rt286.c +++ b/sound/soc/intel/boards/bdw_rt286.c @@ -61,7 +61,7 @@ static const struct snd_soc_dapm_route card_routes[] = { static int codec_link_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = snd_soc_card_jack_new_pins(rtd->card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0, @@ -75,7 +75,7 @@ static int codec_link_init(struct snd_soc_pcm_runtime *rtd) static void codec_link_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(codec, NULL, NULL); } @@ -98,8 +98,8 @@ static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static int codec_link_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, SND_SOC_CLOCK_IN); diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index cbfff466c5c8..816fad8c1ff0 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -226,8 +226,8 @@ static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int clk_freq; /* Configure sysclk for codec */ @@ -275,7 +275,7 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct bxt_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct bxt_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -293,7 +293,7 @@ static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int broxton_da7219_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index bf89fe80423d..4631106f2a28 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -155,7 +155,7 @@ static const struct snd_soc_dapm_route geminilake_rt298_map[] = { static int broxton_rt298_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); @@ -165,7 +165,7 @@ static int broxton_rt298_fe_init(struct snd_soc_pcm_runtime *rtd) static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret = 0; ret = snd_soc_card_jack_new_pins(rtd->card, "Headset", @@ -186,7 +186,7 @@ static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd) static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct bxt_rt286_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct bxt_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -224,8 +224,8 @@ static int broxton_ssp5_fixup(struct snd_soc_pcm_runtime *rtd, static int broxton_rt298_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c index 9942a2de6f7a..10a84a2c1036 100644 --- a/sound/soc/intel/boards/bytcht_cx2072x.c +++ b/sound/soc/intel/boards/bytcht_cx2072x.c @@ -70,7 +70,7 @@ static const struct acpi_gpio_mapping byt_cht_cx2072x_acpi_gpios[] = { static int byt_cht_cx2072x_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; - struct snd_soc_component *codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(rtd, 0)->component; int ret; if (devm_acpi_dev_add_driver_gpios(codec->dev, @@ -80,7 +80,7 @@ static int byt_cht_cx2072x_init(struct snd_soc_pcm_runtime *rtd) card->dapm.idle_bias_off = true; /* set the default PLL rate, the clock is handled by the codec driver */ - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), CX2072X_MCLK_EXTERNAL_PLL, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), CX2072X_MCLK_EXTERNAL_PLL, 19200000, SND_SOC_CLOCK_IN); if (ret) { dev_err(rtd->dev, "Could not set sysclk\n"); @@ -97,7 +97,7 @@ static int byt_cht_cx2072x_init(struct snd_soc_pcm_runtime *rtd) snd_soc_component_set_jack(codec, &byt_cht_cx2072x_headset, NULL); - snd_soc_dai_set_bclk_ratio(asoc_rtd_to_codec(rtd, 0), 50); + snd_soc_dai_set_bclk_ratio(snd_soc_rtd_to_codec(rtd, 0), 50); return 0; } @@ -123,7 +123,7 @@ static int byt_cht_cx2072x_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch 24-bit. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP); @@ -132,7 +132,7 @@ static int byt_cht_cx2072x_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 24); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 24); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index a3b0cfab17b0..7e5eea690023 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -78,7 +78,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch 24-bit. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP); @@ -87,7 +87,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 24); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 24); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; @@ -105,8 +105,8 @@ static int aif1_startup(struct snd_pcm_substream *substream) static int aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, DA7213_CLKSRC_MCLK, @@ -126,8 +126,8 @@ static int aif1_hw_params(struct snd_pcm_substream *substream, static int aif1_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_pll(codec_dai, 0, diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 7a30d2d36f19..8a0b0e864fbb 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -157,7 +157,7 @@ static struct snd_soc_jack_pin byt_cht_es8316_jack_pins[] = { static int byt_cht_es8316_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_component *codec = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(runtime, 0)->component; struct snd_soc_card *card = runtime->card; struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card); const struct snd_soc_dapm_route *custom_map; @@ -212,7 +212,7 @@ static int byt_cht_es8316_init(struct snd_soc_pcm_runtime *runtime) if (ret) dev_err(card->dev, "unable to enable MCLK\n"); - ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(runtime, 0), 0, 19200000, + ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(runtime, 0), 0, 19200000, SND_SOC_CLOCK_IN); if (ret < 0) { dev_err(card->dev, "can't set codec clock %d\n", ret); @@ -262,7 +262,7 @@ static int byt_cht_es8316_codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch 24-bit. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP @@ -272,7 +272,7 @@ static int byt_cht_es8316_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/bytcht_nocodec.c b/sound/soc/intel/boards/bytcht_nocodec.c index 7fc03f2efd35..4a957d1cece3 100644 --- a/sound/soc/intel/boards/bytcht_nocodec.c +++ b/sound/soc/intel/boards/bytcht_nocodec.c @@ -58,7 +58,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch 24-bit. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP); @@ -68,7 +68,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 24); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 24); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 630784b6cb6d..ed14d9e4aa53 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -525,8 +525,8 @@ static int byt_rt5640_hp_elitepad_1000g2_jack2_check(void *data) static int byt_rt5640_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); return byt_rt5640_prepare_and_enable_pll1(dai, params_rate(params)); } @@ -1229,7 +1229,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) struct snd_soc_card *card = runtime->card; struct byt_rt5640_private *priv = snd_soc_card_get_drvdata(card); struct rt5640_set_jack_data *jack_data = &priv->jack_data; - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; const struct snd_soc_dapm_route *custom_map = NULL; int num_routes = 0; int ret; @@ -1447,7 +1447,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP); @@ -1456,7 +1456,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 805afaf47b29..f9fe8414f454 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -344,8 +344,8 @@ static struct snd_soc_jack_pin bytcr_jack_pins[] = { static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); snd_pcm_format_t format = params_format(params); int rate = params_rate(params); int bclk_ratio; @@ -563,7 +563,7 @@ static int byt_rt5651_add_codec_device_props(struct device *i2c_dev, static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; - struct snd_soc_component *codec = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(runtime, 0)->component; struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card); const struct snd_soc_dapm_route *custom_map; int num_routes; @@ -703,7 +703,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP @@ -714,7 +714,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c index 5c9e06ed1a53..643f1d0094c4 100644 --- a/sound/soc/intel/boards/bytcr_wm5102.c +++ b/sound/soc/intel/boards/bytcr_wm5102.c @@ -201,7 +201,7 @@ static int byt_wm5102_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; struct byt_wm5102_private *priv = snd_soc_card_get_drvdata(card); - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; int ret, jack_type; card->dapm.idle_bias_off = true; @@ -269,7 +269,7 @@ static int byt_wm5102_codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch 16-bit. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP); @@ -278,7 +278,7 @@ static int byt_wm5102_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); if (ret) { dev_err(rtd->dev, "Error setting I2S config: %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 850310de774b..f43bc20d6aae 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -112,8 +112,8 @@ static const struct snd_kcontrol_new cht_mc_controls[] = { static int cht_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, M98090_REG_SYSTEM_CLOCK, @@ -258,7 +258,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, int ret = 0; unsigned int fmt = 0; - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); if (ret < 0) { dev_err(rtd->dev, "can't set cpu_dai slot fmt: %d\n", ret); return ret; @@ -266,7 +266,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP; - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt); + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), fmt); if (ret < 0) { dev_err(rtd->dev, "can't set cpu_dai set fmt: %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index af2d9a78465d..7651b83632fa 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -72,8 +72,8 @@ static const struct snd_kcontrol_new cht_mc_controls[] = { static int cht_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, NAU8824_CLK_FLL_FS, 0, @@ -96,7 +96,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct snd_soc_jack *jack = &ctx->jack; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); struct snd_soc_component *component = codec_dai->component; int ret, jack_type; @@ -145,7 +145,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(rtd, 0), 0xf, 0x1, 4, 24); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_codec(rtd, 0), 0xf, 0x1, 4, 24); if (ret < 0) { dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 875bc0b3d85d..df23a581c10e 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -207,8 +207,8 @@ static struct snd_soc_jack_pin cht_bsw_jack_pins[] = { static int cht_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* set codec PLL source to the 19.2MHz platform clock (MCLK) */ @@ -252,7 +252,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; int jack_type; int ret; @@ -359,7 +359,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, * with explicit setting to I2S 2ch 16-bit. The word length is set with * dai_set_tdm_slot() since there is no other API exposed */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP @@ -369,7 +369,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_codec(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BC_FC @@ -379,7 +379,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; @@ -393,7 +393,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, /* * Default mode for SSP configuration is TDM 4 slot */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_codec(rtd, 0), SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_BC_FC); @@ -403,7 +403,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, } /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(rtd, 0), 0xF, 0xF, 4, 24); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_codec(rtd, 0), 0xF, 0xF, 4, 24); if (ret < 0) { dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index daa630a0efc1..f6da24f3c466 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -155,8 +155,8 @@ static const struct snd_kcontrol_new cht_mc_controls[] = { static int cht_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* set codec PLL source to the 19.2MHz platform clock (MCLK) */ @@ -188,7 +188,7 @@ static const struct acpi_gpio_mapping cht_rt5672_gpios[] = { static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { int ret; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); struct snd_soc_component *component = codec_dai->component; struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); @@ -297,7 +297,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, * board. Since we only support 2 channels anyways, there is no need * for TDM on any cht-bsw-rt5672 designs. So we use I2S 2ch everywhere. */ - ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), + ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_cpu(rtd, 0), SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_BP_FP); @@ -306,7 +306,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret; diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index 20da83d9eece..679a09b63ea5 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -135,7 +135,7 @@ static struct snd_soc_jack_pin jack_pins[] = { static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) { struct card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack; int ret; @@ -175,7 +175,7 @@ static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) static void cml_rt5682_codec_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } @@ -212,8 +212,8 @@ static int cml_rt1011_spk_init(struct snd_soc_pcm_runtime *rtd) static int cml_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int clk_id, clk_freq, pll_out, ret; clk_id = RT5682_PLL1_S_MCLK; @@ -245,7 +245,7 @@ static int cml_rt5682_hw_params(struct snd_pcm_substream *substream, static int cml_rt1011_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; struct snd_soc_card *card = rtd->card; int srate, i, ret = 0; @@ -369,7 +369,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) static int hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); diff --git a/sound/soc/intel/boards/ehl_rt5660.c b/sound/soc/intel/boards/ehl_rt5660.c index fee80638cba2..686e60321224 100644 --- a/sound/soc/intel/boards/ehl_rt5660.c +++ b/sound/soc/intel/boards/ehl_rt5660.c @@ -74,7 +74,7 @@ struct sof_hdmi_pcm { static int hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -109,8 +109,8 @@ static int card_late_probe(struct snd_soc_card *card) static int rt5660_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, @@ -267,7 +267,7 @@ static void hdmi_link_init(struct snd_soc_card *card, * hdmi codec is not supported */ for (i = HDMI_LINK_START; i <= HDMI_LINE_END; i++) - card->dai_link[i].codecs[0] = asoc_dummy_dlc; + card->dai_link[i].codecs[0] = snd_soc_dummy_dlc; } static int snd_ehl_rt5660_probe(struct platform_device *pdev) diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c index cf0f89db3e20..657e4658234c 100644 --- a/sound/soc/intel/boards/glk_rt5682_max98357a.c +++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c @@ -152,8 +152,8 @@ static int geminilake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int geminilake_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) { struct glk_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_jack *jack; int pll_id, pll_source, clk_id, ret; @@ -215,8 +215,8 @@ static int geminilake_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) static int geminilake_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* Set valid bitmask & configuration for I2S in 24 bit */ @@ -236,7 +236,7 @@ static struct snd_soc_ops geminilake_rt5682_ops = { static int geminilake_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct glk_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct glk_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -253,7 +253,7 @@ static int geminilake_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int geminilake_rt5682_fe_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; struct snd_soc_dapm_context *dapm; int ret; diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c index 050c53ebd6ba..2a2fe27dff0e 100644 --- a/sound/soc/intel/boards/hsw_rt5640.c +++ b/sound/soc/intel/boards/hsw_rt5640.c @@ -47,8 +47,8 @@ static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static int codec_link_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_MCLK, 12288000, SND_SOC_CLOCK_IN); diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index 97149513076f..a5d8965303a8 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -179,8 +179,8 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_jack *jack; int ret; @@ -225,7 +225,7 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct kbl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -258,7 +258,7 @@ static int kabylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_da7219_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c index a1f8234c77bd..98c11ec0adc0 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98927.c +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c @@ -194,7 +194,7 @@ static const struct snd_soc_dapm_route kabylake_ssp1_map[] = { static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret, j; @@ -239,7 +239,7 @@ static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, static int kabylake_ssp0_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int j, ret; @@ -354,7 +354,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack; struct snd_soc_card *card = rtd->card; int ret; @@ -406,7 +406,7 @@ static int kabylake_dmic_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct kbl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -439,7 +439,7 @@ static int kabylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_da7219_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c index 2c7a547f63c9..30e0aca161cd 100644 --- a/sound/soc/intel/boards/kbl_rt5660.c +++ b/sound/soc/intel/boards/kbl_rt5660.c @@ -157,7 +157,7 @@ static int kabylake_rt5660_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); ret = devm_acpi_dev_add_driver_gpios(component->dev, acpi_rt5660_gpios); @@ -222,7 +222,7 @@ static void kabylake_rt5660_codec_exit(struct snd_soc_pcm_runtime *rtd) static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct kbl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -255,8 +255,8 @@ static int kabylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_rt5660_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 2d4224c5b152..9071b1f1cbd0 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -259,7 +259,7 @@ static int kabylake_rt5663_fe_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); ret = snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); @@ -275,7 +275,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack; /* @@ -324,7 +324,7 @@ static int kabylake_rt5663_max98927_codec_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct kbl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -472,8 +472,8 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int kabylake_rt5663_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* use ASRC for internal clocks, as PLL rate isn't multiple of BCLK */ @@ -510,7 +510,7 @@ static int kabylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd, static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret = 0, j; diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 2c79fca57b19..178fe9c37df6 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -217,7 +217,7 @@ static struct snd_soc_codec_conf max98927_codec_conf[] = { static int kabylake_rt5663_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; int ret; dapm = snd_soc_component_get_dapm(component); @@ -232,7 +232,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack; /* @@ -268,7 +268,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct kbl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -407,8 +407,8 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int kabylake_rt5663_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* use ASRC for internal clocks, as PLL rate isn't multiple of BCLK */ @@ -431,7 +431,7 @@ static struct snd_soc_ops kabylake_rt5663_ops = { static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret = 0, j; diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index a06e05154ae1..6c6ef63cd5d9 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -155,7 +155,7 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets); if (!ctx->idisp_codec) { for (i = 0; i < IDISP_DAI_COUNT; i++) { - skl_hda_be_dai_links[i].codecs = &asoc_dummy_dlc; + skl_hda_be_dai_links[i].codecs = &snd_soc_dummy_dlc; skl_hda_be_dai_links[i].num_codecs = 1; } } @@ -179,7 +179,7 @@ static void skl_set_hda_codec_autosuspend_delay(struct snd_soc_card *card) for_each_card_rtds(card, rtd) { if (!strstr(rtd->dai_link->codecs->name, "ehdaudio0D0")) continue; - dai = asoc_rtd_to_codec(rtd, 0); + dai = snd_soc_rtd_to_codec(rtd, 0); hda_pvt = snd_soc_component_get_drvdata(dai->component); if (hda_pvt) { /* diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index e13a5a4d8f7e..0e7025834594 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -168,7 +168,7 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; /* * Headset buttons map to the google Reference headset. @@ -194,7 +194,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) { struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -212,7 +212,7 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) { struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -230,7 +230,7 @@ static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) { struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -248,7 +248,7 @@ static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); @@ -307,8 +307,8 @@ static const struct snd_soc_ops skylake_nau8825_fe_ops = { static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 575604dc8936..fadc25a536b4 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -172,12 +172,12 @@ static int skylake_ssm4567_codec_init(struct snd_soc_pcm_runtime *rtd) int ret; /* Slot 1 for left */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(rtd, 0), 0x01, 0x01, 2, 48); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_codec(rtd, 0), 0x01, 0x01, 2, 48); if (ret < 0) return ret; /* Slot 2 for right */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(rtd, 1), 0x02, 0x02, 2, 48); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_codec(rtd, 1), 0x02, 0x02, 2, 48); if (ret < 0) return ret; @@ -187,7 +187,7 @@ static int skylake_ssm4567_codec_init(struct snd_soc_pcm_runtime *rtd) static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; /* * 4 buttons here map to the google Reference headset @@ -213,7 +213,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) { struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -231,7 +231,7 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) { struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -250,7 +250,7 @@ static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) { struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -268,7 +268,7 @@ static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); @@ -359,8 +359,8 @@ static int skylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd, static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c index 4f3d655e2bfa..c59c60e28091 100644 --- a/sound/soc/intel/boards/skl_rt286.c +++ b/sound/soc/intel/boards/skl_rt286.c @@ -112,7 +112,7 @@ static const struct snd_soc_dapm_route skylake_rt286_map[] = { static int skylake_rt286_fe_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dapm_context *dapm; - struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_cpu(rtd, 0)->component; dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); @@ -122,7 +122,7 @@ static int skylake_rt286_fe_init(struct snd_soc_pcm_runtime *rtd) static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; int ret; ret = snd_soc_card_jack_new_pins(rtd->card, "Headset", @@ -143,7 +143,7 @@ static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct skl_rt286_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -228,8 +228,8 @@ static int skylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, static int skylake_rt286_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, diff --git a/sound/soc/intel/boards/sof_cirrus_common.c b/sound/soc/intel/boards/sof_cirrus_common.c index 8b8b07e4f2fe..e71e09124b34 100644 --- a/sound/soc/intel/boards/sof_cirrus_common.c +++ b/sound/soc/intel/boards/sof_cirrus_common.c @@ -91,7 +91,7 @@ static const struct { static int cs35l41_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int clk_freq, i, ret; diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c index 70d3002afb52..56582e561fb7 100644 --- a/sound/soc/intel/boards/sof_cs42l42.c +++ b/sound/soc/intel/boards/sof_cs42l42.c @@ -88,7 +88,7 @@ struct sof_card_private { static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -107,7 +107,7 @@ static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int sof_cs42l42_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack = &ctx->headset_jack; int ret; @@ -143,7 +143,7 @@ static int sof_cs42l42_init(struct snd_soc_pcm_runtime *rtd) static void sof_cs42l42_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } @@ -151,8 +151,8 @@ static void sof_cs42l42_exit(struct snd_soc_pcm_runtime *rtd) static int sof_cs42l42_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int clk_freq, ret; clk_freq = sof_dai_get_bclk(rtd); /* BCLK freq */ @@ -506,7 +506,7 @@ static int create_bt_offload_dai_links(struct device *dev, goto devm_err; links[*id].id = *id; - links[*id].codecs = &asoc_dummy_dlc; + links[*id].codecs = &snd_soc_dummy_dlc; links[*id].num_codecs = 1; links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); diff --git a/sound/soc/intel/boards/sof_da7219.c b/sound/soc/intel/boards/sof_da7219.c index 6a71d5871938..f21482c42667 100644 --- a/sound/soc/intel/boards/sof_da7219.c +++ b/sound/soc/intel/boards/sof_da7219.c @@ -131,7 +131,7 @@ static struct snd_soc_jack_pin jack_pins[] = { static int da7219_codec_init(struct snd_soc_pcm_runtime *rtd) { struct card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack *jack = &ctx->headset_jack; int mclk_rate, ret; @@ -197,11 +197,11 @@ static int da7219_codec_init(struct snd_soc_pcm_runtime *rtd) static int max98373_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); int ret, j; for (j = 0; j < runtime->dai_link->num_codecs; j++) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, j); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, j); if (!strcmp(codec_dai->component->name, MAX_98373_DEV0_NAME)) { /* vmon_slot_no = 0 imon_slot_no = 1 for TX slots */ @@ -231,7 +231,7 @@ static const struct snd_soc_ops max98373_ops = { static int hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index f8a3e8a91761..4cafe20b14fe 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -126,7 +126,7 @@ static void pcm_pop_work_events(struct work_struct *work) static int sof_8336_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); @@ -251,7 +251,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *runtime) static int sof_hdmi_init(struct snd_soc_pcm_runtime *runtime) { struct sof_es8336_private *priv = snd_soc_card_get_drvdata(runtime->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(runtime, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(runtime->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -269,7 +269,7 @@ static int sof_hdmi_init(struct snd_soc_pcm_runtime *runtime) static int sof_es8316_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_component *codec = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(runtime, 0)->component; struct snd_soc_card *card = runtime->card; struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); const struct snd_soc_dapm_route *custom_map; @@ -308,7 +308,7 @@ static int sof_es8316_init(struct snd_soc_pcm_runtime *runtime) static void sof_es8316_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } @@ -355,8 +355,8 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = { static int sof_es8336_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); const int sysclk = 19200000; int ret; @@ -565,7 +565,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, if (!links[id].name) return NULL; links[id].id = id + hdmi_id_offset; - links[id].codecs = &asoc_dummy_dlc; + links[id].codecs = &snd_soc_dummy_dlc; links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); diff --git a/sound/soc/intel/boards/sof_maxim_common.c b/sound/soc/intel/boards/sof_maxim_common.c index 628b6d5d3ee4..3c00afc32805 100644 --- a/sound/soc/intel/boards/sof_maxim_common.c +++ b/sound/soc/intel/boards/sof_maxim_common.c @@ -59,7 +59,7 @@ EXPORT_SYMBOL_NS(max_98373_components, SND_SOC_INTEL_SOF_MAXIM_COMMON); static int max_98373_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int j; @@ -78,7 +78,7 @@ static int max_98373_hw_params(struct snd_pcm_substream *substream, int max_98373_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai; int j; @@ -88,7 +88,7 @@ int max_98373_trigger(struct snd_pcm_substream *substream, int cmd) if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) return 0; - cpu_dai = asoc_rtd_to_cpu(rtd, 0); + cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); for_each_rtd_codec_dais(rtd, j, codec_dai) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cpu_dai->component); @@ -223,7 +223,7 @@ static const struct { static int max_98390_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int i, ret; diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 10fdd70b09c9..f9a52dab034f 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -65,7 +65,7 @@ struct sof_card_private { static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -95,7 +95,7 @@ static struct snd_soc_jack_pin jack_pins[] = { static int sof_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack; int ret; @@ -134,7 +134,7 @@ static int sof_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) static void sof_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } @@ -142,8 +142,8 @@ static void sof_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd) static int sof_nau8825_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int clk_freq, ret; clk_freq = sof_dai_get_bclk(rtd); /* BCLK freq */ @@ -468,7 +468,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); if (!links[id].name) goto devm_err; - links[id].codecs = &asoc_dummy_dlc; + links[id].codecs = &snd_soc_dummy_dlc; links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c index 9f673ccf81b5..b01cb2329542 100644 --- a/sound/soc/intel/boards/sof_pcm512x.c +++ b/sound/soc/intel/boards/sof_pcm512x.c @@ -71,7 +71,7 @@ static const struct dmi_system_id sof_pcm512x_quirk_table[] = { static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -89,7 +89,7 @@ static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int sof_pcm512x_codec_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *codec = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_update_bits(codec, PCM512x_GPIO_EN, 0x08, 0x08); snd_soc_component_update_bits(codec, PCM512x_GPIO_OUTPUT_4, 0x0f, 0x02); @@ -101,8 +101,8 @@ static int sof_pcm512x_codec_init(struct snd_soc_pcm_runtime *rtd) static int aif1_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_component *codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_component *codec = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08, 0x08); @@ -112,8 +112,8 @@ static int aif1_startup(struct snd_pcm_substream *substream) static void aif1_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_component *codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_component *codec = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08, 0x00); @@ -331,7 +331,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, devm_kasprintf(dev, GFP_KERNEL, "intel-hdmi-hifi%d", i); } else { - idisp_components[i - 1] = asoc_dummy_dlc; + idisp_components[i - 1] = snd_soc_dummy_dlc; } if (!idisp_components[i - 1].dai_name) goto devm_err; diff --git a/sound/soc/intel/boards/sof_realtek_common.c b/sound/soc/intel/boards/sof_realtek_common.c index 6c12ca92f371..80c8687cd1da 100644 --- a/sound/soc/intel/boards/sof_realtek_common.c +++ b/sound/soc/intel/boards/sof_realtek_common.c @@ -68,7 +68,7 @@ static const struct { static int rt1011_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int srate, i, ret = 0; @@ -264,7 +264,7 @@ static const struct { static int rt1015_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *codec_dai; int i, clk_freq; @@ -423,9 +423,9 @@ static int rt1308_init(struct snd_soc_pcm_runtime *rtd) static int rt1308_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int clk_id, clk_freq, pll_out; int ret; diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 9ece71062a3b..991763efb7d2 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -235,7 +235,7 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -265,7 +265,7 @@ static struct snd_soc_jack_pin jack_pins[] = { static int sof_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_jack *jack; int extra_jack_data; int ret, mclk_freq; @@ -372,7 +372,7 @@ static int sof_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) static void sof_rt5682_codec_exit(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } @@ -380,9 +380,9 @@ static void sof_rt5682_codec_exit(struct snd_soc_pcm_runtime *rtd) static int sof_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int pll_id, pll_source, pll_in, pll_out, clk_id, ret; if (sof_rt5682_quirk & SOF_RT5682_MCLK_EN) { @@ -827,7 +827,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type, if (!idisp_components[i - 1].dai_name) goto devm_err; } else { - idisp_components[i - 1] = asoc_dummy_dlc; + idisp_components[i - 1] = snd_soc_dummy_dlc; } links[id].codecs = &idisp_components[i - 1]; @@ -929,7 +929,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type, links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); if (!links[id].name) goto devm_err; - links[id].codecs = &asoc_dummy_dlc; + links[id].codecs = &snd_soc_dummy_dlc; links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); @@ -956,7 +956,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type, if (!links[id].name) return NULL; links[id].id = id + hdmi_id_offset; - links[id].codecs = &asoc_dummy_dlc; + links[id].codecs = &snd_soc_dummy_dlc; links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index b36cdf374a82..d9e20728cde7 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -501,12 +501,12 @@ int sdw_startup(struct snd_pcm_substream *substream) int sdw_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sdw_stream_runtime *sdw_stream; struct snd_soc_dai *dai; /* Find stream from first CPU DAI */ - dai = asoc_rtd_to_cpu(rtd, 0); + dai = snd_soc_rtd_to_cpu(rtd, 0); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); if (IS_ERR(sdw_stream)) { @@ -519,13 +519,13 @@ int sdw_prepare(struct snd_pcm_substream *substream) int sdw_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sdw_stream_runtime *sdw_stream; struct snd_soc_dai *dai; int ret; /* Find stream from first CPU DAI */ - dai = asoc_rtd_to_cpu(rtd, 0); + dai = snd_soc_rtd_to_cpu(rtd, 0); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); if (IS_ERR(sdw_stream)) { @@ -559,7 +559,7 @@ int sdw_trigger(struct snd_pcm_substream *substream, int cmd) int sdw_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ch = params_channels(params); struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai; @@ -607,12 +607,12 @@ int sdw_hw_params(struct snd_pcm_substream *substream, int sdw_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sdw_stream_runtime *sdw_stream; struct snd_soc_dai *dai; /* Find stream from first CPU DAI */ - dai = asoc_rtd_to_cpu(rtd, 0); + dai = snd_soc_rtd_to_cpu(rtd, 0); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); if (IS_ERR(sdw_stream)) { @@ -1774,8 +1774,8 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port); ret = init_simple_dai_link(dev, dai_links + link_index, &be_id, name, - 1, 1, cpu_dai_name, asoc_dummy_dlc.name, - asoc_dummy_dlc.dai_name, NULL, NULL); + 1, 1, cpu_dai_name, snd_soc_dummy_dlc.name, + snd_soc_dummy_dlc.dai_name, NULL, NULL); if (ret) return ret; } diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c index ad130d913415..436f41086da6 100644 --- a/sound/soc/intel/boards/sof_sdw_cs42l42.c +++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c @@ -50,7 +50,7 @@ static int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mc_private *ctx = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack *jack; int ret; diff --git a/sound/soc/intel/boards/sof_sdw_cs42l43.c b/sound/soc/intel/boards/sof_sdw_cs42l43.c index e34750b75d76..dc3062cc3a43 100644 --- a/sound/soc/intel/boards/sof_sdw_cs42l43.c +++ b/sound/soc/intel/boards/sof_sdw_cs42l43.c @@ -41,7 +41,7 @@ static const struct snd_soc_dapm_route cs42l43_dmic_map[] = { static int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_jack *jack = &ctx->sdw_headset; struct snd_soc_card *card = rtd->card; diff --git a/sound/soc/intel/boards/sof_sdw_hdmi.c b/sound/soc/intel/boards/sof_sdw_hdmi.c index d47d8bf528c1..7e07aa685573 100644 --- a/sound/soc/intel/boards/sof_sdw_hdmi.c +++ b/sound/soc/intel/boards/sof_sdw_hdmi.c @@ -24,7 +24,7 @@ struct hdmi_pcm { int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c index 414c4d8dac77..e36b8d8c70c9 100644 --- a/sound/soc/intel/boards/sof_sdw_maxim.c +++ b/sound/soc/intel/boards/sof_sdw_maxim.c @@ -64,7 +64,7 @@ static int spk_init(struct snd_soc_pcm_runtime *rtd) static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enable) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai; int ret; @@ -74,7 +74,7 @@ static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enabl if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) return 0; - cpu_dai = asoc_rtd_to_cpu(rtd, 0); + cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); for_each_rtd_codec_dais(rtd, j, codec_dai) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cpu_dai->component); diff --git a/sound/soc/intel/boards/sof_sdw_rt5682.c b/sound/soc/intel/boards/sof_sdw_rt5682.c index 3a9be8211586..7b7c9def398b 100644 --- a/sound/soc/intel/boards/sof_sdw_rt5682.c +++ b/sound/soc/intel/boards/sof_sdw_rt5682.c @@ -49,7 +49,7 @@ static int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mc_private *ctx = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack *jack; int ret; diff --git a/sound/soc/intel/boards/sof_sdw_rt700.c b/sound/soc/intel/boards/sof_sdw_rt700.c index c93b1f5b9440..a1714afe8515 100644 --- a/sound/soc/intel/boards/sof_sdw_rt700.c +++ b/sound/soc/intel/boards/sof_sdw_rt700.c @@ -49,7 +49,7 @@ static int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mc_private *ctx = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack *jack; int ret; diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c index 2b05e2a707de..38782fdfcf15 100644 --- a/sound/soc/intel/boards/sof_sdw_rt711.c +++ b/sound/soc/intel/boards/sof_sdw_rt711.c @@ -73,7 +73,7 @@ static int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mc_private *ctx = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack *jack; int ret; diff --git a/sound/soc/intel/boards/sof_sdw_rt_amp.c b/sound/soc/intel/boards/sof_sdw_rt_amp.c index 26bf9e0dd3d2..436975b6bdc1 100644 --- a/sound/soc/intel/boards/sof_sdw_rt_amp.c +++ b/sound/soc/intel/boards/sof_sdw_rt_amp.c @@ -251,9 +251,9 @@ static int all_spk_init(struct snd_soc_pcm_runtime *rtd) static int rt1308_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int clk_id, clk_freq, pll_out; int err; diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c index 623e3bebb888..ef62ac5fdf55 100644 --- a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c +++ b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c @@ -78,7 +78,7 @@ static int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mc_private *ctx = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack *jack; int ret; diff --git a/sound/soc/intel/boards/sof_ssp_amp.c b/sound/soc/intel/boards/sof_ssp_amp.c index 483ddb1c04cd..e8447da24e59 100644 --- a/sound/soc/intel/boards/sof_ssp_amp.c +++ b/sound/soc/intel/boards/sof_ssp_amp.c @@ -168,7 +168,7 @@ static struct snd_soc_dai_link_component dmic_component[] = { static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) { struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct sof_hdmi_pcm *pcm; pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); @@ -233,7 +233,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, if (!links[id].name) return NULL; links[id].id = fixed_be ? (HDMI_IN_BE_ID + i - 1) : id; - links[id].codecs = &asoc_dummy_dlc; + links[id].codecs = &snd_soc_dummy_dlc; links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); @@ -341,7 +341,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, if (!idisp_components[i - 1].dai_name) goto devm_err; } else { - idisp_components[i - 1] = asoc_dummy_dlc; + idisp_components[i - 1] = snd_soc_dummy_dlc; } links[id].codecs = &idisp_components[i - 1]; @@ -369,7 +369,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); if (!links[id].name) goto devm_err; - links[id].codecs = &asoc_dummy_dlc; + links[id].codecs = &snd_soc_dummy_dlc; links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c index 17224d26d9d6..4cb0d463bf40 100644 --- a/sound/soc/intel/boards/sof_wm8804.c +++ b/sound/soc/intel/boards/sof_wm8804.c @@ -49,9 +49,9 @@ static const struct dmi_system_id sof_wm8804_quirk_table[] = { static int sof_wm8804_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *codec = codec_dai->component; const int sysclk = 27000000; /* This is fixed on this board */ int samplerate; diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c index f1a5cb825ff1..3daf5eb37f7b 100644 --- a/sound/soc/intel/catpt/pcm.c +++ b/sound/soc/intel/catpt/pcm.c @@ -74,8 +74,8 @@ static struct catpt_stream_template *catpt_topology[] = { static struct catpt_stream_template * catpt_get_stream_template(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtm, 0); + struct snd_soc_pcm_runtime *rtm = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtm, 0); enum catpt_stream_type type; type = cpu_dai->driver->id; @@ -593,7 +593,7 @@ static int catpt_component_pcm_construct(struct snd_soc_component *component, static int catpt_component_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtm = snd_soc_substream_to_rtd(substream); if (!rtm->dai_link->no_pcm) snd_soc_set_runtime_hwparams(substream, &catpt_pcm_hardware); @@ -604,8 +604,8 @@ static snd_pcm_uframes_t catpt_component_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtm, 0); + struct snd_soc_pcm_runtime *rtm = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtm, 0); struct catpt_stream_runtime *stream; struct catpt_dev *cdev = dev_get_drvdata(component->dev); u32 pos; @@ -631,7 +631,7 @@ static const struct snd_soc_dai_ops catpt_fe_dai_ops = { static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm, struct snd_soc_dai *dai) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtm, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtm, 0); struct catpt_ssp_device_format devfmt; struct catpt_dev *cdev = dev_get_drvdata(dai->dev); int ret; diff --git a/sound/soc/intel/keembay/kmb_platform.c b/sound/soc/intel/keembay/kmb_platform.c index 6b06b7b5ede8..e929497a5eb5 100644 --- a/sound/soc/intel/keembay/kmb_platform.c +++ b/sound/soc/intel/keembay/kmb_platform.c @@ -252,10 +252,10 @@ static int kmb_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct kmb_i2s_info *kmb_i2s; - kmb_i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + kmb_i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); snd_soc_set_runtime_hwparams(substream, &kmb_pcm_hardware); snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); runtime->private_data = kmb_i2s; diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index ac3dc8c63c26..9f7b0a944bb1 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -545,8 +545,8 @@ static int skl_link_hw_params(struct snd_pcm_substream *substream, { struct hdac_bus *bus = dev_get_drvdata(dai->dev); struct hdac_ext_stream *link_dev; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct skl_pipe_params p_params = {0}; struct hdac_ext_link *link; int stream_tag; @@ -633,7 +633,7 @@ static int skl_link_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct hdac_bus *bus = dev_get_drvdata(dai->dev); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct hdac_ext_stream *link_dev = snd_soc_dai_get_dma_data(dai, substream); struct hdac_ext_link *link; @@ -643,7 +643,7 @@ static int skl_link_hw_free(struct snd_pcm_substream *substream, link_dev->link_prepared = 0; - link = snd_hdac_ext_bus_get_hlink_by_name(bus, asoc_rtd_to_codec(rtd, 0)->component->name); + link = snd_hdac_ext_bus_get_hlink_by_name(bus, snd_soc_rtd_to_codec(rtd, 0)->component->name); if (!link) return -EINVAL; @@ -1070,10 +1070,10 @@ int skl_dai_load(struct snd_soc_component *cmp, int index, static int skl_platform_soc_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *dai_link = rtd->dai_link; - dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "In %s:%s\n", __func__, + dev_dbg(snd_soc_rtd_to_cpu(rtd, 0)->dev, "In %s:%s\n", __func__, dai_link->cpus->dai_name); snd_soc_set_runtime_hwparams(substream, &azx_pcm_hw); @@ -1217,8 +1217,8 @@ static snd_pcm_uframes_t skl_platform_soc_pointer( static u64 skl_adjust_codec_delay(struct snd_pcm_substream *substream, u64 nsec) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); u64 codec_frames, codec_nsecs; if (!codec_dai->driver->ops->delay) @@ -1272,7 +1272,7 @@ static int skl_platform_soc_get_time_info( static int skl_platform_soc_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); struct hdac_bus *bus = dev_get_drvdata(dai->dev); struct snd_pcm *pcm = rtd->pcm; unsigned int size; From patchwork Tue Sep 26 06:24:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728181 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 EAE3EEE020C for ; Tue, 26 Sep 2023 06:31:11 +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 3B10F14F4; Tue, 26 Sep 2023 08:30:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3B10F14F4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709870; bh=yUVbFO12NiKD9xMQ9vt+M+/4HRin0LJXSZ6bFZIShLQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=jHdyIg0z5Kot5GHigxSjDS/Dkx9I4L6Hjwuc+H5bNNx06f73ibDU3+/QhfF2yseVd clfpXDWG9ljhvCn3FWPMK7qHOn/5rWXrfHfF3UjzCf2xHusCa47p7Qk6RF0ZekAuy8 rvHfkWqniMoFbm28lbYJCYGi5CKs4JZeAaNkx/a4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B8C97F805E0; Tue, 26 Sep 2023 08:24:55 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 50B15F805E0; Tue, 26 Sep 2023 08:24:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B6A50F805AB; Tue, 26 Sep 2023 08:24:50 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20723.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::723]) (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 54BC0F80567 for ; Tue, 26 Sep 2023 08:24:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54BC0F80567 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=MSwyrPgF ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZkEM10zWXuRqFVN+E9gomy7ICNkn5iv6fYSFgKFrdHsC6i9t5SyO2ZZmL+6f7Kow8wi0ILJFQqsOA/VY/HpM+q2uQ7f76QX6rYLc4o5vi34K5umcLPoGggDhOcTjXM6rxgkTkWKfp9zqyLpt4nh/yfxous27K7mfI3evo556r/pALR2NiporLoULyGQ1rXWSY/ab508rYEpirsTeOGGT+WQegD323iviKLRiDLCuTQSO6SD7WF44ewJp5J7V7kzkr40y22Pu0qP6cQbKC2uFwsa08RYmN/rKweQZ5GLxC30nlDqOO5HAJ4lppKHZxV7FFCebXGLXn3iTw+ZAYh5xqQ== 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=hc0hJNs+1Y0TP2Ku0YPneeIaqqyop4MMwJD23axcgEA=; b=Gk1jOzeAXEgZHhwzU3ZExIr1tMsdOhQA+dtjin1eJmAtTTRPjQuF/uksdjFxwxqVUaaBUt/evvolM3iyq7Tei4aG1uff2x6E/uR5kC8gDy7XFHPOW5k3vh/HNGCWuxiPt655sCFMZRyvHfE8nEDVsXVdaejwgnyDa6LhSEXGKNlNL9ODbsMAeS1C9+/TLpGq6c0OufkE3oYA1THSCCwY7g1YTKWftsZd77MaFmBQBZr+d0Y95F+7AzvbyLWJPYDH+vle02ONy+6pQhdi2UB5sLt5NITopTaKA2VQiKqJnEuY+HbUvB3fFW3cnuEqnGNtz3eJC+5ZHchjST3eszyk6A== 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=hc0hJNs+1Y0TP2Ku0YPneeIaqqyop4MMwJD23axcgEA=; b=MSwyrPgF5MadbDkLVx7ocTFRTdc4ghk7GcBfE+m4HRDWVpN65l+9nsYPyVHLJcnzkNQKCZspt5VPHt4p4YAQi/FEyh9piim7s4l1qzdlzfQuGhhKzfJjb2kITkCG0+qqdZzqNifL/MWIwbBQsgHNfb2sGoDVhdyaBKBLybHHHm8= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:24:36 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:24:35 +0000 Message-ID: <87y1gtfo4e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?unknown-8bit?q?=22Amadeusz_S=C3=85=82awi=C3=85=84ski=22_=3Camadeuszx?= =?unknown-8bit?q?=2Eslawinski=40linux=2Eintel=2Ecom=3E=2C_Bard_Liao_=3Cyung?= =?unknown-8bit?q?-chuan=2Eliao=40linux=2Eintel=2Ecom=3E=2C_Brent_Lu_=3Cbren?= =?unknown-8bit?q?t=2Elu=40intel=2Ecom=3E=2C_Cezary_Rojewski_=3Ccezary=2Eroj?= =?unknown-8bit?q?ewski=40intel=2Ecom=3E=2C_Jaroslav_Kysela_=3Cperex=40perex?= =?unknown-8bit?q?=2Ecz=3E=2C_Kai_Vehmanen_=3Ckai=2Evehmanen=40linux=2Eintel?= =?unknown-8bit?q?=2Ecom=3E=2C_Liam_Girdwood_=3Cliam=2Er=2Egirdwood=40linux?= =?unknown-8bit?q?=2Eintel=2Ecom=3E=2C_Mark_Brown_=3Cbroonie=40kernel=2Eorg?= =?unknown-8bit?q?=3E=2C_Peter_Ujfalusi_=3Cpeter=2Eujfalusi=40linux=2Eintel?= =?unknown-8bit?q?=2Ecom=3E=2C_Pierre-Louis_Bossart_=3Cpierre-louis=2Ebossar?= =?unknown-8bit?q?t=40linux=2Eintel=2Ecom=3E=2C_Ranjani_Sridharan_=3Cranjani?= =?unknown-8bit?q?=2Esridharan=40linux=2Eintel=2Ecom=3E=2C_Takashi_Iwai_=3Ct?= =?unknown-8bit?q?iwai=40suse=2Ecom=3E?= Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 36/54] ASoC: intel: avs: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:24:34 +0000 X-ClientProxiedBy: TY2PR06CA0029.apcprd06.prod.outlook.com (2603:1096:404:2e::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fd93160-2e83-4a3a-ad45-08dbbe594122 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eK89vxNrpPcywWx0NthTULQ3/vxtwY1sQoM9RERlhg35m+9h5dxsgullZ3nJgtqZV0vQTplrEwz+WgK0wNhY/EO3buAL5zYksCMGmygXuRadd28IPH+WNUXZfFyiMyiquGKMXzAHuU2noW6oP8yywgg1ZbjRP21RSsCLs9PSerMcyOioJK1r/Gui6o0L4XxIPOqpegtaYEwvojdYjeIngvQpa5fACDpxuKvdNNQH9u1qs9TIAZNXt6VH54TyT9SIvg8X7Ocj4n4QCVmC8uWS7p9GO/70BuqqqZADT4qwvtOSCi8dVL+lpT8MGPwvK38rH9+bUP7MHRnyDnoNMjB1MFK8buedD9fw/pipzaVd4/ejNfrbQMNX9MH6OBHT01ycAHbMirWrQbIBHfY8rEE/Y+pvl9T9pQxeJwEvtYyhlIv+EYYvQFeP8ww1khQmxlWH5cUIDrdOCLThuyLm1WrYOuwWtASfPi7DwsoyG2khJadDNQjwgbFLxMONCZ+fo+UKkK7e5mV5s4nSFtAyfDd8lwNS0xu8d3cX6236U/dNKT2RtMAxCwXjk4ikst0Qknl3VhllLE3KdhyIehgzWyjjUQv8WbSIiNSnOfzdiHhineZVyv00lPderG95QG1TGg8qym78ZT4AOKVSayFihnRUf38/RI1IYVmtfYKgva0KBmE= 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(921005)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(30864003)(41300700001)(7416002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IP8YM0yKI6HzHKQax5anlt5UgmX0EsuWgCseg2gqyshjGO+6ysTd62QqiF1Fv099813yuFlnCr6XJzfrXR3wPpvGO5a6boU9r4owL7CQHL7ARkbtHDWJtxX1foifN2f7qXZJpl93cIiF1qdHsefbRh19hd9QJQRX42qtUNYBxLBFvp2AGr2yb7ooJ8LzcQaXW3wiAAQR932fMIAWzoEiqLBmLszQQ65ZXp/30+t7L1c4u0ZsZ1qJ3iRhsrxH+rGKHz3nDOzS78ktMEYXcUIshiU2ruDh4vzaQxUJBBLV+V6OL2h1RrQiW5Kw+xchjDKAD3aY2/jktb8Plc8GbaytvjITEayQMGUrrZMqYVFlUmprHHdoDz9/Gv7DkobZVKA7P3vuGjaIEIxpMkkupqpgIgAG1U64L0DRndzjlrvPybBlev0LjpABAFh+PNXcekCvAM8AUEzw4oRoOPZsH8ov7c41tVrbBrxFf//se40hJOiqSfDM3hM/jusxjfflOvVwsTFa8fd1Bg4O45Tw96LtDXEIrC2a19ij8t6VDDySNSCRRsNnHKdA7ARUeQVHnPvYZFvriNvf1XiSTtRdWB3wnhqP6rwxgKkEopK4oNlw4Hc6tJXtloPoztk2YZU1q7BJCZMjXjpiwkzqtfsVddDGKXlTpfb+ydXMPBLTFbVp6zAKSNs1+zfDyG2kDDqAyEsSg/nx2j5G7QzffwHTjZUW1VBIWLNkHrkCM6kDm+OgKqM6San6U6wyrjioW5CCkTtljNvoDVYbZeT5Fs8rIceh5m2mp2TcvSMaezV6ONLlkXUV5BOKJqeJNZZANOG/4wJhrs9UE/TzKFCp+kUrXjh7UB78hXe34HIfzTIvgcK9tLEWT9fKzhU3u3d6CvCOZM3crbEEWns7snKO4eqjSA0WcT2jPpu/dnQoI/d/rWC0OorQBLGK6qAOYUZ53s2JyAkg8hyNxf0ktISmh2D88FWeDs+HO7AUXVqXcaRhV57UbCZwXL8MziP3YZ1Igz4IDlm0cBZQ4iNlkAMVClwRK1EWJ15zhTjlejs2+MZd7XCpXdNW5roijq0g4rVCsFBIPYaPV2948OARpwjPl5KGgHoN9tsEGFBPGSBPEWu995rLBLICTHSCP0zD+XwrgYkj+VnML8wOkA3nOrOSD+AjOh4Zqjiri60fUPGNN3FwqF2wovTcsu7S6Glc9KTx1g1qhsVTV9ipr7sstAYtNiK0xAsbNH/Y89sl+5fiXsG2jDvFVmsbRz97E0Dqvjx3tfPMUF3IP9i0q6J5jQoB2IWkvqn2fzkYAx/kmfFJxp6eEgB6l2EiagQNwy5+Rs/qktAplD551HCebAEWktqSToFfhm0rtlTuzDj7xHirzbr0NpWHIu9PaRn3rPBbDDvzfE7bMAUS2k69rM5I3RVG/8hi+Ey2usAhBk+dL2hmzMUeusdzNXoinhOjcVFHhlctcQaETG1E7AmQFzulJ7tJa0ulkSbpDef0VHAeupSolv9IO72RZkow/att+Po9wxYdlPuiUpTeEjpE+qaNsKsrEQzrPZCcNx2vkhcYtvCyx2Xa3RCgxa0XWrH0PXVzZDN79zacaN4qaGMRAlhPlQr9aPBKhF9Zc9+W8/t/pl3mlmLza5NNYxg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fd93160-2e83-4a3a-ad45-08dbbe594122 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:24:35.8969 (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: +TGd4Js12B4rBfikfiOsbuinp1ERbNi4t47Lbc0unShcdOTBEJGPUvLV/qzThc+vfbqxPsNSFhV2Rk4uQsjNdY1P8NsF95WEOJg5VgYCkEso1Vw0q37or56KbSIEvWP7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: LU5P4UTUUKNHFWDCLAWBZS7H66SSYK5H X-Message-ID-Hash: LU5P4UTUUKNHFWDCLAWBZS7H66SSYK5H X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/intel/avs/boards/da7219.c | 4 +-- sound/soc/intel/avs/boards/es8336.c | 8 ++--- sound/soc/intel/avs/boards/i2s_test.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 +- sound/soc/intel/avs/boards/max98927.c | 2 +- sound/soc/intel/avs/boards/nau8825.c | 8 ++--- sound/soc/intel/avs/boards/rt274.c | 4 +-- sound/soc/intel/avs/boards/rt286.c | 8 ++--- sound/soc/intel/avs/boards/rt298.c | 8 ++--- sound/soc/intel/avs/boards/rt5663.c | 8 ++--- sound/soc/intel/avs/boards/rt5682.c | 8 ++--- sound/soc/intel/avs/boards/ssm4567.c | 4 +-- sound/soc/intel/avs/pcm.c | 44 +++++++++++++-------------- 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 85014d98f7e8..2059d6156738 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -90,7 +90,7 @@ static const struct snd_soc_jack_pin card_headset_pins[] = { static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_card *card = runtime->card; struct snd_soc_jack_pin *pins; @@ -140,7 +140,7 @@ static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime) static void avs_da7219_codec_exit(struct snd_soc_pcm_runtime *rtd) { - snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, NULL, NULL); } static int diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 0a023f871d93..6d2a7c8e445e 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -97,7 +97,7 @@ static struct snd_soc_jack_pin card_headset_pins[] = { static int avs_es8336_codec_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_card *card = runtime->card; struct snd_soc_jack_pin *pins; @@ -138,7 +138,7 @@ static int avs_es8336_codec_init(struct snd_soc_pcm_runtime *runtime) static void avs_es8336_codec_exit(struct snd_soc_pcm_runtime *runtime) { struct avs_card_drvdata *data = snd_soc_card_get_drvdata(runtime->card); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); snd_soc_component_set_jack(codec_dai->component, NULL, NULL); gpiod_put(data->gpiod); @@ -147,8 +147,8 @@ static void avs_es8336_codec_exit(struct snd_soc_pcm_runtime *runtime) static int avs_es8336_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); int clk_freq; int ret; diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c index bc3065c6ceda..1dd0c59a8d91 100644 --- a/sound/soc/intel/avs/boards/i2s_test.c +++ b/sound/soc/intel/avs/boards/i2s_test.c @@ -32,7 +32,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in return -ENOMEM; dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port); - dl->codecs = &asoc_dummy_dlc; + dl->codecs = &snd_soc_dummy_dlc; if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name) return -ENOMEM; diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c index 3833251ade26..7820435e3a53 100644 --- a/sound/soc/intel/avs/boards/max98373.c +++ b/sound/soc/intel/avs/boards/max98373.c @@ -66,7 +66,7 @@ avs_max98373_be_fixup(struct snd_soc_pcm_runtime *runrime, struct snd_pcm_hw_par static int avs_max98373_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret, i; diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c index 09b231bf4e6d..ae465b231249 100644 --- a/sound/soc/intel/avs/boards/max98927.c +++ b/sound/soc/intel/avs/boards/max98927.c @@ -66,7 +66,7 @@ avs_max98927_be_fixup(struct snd_soc_pcm_runtime *runrime, struct snd_pcm_hw_par static int avs_max98927_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; int ret = 0; int i; diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c index 38c5087d98e9..9f15b22a3c3f 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -106,12 +106,12 @@ static int avs_nau8825_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - return snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, jack, NULL); + return snd_soc_component_set_jack(snd_soc_rtd_to_codec(runtime, 0)->component, jack, NULL); } static void avs_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd) { - snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, NULL, NULL); } static int @@ -138,8 +138,8 @@ avs_nau8825_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_para static int avs_nau8825_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtm, 0); + struct snd_soc_pcm_runtime *rtm = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtm, 0); int ret = 0; switch (cmd) { diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c index ebfee54814ce..b376d4c2d706 100644 --- a/sound/soc/intel/avs/boards/rt274.c +++ b/sound/soc/intel/avs/boards/rt274.c @@ -87,7 +87,7 @@ static struct snd_soc_jack_pin card_headset_pins[] = { static int avs_rt274_codec_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); struct snd_soc_component *component = codec_dai->component; struct snd_soc_jack_pin *pins; struct snd_soc_jack *jack; @@ -121,7 +121,7 @@ static int avs_rt274_codec_init(struct snd_soc_pcm_runtime *runtime) static void avs_rt274_codec_exit(struct snd_soc_pcm_runtime *rtd) { - snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, NULL, NULL); } static int avs_rt274_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_params *params) diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index 84cf9a0c8dfe..36da0578d5b4 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -67,12 +67,12 @@ static int avs_rt286_codec_init(struct snd_soc_pcm_runtime *runtime) if (ret) return ret; - return snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, jack, NULL); + return snd_soc_component_set_jack(snd_soc_rtd_to_codec(runtime, 0)->component, jack, NULL); } static void avs_rt286_codec_exit(struct snd_soc_pcm_runtime *rtd) { - snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, NULL, NULL); } static int avs_rt286_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_params *params) @@ -98,8 +98,8 @@ static int avs_rt286_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pc static int avs_rt286_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); int ret; ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, SND_SOC_CLOCK_IN); diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index 3b0e2b1a3251..3cd8057f0ed6 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -78,12 +78,12 @@ static int avs_rt298_codec_init(struct snd_soc_pcm_runtime *runtime) if (ret) return ret; - return snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, jack, NULL); + return snd_soc_component_set_jack(snd_soc_rtd_to_codec(runtime, 0)->component, jack, NULL); } static void avs_rt298_codec_exit(struct snd_soc_pcm_runtime *rtd) { - snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, NULL, NULL); } static int avs_rt298_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_params *params) @@ -109,8 +109,8 @@ static int avs_rt298_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pc static int avs_rt298_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int clk_freq; int ret; diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c index 770b36d05bf4..2e84bd629766 100644 --- a/sound/soc/intel/avs/boards/rt5663.c +++ b/sound/soc/intel/avs/boards/rt5663.c @@ -79,14 +79,14 @@ static int avs_rt5663_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, jack, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(runtime, 0)->component, jack, NULL); return 0; } static void avs_rt5663_codec_exit(struct snd_soc_pcm_runtime *runtime) { - snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(runtime, 0)->component, NULL, NULL); } static int @@ -113,8 +113,8 @@ avs_rt5663_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_param static int avs_rt5663_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int ret; /* use ASRC for internal clocks, as PLL rate isn't multiple of BCLK */ diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c index b93468ae0977..f1c46c6abd9d 100644 --- a/sound/soc/intel/avs/boards/rt5682.c +++ b/sound/soc/intel/avs/boards/rt5682.c @@ -92,7 +92,7 @@ static struct snd_soc_jack_pin card_jack_pins[] = { static int avs_rt5682_codec_init(struct snd_soc_pcm_runtime *runtime) { - struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; struct snd_soc_card *card = runtime->card; struct snd_soc_jack_pin *pins; struct snd_soc_jack *jack; @@ -137,14 +137,14 @@ static int avs_rt5682_codec_init(struct snd_soc_pcm_runtime *runtime) static void avs_rt5682_codec_exit(struct snd_soc_pcm_runtime *rtd) { - snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL); + snd_soc_component_set_jack(snd_soc_rtd_to_codec(rtd, 0)->component, NULL, NULL); } static int avs_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0); int pll_source, freq_in, freq_out; int ret; diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c index 7324869d6132..27eca051122d 100644 --- a/sound/soc/intel/avs/boards/ssm4567.c +++ b/sound/soc/intel/avs/boards/ssm4567.c @@ -50,12 +50,12 @@ static int avs_ssm4567_codec_init(struct snd_soc_pcm_runtime *runtime) int ret; /* Slot 1 for left */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(runtime, 0), 0x01, 0x01, 2, 48); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_codec(runtime, 0), 0x01, 0x01, 2, 48); if (ret < 0) return ret; /* Slot 2 for right */ - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(runtime, 1), 0x02, 0x02, 2, 48); + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_codec(runtime, 1), 0x02, 0x02, 2, 48); if (ret < 0) return ret; diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index 8565a530706d..3f1f98e1a31a 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -58,7 +58,7 @@ avs_dai_find_path_template(struct snd_soc_dai *dai, bool is_fe, int direction) static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai, bool is_fe, const struct snd_soc_dai_ops *ops) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct avs_dev *adev = to_avs_dev(dai->dev); struct avs_tplg_path_template *template; struct avs_dma_data *data; @@ -127,7 +127,7 @@ static int avs_dai_be_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *fe, *be; struct snd_soc_dpcm *dpcm; - be = asoc_substream_to_rtd(substream); + be = snd_soc_substream_to_rtd(substream); for_each_dpcm_fe(be, substream->stream, dpcm) { fe = dpcm->fe; fe_hw_params = &fe->dpcm[substream->stream].hw_params; @@ -167,7 +167,7 @@ static int avs_dai_nonhda_be_startup(struct snd_pcm_substream *substream, struct static void avs_dai_nonhda_be_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct avs_dev *adev = to_avs_dev(dai->dev); struct avs_dma_data *data; @@ -216,7 +216,7 @@ static int avs_dai_nonhda_be_prepare(struct snd_pcm_substream *substream, struct static int avs_dai_nonhda_be_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct avs_dma_data *data; int ret = 0; @@ -303,7 +303,7 @@ static int avs_dai_hda_be_hw_params(struct snd_pcm_substream *substream, static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct avs_dma_data *data; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; struct hdac_ext_link *link; struct hda_codec *codec; @@ -320,7 +320,7 @@ static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct sn data->path = NULL; /* clear link <-> stream mapping */ - codec = dev_to_hda_codec(asoc_rtd_to_codec(rtd, 0)->dev); + codec = dev_to_hda_codec(snd_soc_rtd_to_codec(rtd, 0)->dev); link = snd_hdac_ext_bus_get_hlink_by_addr(&codec->bus->core, codec->core.addr); if (!link) return -EINVAL; @@ -333,7 +333,7 @@ static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct sn static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct hdac_ext_stream *link_stream = runtime->private_data; struct hdac_ext_link *link; @@ -345,7 +345,7 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct sn if (link_stream->link_prepared) return 0; - codec = dev_to_hda_codec(asoc_rtd_to_codec(rtd, 0)->dev); + codec = dev_to_hda_codec(snd_soc_rtd_to_codec(rtd, 0)->dev); bus = &codec->bus->core; format_val = snd_hdac_calc_stream_format(runtime->rate, runtime->channels, runtime->format, runtime->sample_bits, 0); @@ -372,7 +372,7 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct sn static int avs_dai_hda_be_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; struct avs_dma_data *data; int ret = 0; @@ -500,7 +500,7 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_so static void avs_dai_fe_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct avs_dev *adev = to_avs_dev(dai->dev); struct avs_dma_data *data; @@ -534,7 +534,7 @@ static int avs_dai_fe_hw_params(struct snd_pcm_substream *substream, hdac_stream(host_stream)->period_bytes = 0; hdac_stream(host_stream)->format_val = 0; - fe = asoc_substream_to_rtd(substream); + fe = snd_soc_substream_to_rtd(substream); for_each_dpcm_be(fe, substream->stream, dpcm) { be = dpcm->be; be_hw_params = &be->dpcm[substream->stream].hw_params; @@ -639,7 +639,7 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so static int avs_dai_fe_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct avs_dma_data *data; struct hdac_ext_stream *host_stream; struct hdac_bus *bus; @@ -869,7 +869,7 @@ static int avs_dai_resume_hw_params(struct snd_soc_dai *dai, struct avs_dma_data int ret; substream = data->substream; - rtd = asoc_substream_to_rtd(substream); + rtd = snd_soc_substream_to_rtd(substream); ret = dai->driver->ops->hw_params(substream, &rtd->dpcm[substream->stream].hw_params, dai); if (ret) @@ -964,7 +964,7 @@ static int avs_component_pm_op(struct snd_soc_component *component, bool be, for_each_component_dais(component, dai) { data = snd_soc_dai_dma_data_get_playback(dai); if (data) { - rtd = asoc_substream_to_rtd(data->substream); + rtd = snd_soc_substream_to_rtd(data->substream); if (rtd->dai_link->no_pcm == be && !rtd->dai_link->ignore_suspend) { ret = op(dai, data); if (ret < 0) { @@ -977,7 +977,7 @@ static int avs_component_pm_op(struct snd_soc_component *component, bool be, data = snd_soc_dai_dma_data_get_capture(dai); if (data) { - rtd = asoc_substream_to_rtd(data->substream); + rtd = snd_soc_substream_to_rtd(data->substream); if (rtd->dai_link->no_pcm == be && !rtd->dai_link->ignore_suspend) { ret = op(dai, data); if (ret < 0) { @@ -1081,7 +1081,7 @@ static const struct snd_pcm_hardware avs_pcm_hardware = { static int avs_component_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); /* only FE DAI links are handled here */ if (rtd->dai_link->no_pcm) @@ -1099,12 +1099,12 @@ static unsigned int avs_hda_stream_dpib_read(struct hdac_ext_stream *stream) static snd_pcm_uframes_t avs_component_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct avs_dma_data *data; struct hdac_ext_stream *host_stream; unsigned int pos; - data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if (!data->host_stream) return 0; @@ -1129,7 +1129,7 @@ static int avs_component_mmap(struct snd_soc_component *component, static int avs_component_construct(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_pcm *pcm = rtd->pcm; if (dai->driver->playback.channels_min) @@ -1430,7 +1430,7 @@ static void avs_component_hda_remove(struct snd_soc_component *component) static int avs_component_hda_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; struct hda_codec *codec; @@ -1464,7 +1464,7 @@ static int avs_component_hda_open(struct snd_soc_component *component, return snd_soc_set_runtime_hwparams(substream, &hwparams); } - codec = dev_to_hda_codec(asoc_rtd_to_codec(rtd, 0)->dev); + codec = dev_to_hda_codec(snd_soc_rtd_to_codec(rtd, 0)->dev); link_stream = snd_hdac_ext_stream_assign(&codec->bus->core, substream, HDAC_EXT_STREAM_TYPE_LINK); if (!link_stream) @@ -1477,7 +1477,7 @@ static int avs_component_hda_open(struct snd_soc_component *component, static int avs_component_hda_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; /* only BE DAI links are handled here */ From patchwork Tue Sep 26 06:24: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: 726435 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 A0336EE020C for ; Tue, 26 Sep 2023 06:31:29 +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 A288914FB; Tue, 26 Sep 2023 08:30:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A288914FB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709887; bh=K6HBUeBcLvNsm+I/cbzz0r0T5DJ4nypLGC7e6Pc69YQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UUu8N/JMkic5NfjeiCRoWfx6WjwfXHttevS4x5CjitFj2k88D5asMVeq3bNiBSbRY peZWykyj2WmYaMpX0atMdNyrC2pA2fy4n+1eKQgtDxp1QqwXH+VuPl+H0VEKK/ElQ5 gQ15TqzEjzsGCa2QA+w0eYk7ye8hZQPL+PXZSNsA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 302C9F806CB; Tue, 26 Sep 2023 08:24:59 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DB19FF805FF; Tue, 26 Sep 2023 08:24:58 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 21B07F805E0; Tue, 26 Sep 2023 08:24:54 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2DAB6F8057B for ; Tue, 26 Sep 2023 08:24:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2DAB6F8057B 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=V32F8DWB ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P2WMoRnwhLwkmFE2Q1fdftxzk/YAaVq5kQfCZuMzLx5ZOEcXCoxQoQhuS9fStMg8U3uV/lXyzSMezXws5SAytXV1yG4flNxg0L8s+VEGDjrLi1mahKgEGv6KD0L1EQyxBlhl/nnxmu/a1I+EIteIwrR70ryx/iqQVUAV2vI9PX1mEUCBGWQEk8+sug2SbUTK0IKigKXmFpEW0VjGh5cu3URhkEz9t1ILRzOUlTsP7DWccOTxnw7DPF4L5pGDryXsp78jsIi9s+Lg8NHTMd5KbsnwCdmD/8QtkJi3BJT2T4ugBlbS63HqjH1GzIM5QzELcQZvIX7Hoapo+UxiPpPN4g== 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=UBclb4YIjLp49HxwF2L40TOVUX77D9fAmGpM3iFl4vg=; b=OwdvWmBkooR1CaI5O/PBFmvGqjy55OG0g/yw/17dDek0GYXItk8LOzAfS/+RKfL0XgbsqBbC6bpNMhCkAbcH9kMPrN0r/4L0OUlkhuRQybTD/jrKu3z3omC7Mamizzun/amRTCuursH+d9FXtDdvMm2o4hs1cmYLb/VDMnNBeE3/IlLT1mRqwaASY09bYRquPrworYta6eVQLU8DuPnU6M6RocWfifsslIsc4E+uGEp8Vjcnn8vKoaTszA5heTN22LEdgMrKG1rU7AXfWrSISEFvrREKYsW46jbESm/LGuFfqPfYSMKpHFFfUu5uRBh6hwjrnReAcj4V+dBkFXQF3Q== 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=UBclb4YIjLp49HxwF2L40TOVUX77D9fAmGpM3iFl4vg=; b=V32F8DWB0eukUHwh7b9S2L3iqhgWdm20tzdaCNfy11Gtt6t3CbGpcv82pg94W1UhUaT0Q6hkT+4JuzfwYARV34cjNLpaFNreenJnRuhRo7Dc+bNCvGv3y9Ztyv2KIIeJuKSfih/i9HZaeadvyYARUoUTxOaITwqNB+fisaHz65I= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:24:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:24:46 +0000 Message-ID: <87wmwdfo43.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Richard Fitzgerald , Simon Trimmer , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 37/54] ASoC: codec: wm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:24:45 +0000 X-ClientProxiedBy: TYCP286CA0168.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 49fef479-54c9-4f49-4627-08dbbe594737 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oH+I4b3eKI191juyMVKU7lalo0Hj5lpvxYrfjy98+GjM1v5gqxThRZE7oQ4P0HGH/QFkkctEaaoL10vmjVuY/iwi6Fv/0I9ivtk+NActK2pNQRlTkpECRAJUYDW9WAoNQ9grMXccqaMly7oidi1YHeOMC7sR+h7ZNhk0wPPRU2QsTvs/GvJ/m8LPi6uh1xPJCq+871QUTbs7KFnRLbV7sKPD1O/PygGMR2b3eoFuxAGps3iC6RP4m7wXkbdCiCS3ZFTQBdeFwP8USQ/l/fxARruZBLy0vTZjsLRnrP0DfNPq0r6cnrMQ15Uhe8nneqqDcLGNiiDfEQl/wW3meEXdhD9hGzZjIxuGiUrMWZjdBEaM0nrtV0J3FPkvAPQm7KLyyRZ5Q3O6U9qpAOxiZ/I5j0+dvkLjMCMNJ0XvJEG97LUlFOoF2FTrbT+vgb0EpgmnSgYeu6IQSyDLws8bS5bGZs8IR9OVbEDMMZpK9Ut6yN3gB+9zwmaYsQ4c9bnlq9eLaeTgujJaDPlg8CFRMHUOsN08KhnDujoYPpO55Yds5cwL7YIX2ZMNgd94pZC7FJwHUk+gLATAFaQy/CN7ddhJGwpRMf9r7/Yf4BPAP74gUnO0qXxnME2N3We6I+sDpFQ5KzvLQH4LXcpgxDGNg5mxhA== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZY2WSgE3ZKcugOk0jUjtczNtuBvi2G0uGx1oNtxHkkfnLyqUDzQRTAF/plaDED4+eu3fbg9CzvJsfoU8cN5OOyklLVpswBYj5gx1xm/xCeKOyT24MeRgFlr87r80oMthwtqdqA+yQB825DTGvPPlno6f0XA0ux4LC8b7aVZJmsle2gt6RF3hb5WXR7owcYqj7Konyt8L68jpGOqNTCrxW2MFmGi207DA+VN3VPRmMzkpZWi0SR78Lk6yJtrOiX3YKevZO5fWq6YpI7PBwfhZGnFRR2biv2CDfbFvvoxv2ogS/XXwCvyY9dVbjtuQjZikFmTqVWuukVrTt5ggVAwFGiAuBSuDFG2eeC2zF1/C4/B0OC2+r/LYI47orS3WiFWa04vtLk8vEjc+tiH7n9TwJ/o3L9noRVaFtS8/ubWWIuO2ULYSW6Zcu0eI5I4lNBk69dVSb9NSN3BXgoECDiE51b+747/6g9fRCEv4vzlg2D5JiyM2reg9ElB7OxHLoPwb1o89IhZuAr3z8BnBgmT4QpbI3iygtJTD0o5p0NhB2ZvUa+2SE8s6B0x925oSTwZZAUUNq6a/jhM7/oOoIlTUj2dEN8XUSDaXDHNwHo+4kNC60JGiRoMmsONyUWNuXhCPBXxMngGmUc+7XbC0o9LmfpPA7q/7VIDbSNx0V1uUdxM3DTBel+prYT7FAF3DbhtZFuvCjnffa/1XvNjifG+wf3engZySLE9TJ8yWPVNQHvDPKSmi1fy23I+lUYo+ES0q7gTbvy3LgzG1ugO31HSfVymYvUfRBiUx7aZS4u95B/BcLyzECvd5DNclZ3VCQl1YCOvliOy/oFDRZgHTcyoVJx1qhkCsAc1r+aPHRXQGoDqg3V2f4sEaZJM6WxeqrDQ4e+zCgX2AY38StBlfLA18GteRqqDgnzCc1MPzzHicbwc3y/v1CYncKi+0pYGaFUet8PwBxKWLBYCPNWSyOkjksNYVqtINqCq+tV8oREdy9YXDbrnM/riCrVZZn0bgZFlpaGsMuCXCZB1GdkEqe160MPtELi4QJikeiYNEJDDH8cA9cD6LfQDtdlRuhzvMC4Bhe0Our9rLlOrfDhsTZZvdhZuXdGS//AITUN7miyoewKk9TO+Hcz4bBqILI9npkl4I2tkdikNL1g9AqLupp+guQOvaNtF1LWBb2szsiPgxi2c9ULbBNBKElAw38OGSo7J8pJwQWe8PW/6vR8vgiPgcP7Bz80Kb/PZ7Po+SfBY4Ni5e2uVxam/10n1DDXmE4arYkGOhnpy5iRF+kHGAktKIhnD9xByvw+/86IS1hncac4SnJchZPv7j7x1hhV71BzlcXVOF7R3oJPlHuZPh/zPNeS2y47o3BqVEnLpVC3A2hJzbcB9CfCxN9UiD1JC6XVlSIokGs1hxc5CeD9Q5IIDEUOVb1H5rh3cFl29MBM6n0BF+pmf5p9OdrCwO+obNMYUUweAURYqzuU2xwxswltxXC+NNVJHQM96J9OUY6ffLaaC548qp5swdiCOFjXhX5c+NvDJONHWpy0GQ5b5KaCvVQcw+zoqHXqHdDau9BQfCsoH/RaOkSuoZO9CRHP3fhaasM1An8HMGLvVrwTJcGzO2bW60uxscMQ+ETuXXHYpTm2g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49fef479-54c9-4f49-4627-08dbbe594737 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:24:46.0355 (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: WMw0y31E0ZAGf4DVrVeVzKjKoY1rIK7i8gHJa1HBspN4Jnag2YBayQTwQw7U8Crqarv19ElPOajmQ9MiX4ZiL1azIJxZrmpfBTfi4o5CM/pXRuXKpjSr4iKxEvE+9rMT X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: QUZFIN7LQCK7NJZXMV6Z7DUDLXINYQXJ X-Message-ID-Hash: QUZFIN7LQCK7NJZXMV6Z7DUDLXINYQXJ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm5110.c | 6 +++--- sound/soc/codecs/wm_adsp.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index ac1f2c850346..0f299cd07b2e 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -2253,14 +2253,14 @@ static int wm5110_open(struct snd_soc_component *component, struct arizona *arizona = priv->core.arizona; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-voicectrl") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-voicectrl") == 0) { n_adsp = 2; - } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-trace") == 0) { + } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "wm5110-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(arizona->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 6fc34f41b175..db847e80a9c6 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1236,22 +1236,22 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream) if (wm_adsp_fw[dsp->fw].num_caps == 0) { adsp_err(dsp, "%s: Firmware does not support compressed API\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); ret = -ENXIO; goto out; } if (wm_adsp_fw[dsp->fw].compr_direction != stream->direction) { adsp_err(dsp, "%s: Firmware does not support stream direction\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); ret = -EINVAL; goto out; } list_for_each_entry(tmp, &dsp->compr_list, list) { - if (!strcmp(tmp->name, asoc_rtd_to_codec(rtd, 0)->name)) { + if (!strcmp(tmp->name, snd_soc_rtd_to_codec(rtd, 0)->name)) { adsp_err(dsp, "%s: Only a single stream supported per dai\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); ret = -EBUSY; goto out; } @@ -1265,7 +1265,7 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream) compr->dsp = dsp; compr->stream = stream; - compr->name = asoc_rtd_to_codec(rtd, 0)->name; + compr->name = snd_soc_rtd_to_codec(rtd, 0)->name; list_add_tail(&compr->list, &dsp->compr_list); From patchwork Tue Sep 26 06:24: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: 728180 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 D420CEE020C for ; Tue, 26 Sep 2023 06:31:56 +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 0C2841497; Tue, 26 Sep 2023 08:31:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0C2841497 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709915; bh=GvMHA3q3/joZ431ycNvrh3zgCQ34M5+nSKiMF6/+Q0w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=mq0wGbrJIn9s7L0KNrtEfRyq3IJPOgglflm5rcDACCQI7NUzYVR24vGpIS2Q+GqK5 iFuJf5uNs9imXcItcAvyqmIdxF+/2CGKbB/8clJC5pbVxZa+zYMxV9qxHKkkyctMAb IoQcAWElSbFWElayYqhA0hLu3LLYwnVc+Qf/E5tM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 54205F805FF; Tue, 26 Sep 2023 08:25:19 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id AB62BF80290; Tue, 26 Sep 2023 08:25:18 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9D726F805FA; Tue, 26 Sep 2023 08:25:13 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20712.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::712]) (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 18163F805D4 for ; Tue, 26 Sep 2023 08:25:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 18163F805D4 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=Bq2dhyIV ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kZmz68LDytOFI1lWOGOXYzzLyWn3rVDxM9O+o3UkazYRFRJi8blFMwZ9VT8WW2mVAhtkQWTDWbBTps2AOcgiroAn83OLs9QJ8dxl7fHSd4SLxtTuEAua3RqtnZI0xnHZvtzMIAJDV2Jd+UTZX+Mrsl3Bf0hsM6nb1C3MXnwWmKK9qrt40GX/vHlbYFng/Vz2xXJ2OAvHFgZSkueKbeGgVykIcfk73vqGVcplapCg3ASwlw9ce5Zzp3uwtYMOJRkft4iuU/384Y35E3kysZY4mMjLjFJHGvxhS5XzC1D7h7Kz/6lcyOC6nWVIRfheb/u+xEsp9lvd641s9s05WbItdg== 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=tHTbPZSQ3tAuQrpNvUNQTHDJgZS5KjD1PoCKBAToRGk=; b=KKyAA0ePr2b+pSdAoMw0FfLAgwzl0O9QwHLM6PgVhVQE9syVHEg1ZqTMKbNvQdSJ9VDF38V5LvJbwgDl5d94lKxlThl9dDh2s/rvTjyeg5mFXhroJDTBhorKus0qm5l6Zi7h1O1Xwe+fvLsEi6k3DPF34b1oDMcBjxtjS9CfZUNW7qFOYYQDn4WJ7Lk3VWGsb3UtxxzlYadjcwhF6Be3hrk6ItRoqnZVYA4n29p5RwHSSBGoNSzAzj1CWGOSwWsKxubkDJjhoYJ6R1ybWytIZ18X8lgsUQ7z6WZB8QXG1dtQvTsWE5KVSeU+w+jYtgMEfiazkPGt5CKwB9KiRhJL3Q== 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=tHTbPZSQ3tAuQrpNvUNQTHDJgZS5KjD1PoCKBAToRGk=; b=Bq2dhyIVupNgnmS2N0oX2EoXZ5x9ZHS2fdFWFrZQ2DzJ+irUPS1QYkemnXqoT5VDkqcVhVQ0RSFSAM/eGmJaGAdhUPIQKy1MdlXXltHDQYsiD12ML7J4g3di4wDYWCPiiQ1RtY2vgLt6w2tapOADAD2gdIGuX5bXtgJ4+zm2a/s= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:25:01 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:25:00 +0000 Message-ID: <87v8bxfo3q.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Jason Montleon , Liam Girdwood , Mark Brown , Oder Chiou , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 38/54] ASoC: codec: rt5677: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:24:57 +0000 X-ClientProxiedBy: TYAPR01CA0213.jpnprd01.prod.outlook.com (2603:1096:404:29::33) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f256511-e13b-4973-bfdb-08dbbe594ea0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: in4DvmzPb3R+sIezpdiRMw1XwSwWxcJ8EZCQZiV4u7n2b122ZOkLxZ9ziaM6ia80JJbao/TLusoMva/p5erxi2WIqqv12YInXP1Ga4KvJo+1vAvOEfyfvjFE1wn3DrrDZguuUc4pWdrEaHJqaMTBEShoferWHF0rGhrrdqnFciTTZdZBdB1nVUePe603T4h0N7pPzX7RnyJ5oOg5vSc3LpSRGJhLEiPp0SsSt08dqcETs9QVgRZW1+6GA0my0ehrNwkyDvo0SChCT5qL6k9ashkzX7IYWetzKXSIuZwk+qX3tmm6dqYG1QFrLmNNgADY+gdUzV7CAAdwJEzxBIBv56WfT6pxdRBIEexYvdA2PrBxveaQ2xbUFAlkVofdxFRepmX7AfwBWiuBfCxWIFPVB9WjzpB9ZVu2eSQUC2SCAFPi1X8oQtg3LumaWtNE9row3TwT1dO+GXNeTauZgsHukfNPOG4a044a4ucZvzChSrB9BCMijKGYFJ3MLIjU/4AKkoOLwBXGI0Y+q/81yBBeJpd5BpT0eDfxxCiPfkVUtOecLr4tGhbghg2Not6+sYKNb9rbplBxgSqS7uDUilyYmYy+1nEHNGGsS0Nalz5lc3/4ndidZj5YHn+xnNKr6ZLBSUeMICmswofI+xpkjqvxRA== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(6666004)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MVr4VP1A0GmMWrXX55Kjn5DQZSDtxBb273VAcfkP11AJcMa6dqc5VM2p2J4CgS8Onz/Ub+AfHaUxKS2dmd1vN1G/mgtcJ27iFV5N8fT9XLDR0cdZ7JVCSggnp9j5UmrgmuTzvExAxfsNlyvXRCVshvQrHGZbaGzjlkT/OouwoPMNt9beQJiHgzZoxD9KuDBcL+fam9YX18pC+ueHkl2vrX75V2z8gIfy3PcIE90dgvidJVTwt+/RudmJvdGnFYI9myfgB2ruLpNt9qq2Q5X0Yr4YPToO3qHRWH5q1/piDJNj1e9QC107UrrtTXx64KC6zXpPL2601Z9HVCkqdA17tsBN3lT+SqSmR7lVzIplaUc7riwcRfPixzkHgXQQiG6e9moPVOyfUa/QjPrBTS6pbnQUoiBMbvG97/BVMwNutg/9JKMhFXC095yRxXh5fq/yzCLqWCbISq5LxXrLEwLY2QDzZSpfAs55BFM4VEPfnpBCnhXm8victYZMvwoI8P5QZym49ppxwuYl7bG3rAXvE98U1b/mvrQ3V+Su0DrOj2j/7VcX6BIdcjaEYRULHA0ZiD1dit6e6beXja3TzG30vs5gwBM+Y4KCVPgS5txNUq1ic7B4y2lT+6PvhrrlUavKOSp/0C0xEJbPK85fygcMPP1hs91zOZifhGHNFwvVaquSIHH/nrn4ZAAVDHoIS6fqB5n/dEwsg9T1Op5XPy5T7awn7nN1tEAeQ842287Tq1oFzRjh0dm1eixd9uiPury+Qq4vJbTodSr9yInDscnG3kNACWJLYXqZlVf3bVV4q8YYjQyAsCdZmRUkMR0mubH9RGDUHOPEV65hSAYFNg67e6nlt4CJBWfR0t+utDPDmQ5xwvwhdiyGfRHhcL3Otp/LdG7JaoTuzrE0TgnIHHoAnuJwo8tjlwxFn+C/HaUuEtCkd3+pJrO5VaoqKmpqH5eFM0RGPFkK5jf5BC0s2OF0PgauxLhHEGWaPE5cf0iAfuBHnagb3KNQ8sIgs+fAQlkd0dVxF+L0OCCj5osg6081cjwT8QWCimYm7cQaBcujFc9BVF29WndzwHXKqKXslyEgFMWmjJItoqVHtOGYUJBKXCdQLiszTJL+Lt0DV5SvV81IlWoNYHAwiS3s4x8OAr6sKK0aTeShVVsVeNIMvkhhviysofR7gG7q4HxXiZN0ifU2oThaH8Zb4uRy4STQ6NnA/2bQZASs8E2IZr3EGeduHmMkkIUSxw+8XgtRrth6viRKggpTrN4VCAIzr1lUNnlV4nQCFgYPvcic3SNN1me/WYZk1YOmunSKhW2vhKDqkAsgYmYpvH5ChCS05/q93dY4fBmfr9mQCdz9WoupnePj5nOZ1jRJV+mHYyh7XOzbzmvIjY+YbOhK9IxjLmIUdjF2XmXCaQn8iSsQGgadga507ivTE4wvqInMVaJXeuagiYXAkvYctn9fd6xqlR4D+c5Ilkoj2ZMIx5oT9wTCYFdvZFhebF5QgZ6rhHhwLlRVPAQHF2qLYi6iokL90ZlkOV1V0o1Qoc4lI5sdx3gE/vyNVPD95u3GusArr5xBhugZQxpLSnlzIUm25rjsVzFWUVVBGZOzHUHuH8eJ4hgysQoR8p7hYi4e1la3W4WPj3StyUc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f256511-e13b-4973-bfdb-08dbbe594ea0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:25:00.0265 (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: uxZpayIj8rTP/GB/T2cGq6a+dWWO2TxTgxNQUx/uZuZylBDQEvPlFyPSGI5GbRBid/F5Ma3A9JhMsQEMwAfoofLQcgd1MU2SSauBDV2AdUDn67rq7nZCsYTAHS0Ts/AV X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: IUUSS76YAQBM7ZQNXYHJGJL2WCK3A3LA X-Message-ID-Hash: IUUSS76YAQBM7ZQNXYHJGJL2WCK3A3LA X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/rt5677-spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5677-spi.c b/sound/soc/codecs/rt5677-spi.c index d25703dd7499..d91a2184f67c 100644 --- a/sound/soc/codecs/rt5677-spi.c +++ b/sound/soc/codecs/rt5677-spi.c @@ -112,7 +112,7 @@ static int rt5677_spi_pcm_close( struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *codec_component = snd_soc_rtdcom_lookup(rtd, "rt5677"); struct rt5677_priv *rt5677 = @@ -158,7 +158,7 @@ static int rt5677_spi_prepare( struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *rt5677_component = snd_soc_rtdcom_lookup(rtd, "rt5677"); struct rt5677_priv *rt5677 = From patchwork Tue Sep 26 06:25:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726434 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 D80A9E8181F for ; Tue, 26 Sep 2023 06:32:02 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 23AAC1508; Tue, 26 Sep 2023 08:31:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 23AAC1508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709921; bh=CovFu9Q645/BF/oHxxw5JRtEHb6nNyJaE6ypCHtHKjM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=gFmhb2eyQr5Xw5Fsdyg4zU/OZaqRBGoCTbcS5vRNsWyyxlnj6sxLRCJKGS9LdfKxp u6I6RTct947rkAnhnQDI9BMgyiqmJptIMCs+/kQCi5l1bgsOWmGzQxWgKEVuao91Ya CRoja1OmrnDBpPRh8K7MG05IbMmgUcbCcesIqmOM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0E010F806CE; Tue, 26 Sep 2023 08:25:33 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 5EAAAF80607; Tue, 26 Sep 2023 08:25:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5DF5DF805F5; Tue, 26 Sep 2023 08:25:28 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::702]) (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 7A053F80568 for ; Tue, 26 Sep 2023 08:25:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7A053F80568 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=XXexCWfz ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CE9sTvYeFvzT0SI0pKVKaUy/KJmwXPhx4ekXiBkQwCI+XrG0jXsW0chnFpINTi0TySFORb5k7f6lDVX++sDlDeD2r6Z5qyPJBXvSJlq7kqj5G7CBRLWqus+AaijxZQoLwdluPUFxWSyvpAw3TdKibzvaN72ASAOhsVuvgIIX2uxO1FYOlC+ct5rjvgIbWIyoSy3zPxHW1yWt5XbzJKByQQRsoXmfwZoYo9Kt23AYhVg3UjXZxI07A2DMpieBshFozpl+snerRBJS9uzVh83IVoKxCm8cEWkSUJjnpXFsnI66MVgU53wgV6+5l1Erg0C4dO4YQHUoIv+4rqAh9MIclw== 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=AuMoED3uqjKPyDjmHjqBLskZNdu4t+4v1+CBVdDPdSw=; b=eNenhtSmfCX1KLf4eng7eDFxt0vdJ/QkjPOgy8ArynzAKPQOHEsEl8W8TSxJmb3MhR1AQlMCWqv12ZcMjvANOh+3u2KP1+ZeAv+ai5O8Y5SE4O6CECL90cZanoF5sZw0p6d8oE0ItD9bhJCOUchXPB71ByBSbM49ZiN4TxcVpc3ql8/GsY7jnQ3kbsuqGjkISUeXqM7bN06Yng09AFgppslURrp+50elz79fzFI1PHWPZ6ClX+D2OzkthI/+5aD8+ZKo087YRIFvLOfhm9NT+LAH+J7rvWf0b0fxIGdmOoqCSyVfeTXJ9t/m0h3HXKKmmSsZWxKgwT8q1PIQn0QgCA== 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=AuMoED3uqjKPyDjmHjqBLskZNdu4t+4v1+CBVdDPdSw=; b=XXexCWfzLtEWnzqG/Ha7u2W0BbbOpuhgHyi8obm226vl7tf0KI0lP4ktCQWyqIevxNoS5LlFEbVoEMa6G5FVYxWg7N7RDpjQVVFkswkclb9c34BGesxpALcaW/ucid4ypX+JK00FGJGDqlm9CSHtp77DXVwG+MQxaOGQhZHw2/M= 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 TYCPR01MB6175.jpnprd01.prod.outlook.com (2603:1096:400:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:25:11 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:25:11 +0000 Message-ID: <87ttrhfo3e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Charles Keepax , David Rhodes , James Schulman , Jaroslav Kysela , Liam Girdwood , Mark Brown , Richard Fitzgerald , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 39/54] ASoC: codec: cs47lxx: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:25:10 +0000 X-ClientProxiedBy: TYCP286CA0034.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::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_|TYCPR01MB6175:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b77ce07-18b1-44c0-7e66-08dbbe595675 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: erM+QnzLqzP5touhuzzJF21Nkqmv9TuFM/zMhcS1G0+7K3GF0pFkxOxpYxyAskAcN5H/KVk3uZjEt9i0y6j9OSRZmUJ8onnj0xJSUyKly5BIOgKODLbmDHrPZiF6vp+o9zZEzGn1sOURsr0Tl68ORGy4bl3QEZgK0Z+3PomVZOpNv02J7oVA0tiUAICiWZN40vAATeigg+bIjKwZA8D6lpgo9DRFWgNmsS3bg/dBItfz5gVLNOOjQlh0bMB4+rhDQ5Q1gm1RlAnZ+wXM9pI94KbmVK3QysASjNigmlyp1F2jskLg53+E75g9RPvdCc8N9KID4Iz2eGVE8D5Fd++JKdn55fUncyilGp05tYyvbDWeqBEjmS8g+bJJ9D/G+JrXuZ7+uhcsh+2nxLoZhUbQJ+ZGeWfadaOzo/plzHDcqQ5TL1rPgySYlWlmlP2ZMWBXbl+ellrtj54rSUA2EMZeuCTpurZ17uXIKy35Xj8iLJyn78pPbmgYjCwsXAqyCY/09QoBh4kGYNrMTWcme5LHFzKiz4lp61FUSHug34MeZhEzgugTaK4ZzPbT0LES0yVOx+H3LaXNduY8AOsZbz5hjNpKok0v6rW/EYYNvEJc9HCtnbhopZi6VAATabhJov6p4EZWIpQKjc8a/rxkUSsRYg== 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:(13230031)(376002)(396003)(366004)(346002)(136003)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pz1FgUwfq1mlDU9mJkQK3YC5rKrIOJcyxyOOQ+S83VzmPFfIJ/rAuzj0ABfAnJl/YqJpL5BiUM1bXmMUa9lKSLGP9Up9k00IAgFCdudgPYeUZHA1o8uFMzMdxHO2owqCWErilpk7aJgQZ9IHfK/OoOqKPOaW5cvWr9jWa2cbhb+QHqVvwMuJ6ioJ6D5H+jnRKgxLMbOdsi0Urh1sHIUi5cZmnv8FeF9Cve7cwcglIbgk9jE81fjFA8EH92zM9IY7ZbMWk0ZDLtvCJyYE55Am7Yv5Ec+wnLG0N7Sndn6+HJMz3UjMjzglvAGI19GLfqRW+9B+nmSxkW49MFYvAm5diQo+b5fEvAs5Y8Ji5W/t/JfXv9KGBcTruYzSJlz2Jqi3IDxoIeFJHaFR4DIC65bIp4XjVai5LJdOWAP1ojmY8Olb0hfQ/K9uLtwHVGQoCmZus9pwMlIZJw903m37D9bIH6crcdSlkqCue5rh8abJhlA1Oz14Smy60qyDMEpnJK0MdKKFJZbiRw0FYNIxYLyk8fl0WS9AYpIRrbJQFnlA9J5pTxbbbEUQTYQfS2sxAZMm/QQHXwS5Gl5b6dzmRhtcPirzBN+KM91/yXljk5uICPc7jrvMiSKlHwagoldTXbriEFcaqnpKiNC9TKUvEFNGBmdORUzjEYfm+i8zdE54sS6phFJAwsb2PpLtUdpdjbuGqiZgzRfHa9iBC9i6JaY1f61QRtBMsKMHhaY4LiCMy/7+k7UnKzZGdC+nNl39nkv1yMBIm1wbW4K9VJu5+hokVZBpl7pwnh8abDNwkT36zEG/5OUbxG3oEE4FjvyXrBtB1lzD0KxwXFsDBXgABP99edt78HdVn4C/h4wsWt7I2kjhFU0zDn1HfM69l5fcvJlUffW/P+FX0kVXvtpq+dTRVPoQAiwaYJxbJzc5Ay/zXO5r+j4YaCWa4IKNm6q7QYTC0xBupkkvvPfQbLTsjh1D3jjo4/p0R1nfY/NJw6pMkli9SOKwI3XTlqzXRmo4t7yhBDbUT3CFqrtC9PUQimE/QNbAgIuj57QT4U8x8qIE9Ep5VYhUO1xTfadOWB7eWydp5KDjjO+i7MMUt58B3+kd4Kbx3Dk41rW/PhXYX+Atlzoi7iUTW4Seahhr3wo53vIjUBwd110QQtvavEA/wuNKulazm9DrZ3JkTvPKJBGjmNDi7X/u1UZAmqRuG7fGBZkvrXNyGCRMSvJJ46Gn6s58veJp8xj9St1AriDO8bYLkpklXnCF0oS26srL7R0gNw3UmPpt63WgEltOJjaiss09xmX41hjH99+JvEQdAoPd5Rt9h/sDZFXM+vkKel6hTW+ff8j1lqlPrSggP+fYf7lwqshdEYbO06CRKZJKbF4KSkiAf95GT7f/M6U3F8vpPRcDDrSIzwt9QqdnnHFm4eh4VgiZwe/tOOz18HQzIeRLsPKPY08p+ZImo6RBmt1FtD05mzeqxfS+7bf7F/GBOv3rzFb28dBrjJ+OZqMeDyIUp3i6xDx4dda5Mm3JfHvk85Z/3a+oopvZsokX3ENbgNYSLtgBKK6HJCHHcLoWXuY231Ul382u6NihvTj8oYxSM07AO40ba9CqTHk1mQZc3BsgJvD1tDEJ6fWBMdyHDHA3hfI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b77ce07-18b1-44c0-7e66-08dbbe595675 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:25:11.6101 (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: eQNAB1ACIdFkH07ZEn1XVZwC+lpujhoalFOi0oEcyUbLWw1AgNxnMnbau2TiGj1WpnmueyQ6udigxwyNP5+Cgu8eoXlkvcq1lAeBUSlfaZ+M90Vsqn0dtZ9UFULU60mh X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6175 Message-ID-Hash: 3GPWCH2DPBN7EZQNNHJCBWHDFSQ5V5HQ X-Message-ID-Hash: 3GPWCH2DPBN7EZQNNHJCBWHDFSQ5V5HQ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto Acked-by: Charles Keepax --- sound/soc/codecs/cs47l15.c | 4 ++-- sound/soc/codecs/cs47l24.c | 6 +++--- sound/soc/codecs/cs47l35.c | 6 +++--- sound/soc/codecs/cs47l85.c | 6 +++--- sound/soc/codecs/cs47l90.c | 6 +++--- sound/soc/codecs/cs47l92.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c index 1245e1a4f2a5..ab6e7cd99733 100644 --- a/sound/soc/codecs/cs47l15.c +++ b/sound/soc/codecs/cs47l15.c @@ -1246,12 +1246,12 @@ static int cs47l15_open(struct snd_soc_component *component, struct madera *madera = priv->madera; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l15-dsp-trace") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l15-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(madera->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c index cfa1d34f6ebd..ec405ef66a8e 100644 --- a/sound/soc/codecs/cs47l24.c +++ b/sound/soc/codecs/cs47l24.c @@ -1080,14 +1080,14 @@ static int cs47l24_open(struct snd_soc_component *component, struct arizona *arizona = priv->core.arizona; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-voicectrl") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-voicectrl") == 0) { n_adsp = 2; - } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-trace") == 0) { + } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l24-dsp-trace") == 0) { n_adsp = 1; } else { dev_err(arizona->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index a953f2ede1ee..0d7ee7ea6257 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -1510,14 +1510,14 @@ static int cs47l35_open(struct snd_soc_component *component, struct madera *madera = priv->madera; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-voicectrl") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-voicectrl") == 0) { n_adsp = 2; - } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-trace") == 0) { + } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l35-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(madera->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 827685481859..2dfb867e6edd 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -2452,14 +2452,14 @@ static int cs47l85_open(struct snd_soc_component *component, struct madera *madera = priv->madera; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-voicectrl") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-voicectrl") == 0) { n_adsp = 5; - } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-trace") == 0) { + } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l85-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(madera->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index 2c9a5372cf51..2549cb1fc121 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -2371,14 +2371,14 @@ static int cs47l90_open(struct snd_soc_component *component, struct madera *madera = priv->madera; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-voicectrl") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-voicectrl") == 0) { n_adsp = 5; - } else if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-trace") == 0) { + } else if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l90-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(madera->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c index 352deeaff1ca..0c05ae0b09fb 100644 --- a/sound/soc/codecs/cs47l92.c +++ b/sound/soc/codecs/cs47l92.c @@ -1850,12 +1850,12 @@ static int cs47l92_open(struct snd_soc_component *component, struct madera *madera = priv->madera; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l92-dsp-trace") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l92-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(madera->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } From patchwork Tue Sep 26 06:25:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728179 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 DC40BE8181F for ; Tue, 26 Sep 2023 06:32: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 DE942E88; Tue, 26 Sep 2023 08:31:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DE942E88 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709946; bh=zp7TClQYIYwq/80BJEYTSQlZe0GYYMAMWsqfebrPb1M=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=jkFK26SPg1H2htwmAScKiGheWf/Ygd+3V+hbp28qJnzUb3Mb/o33Vt2E1sDFr5aTe v8QowOrPTzBZXr4hfDgm3XJ2sY5upn557rlCbQqXcgsoT4lo0nvkaqeXeVfvBt5SKe k2yHVQO6dRvdy25perA9cPEybZhWb4zO9bzh+aYE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A0B64F805B6; Tue, 26 Sep 2023 08:25:40 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id C4048F805AC; Tue, 26 Sep 2023 08:25:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E06E9F806D1; Tue, 26 Sep 2023 08:25:34 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20720.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::720]) (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 C287FF80587 for ; Tue, 26 Sep 2023 08:25:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C287FF80587 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=RX5DCLbe ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YDQ8DUuLRgAdsY5heOaOjSkCYG+ywLtTbq78PbkGSA3RtX3mBbvWouYE/qL+9YRVXRNR3d39wVVSP3hXXpOU3SxNjTWCd1RgIHqYLd8LRb/jATUDx0utmcHrXQS64YXU7Sx+MTt7iJEywRmuqxQrasjP+AK3g1gkiFoejr30CA7+O/vCxtLSYS+6xCxvcVxGZPSvGYEioabFZBPcvIhcdcmXvU3c63ab4/suBmvUae8zm7RNcDbEyY4qrZTh0y0zMPhyjPLenXXUIal/UZYn03Wp5QC+sMcoKYquMHzMwTvMBuzWwt6X7jn7WevrIIWlaerbwVRckB46ZOOtpOyqyA== 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=UhxdTyxbzO4vx7o8LJXtoJQEid9Epajdj5+D8Ee0Oww=; b=YODymsNSVe6A0ksjtn9Ek7+BIxRXf0LWz1GukweOS5QoImK/I8cUlPepEE27uxz7jhcKJV3OCYidSjVRQFS1dUVvQcaZdVnGSpYAY1XysXbPzrDjIL6Vwxxe15BULlgdqkxSRBRN8Foevm+CoaD1rKGj3j7WH+rk7K9bvj6HhLYp4TuW0BdQb8EbbWyWkH22EFb1YfS0hJ/jKyZ0/Ci4YRlJTcDmmub7617fqkklxdsww7+8SreKaI8WOzzv5L58clUqY8MEebqLcqq26xRLXej7ElMiPadGguecjOUnecVJ6CNMhdUdXNYhFdJw7dzhwPhTAXD2MEtGiD+YgWoHJw== 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=UhxdTyxbzO4vx7o8LJXtoJQEid9Epajdj5+D8Ee0Oww=; b=RX5DCLbeXisaC7XvggzHdOFkGXPhpxtFKToTh9jwy5nCi3hjh9bb2giprAllkamPMN+UPrk2UJLj6IRaU9XTyp3HB3ZUZ7lftz73oTU28LJkAczD2n3hTyEMUtjtmBfn0IP/eJHJL+ZAADKurioAUXYWLirM73cuAuJ+v9E+PBI= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:25:23 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:25:23 +0000 Message-ID: <87sf71fo32.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Daniel Baluta , Jaroslav Kysela , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai Cc: =?iso-8859-1?q?=22P=C3=A9ter_Ujfalusi=22?= , Kai Vehmanen , alsa-devel@alsa-project.org Subject: [PATCH v2 40/54] ASoC: sof: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:25:22 +0000 X-ClientProxiedBy: TYCP286CA0150.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: b7817e5a-1ec1-4c02-509c-08dbbe595d71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RK4t40auOx24boj/u40TeWDlS52aco210vVAcliAfuJCn/OsVgbkAYO6AJsGphKD2OZwUcAiJvWt7FXstM+bZnPZZIm8flBd889BbXxToh0TJAWx/tTAd678CXUKYh8DsxiAt3toQkkUTk43zKZd8DcNkb2Do4KSiZPKKeD6GkkU+p2BWEP6q7YG4t5p6TbgoFRFKdi6xaPNO2ThyY7T1sXBsC/oZJRYnBnWADukrS80gt2bo7qqUvQZnLFuqGwqpJJPLfh4CLIZTaFunWeJqXYy3A5wXtmie/bvGdBGHPX4uLJ9V/92z6/z//uoWT5hOGq/uVvjHsjhy974paBLyJoflUvujI4Dqts6tZxYCUU14J6ymGqt9tzBPgl2LvXi0peftlmiKRbz994eiTgqo+ltdY17Q0D1rJlxCViGd+BYuHOWl2ufp7zx8Vuqzd5xApALhKkRfIACK9kZQB7UHq+oUxlr1y6AL2LcfiRMlvKFv/YkY90Fo6SPzGYdxm81SJuH9GblDt6Xr9dMuR6oNCEd+rpMtxEoNsqZEETk2cDX3hunTvqUUfj1ddd/5F6uoyv7l+KR0ise4tG2Qh9lhbXMlBsX3xUqBFyviwi7Obzz3VaswBdfwc5+bCIU/BR8pbkuqA4LBqRaVUzFrHttVg== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(54906003)(316002)(7416002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iZb/WMQW/qeYIRLqWNgUrMlqCWOSB7ISfjVEd6cevcqqayRCqiG1FvlMndahqhYO/d15GqW4mzfvSMNWw7+GwCp2e14Iw+wXfwkfvVBT3budazd8Tyl+aBzqtMyCScE4vlH6FL1aCw3IwhSA8LtxDhAN8aVItUWq6udSLnux8duiYnqzrOFTRhVKAq0+NtAmamzJg2CJkAVOQ3S0gb4PHQBoLX32zy81r7I2YVeeFJ8xpYaNZDwOmZ0tJxYB73kixl40NnTJjxUacOBds4oetxwmOvt6LvDXlQl9I4o0mI9p4hC23V4I3NhvwO+9/vEmG08Z6Og3BKCiLVN23Vd55QK7ZL9B0f0QyBhnBbyyQ8Zfpmnx9xAD3XmbTCF037RF9zi3MC6HC/ywnyI6YrT+4pHz3/drVlmdLu28EFiFQr3Y3TEeCaqoBifP46/g5wW/YaYKOUrucWUq7jDwNVBpnF0ijqlKbOaJxXjXDKmSe5rXOxbg1nWxHDKat4saPGkTyk2XsV9LkmMFVOzIDLAgBA4+IrGSPacHEo8oIrc3S3AIF8POrNAhUPQ5ZJ0mzrdl5ri0i3i8T1GdgCsLozNeKTJ4RR0xPcbmfmRxORc40I07idKtNZ+qDeuJKBBJiBx+Eq3KEMPvQ+Xi4tudiEG2naa9J9IAWSOhhBMcKUscJ8vK1CHCsrEF6nL9cFwtoRxZQgzlbw3+EG6xmnE9SNLWlTEyQs5SBjZxDV3XvqFM02uTZtWVuRvi7kGKaiK0O5lOAs36xy73G+hpM4jTQLz9IDSuaECveIdRKwNCuzLnfNl/+hjE+5WKxrN9+azOD2gpF3kJjwQqLC38YIT4NEZnKHeBSxXcpTV6gm5jh83ba15ymIo+7Ma69Z0ngs5/T4aX+ZixbjIocoZoJBfmxFWdB6Gw8r6PXYK+KRn3q8SzHJALzz99hCY6uDXSxv9995zAi2lMFCB30BHRczYsBmuIv7DhhkKwI8hgN3uQbAtewDCkWVXh0P8g8KyB0rxW4y5cS/c1J/tb6rhdDry8Kl38O1ua2DQOMUMuGALJSVMLxtm7ERRMpgEc4gIcCGNFQheOAEPCk+nPzYO9uae1J5gHaC3rgONpMoW//fm7DqXFIfSg3kGXPXMh9yUR6Dl3FYTyx1A+vJQ9E7+XWVlmjTivB3gjBvbPRmJhBnTV4pnJaZ4KXH+aXJsP7AkRLMACxV2DXfDsRovEE33I1KAC9bFMgvJyGBQQ+FEBeIF+KIbN2NASMsI0MQsDVWcOiz81oDZK/fqiO3jLnFiGCGJl9UkY1J1NnwBzngbekoxeclBWTPd3qEhQsB9lvon4qmghOzbClgSF9QZ6b5MLQBot0Cy9InlxAgOFTOSLH/eyrIa1lxgrZk/hF6/rzetNmXW3P4r5agAwfHbthEFnR60Nil2vxrRzIIDlNDqwPzlhiW2JSJy7Ghb+71cycDdh2UDcZOMYkYCr65mPu2BDXAKmJ+QkVDbTfavZOB9dVMTAEfEfD1ZPxZP7gzSMEHBTFCr02pVVlmVbxvGgx340oxUdRHvlPM+taq4H+IF8/W1Jy3f6JIpdW59GF7G+/WDU81TGu7NJzyAPHIgJq0AYOrPzS2tPQNVW+JgT81uJS96GuYwNZZw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7817e5a-1ec1-4c02-509c-08dbbe595d71 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:25:23.3018 (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: hrjn8aTKWQyc0ep4mXINpR4P7LVjNhi4bVV/3bf1xL39Bj2mZbd5WNO+kPljuukQuvgtAK8WEm/DgKKtxUaKVl1PpEDzXz5hwpCmm/LV+5bWdep0c43Lo6aMzFhfX65+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: MO6FF7SJS7NJNLRDHZKK2PT4NPX7E7BB X-Message-ID-Hash: MO6FF7SJS7NJNLRDHZKK2PT4NPX7E7BB X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/sof/ipc3-pcm.c | 6 +++--- sound/soc/sof/ipc4-pcm.c | 8 ++++---- sound/soc/sof/nocodec.c | 2 +- sound/soc/sof/pcm.c | 18 +++++++++--------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/soc/sof/ipc3-pcm.c b/sound/soc/sof/ipc3-pcm.c index cb58ee8c158a..2d0addcbc819 100644 --- a/sound/soc/sof/ipc3-pcm.c +++ b/sound/soc/sof/ipc3-pcm.c @@ -17,7 +17,7 @@ static int sof_ipc3_pcm_hw_free(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_ipc_stream stream; struct snd_sof_pcm *spcm; @@ -42,7 +42,7 @@ static int sof_ipc3_pcm_hw_params(struct snd_soc_component *component, struct snd_sof_platform_stream_params *platform_params) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_ipc_fw_version *v = &sdev->fw_ready.version; struct snd_pcm_runtime *runtime = substream->runtime; struct sof_ipc_pcm_params_reply ipc_params_reply; @@ -142,7 +142,7 @@ static int sof_ipc3_pcm_hw_params(struct snd_soc_component *component, static int sof_ipc3_pcm_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct sof_ipc_stream stream; struct snd_sof_pcm *spcm; diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c index 775c864313fa..a3550c72360f 100644 --- a/sound/soc/sof/ipc4-pcm.c +++ b/sound/soc/sof/ipc4-pcm.c @@ -280,7 +280,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, struct snd_pcm_substream *substream, int state, int cmd) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_pcm_stream_pipeline_list *pipeline_list; struct sof_ipc4_fw_data *ipc4_data = sdev->private; struct ipc4_pipeline_set_state_data *trigger_list; @@ -519,7 +519,7 @@ static int sof_ipc4_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_sof_dai *dai = snd_sof_find_dai(component, rtd->dai_link->name); struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct sof_ipc4_audio_format *ipc4_fmt; struct sof_ipc4_copier *ipc4_copier; bool single_fmt = false; @@ -743,7 +743,7 @@ static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component, struct snd_sof_platform_stream_params *platform_params) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_ipc4_timestamp_info *time_info; struct snd_sof_pcm *spcm; @@ -804,7 +804,7 @@ static snd_pcm_sframes_t sof_ipc4_pcm_delay(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_ipc4_timestamp_info *time_info; struct sof_ipc4_llp_reading_slot llp; snd_pcm_uframes_t head_ptr, tail_ptr; diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index 7c5bb9badb6c..34aa8a7cfc7d 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -44,7 +44,7 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].stream_name = links[i].name; links[i].cpus = &dlc[0]; - links[i].codecs = &asoc_dummy_dlc; + links[i].codecs = &snd_soc_dummy_dlc; links[i].platforms = &dlc[1]; links[i].num_cpus = 1; diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c index d778717cab10..33d576b17647 100644 --- a/sound/soc/sof/pcm.c +++ b/sound/soc/sof/pcm.c @@ -25,7 +25,7 @@ static int create_page_table(struct snd_soc_component *component, struct snd_pcm_substream *substream, unsigned char *dma_area, size_t size) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_pcm *spcm; struct snd_dma_buffer *dmab = snd_pcm_get_dma_buf(substream); int stream = substream->stream; @@ -60,7 +60,7 @@ void snd_sof_pcm_init_elapsed_work(struct work_struct *work) */ void snd_sof_pcm_period_elapsed(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME); struct snd_sof_pcm *spcm; @@ -124,7 +124,7 @@ static int sof_pcm_hw_params(struct snd_soc_component *component, struct snd_pcm_hw_params *params) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm); struct snd_sof_platform_stream_params platform_params = { 0 }; struct snd_pcm_runtime *runtime = substream->runtime; @@ -194,7 +194,7 @@ static int sof_pcm_hw_params(struct snd_soc_component *component, static int sof_pcm_hw_free(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm); struct snd_sof_pcm *spcm; @@ -246,7 +246,7 @@ static int sof_pcm_hw_free(struct snd_soc_component *component, static int sof_pcm_prepare(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_pcm *spcm; int ret; @@ -283,7 +283,7 @@ static int sof_pcm_prepare(struct snd_soc_component *component, static int sof_pcm_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm); struct snd_sof_pcm *spcm; @@ -386,7 +386,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component, static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct snd_sof_pcm *spcm; snd_pcm_uframes_t host, dai; @@ -417,7 +417,7 @@ static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component, static int sof_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct snd_sof_dsp_ops *ops = sof_ops(sdev); @@ -482,7 +482,7 @@ static int sof_pcm_open(struct snd_soc_component *component, static int sof_pcm_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct snd_sof_pcm *spcm; int err; From patchwork Tue Sep 26 06:25:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728178 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 61DC6EE020C for ; Tue, 26 Sep 2023 06:32:58 +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 9E07914CC; Tue, 26 Sep 2023 08:32:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9E07914CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709976; bh=gtbQfv52m2Ux/MnPlo/wRteMjCyXVk7mFL/yjBTF9qw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=DvwaywKF+0PY6OiFo6GR9nMVebMRShqYoKcvalzlxqzgd5D8Q3GPsrYslyjEKSEe7 YFNiBuzR4HbZKh+Wh14uiICLfsAfVFVf9odvJU9QCVRaT2mn2e+oylPrM0RPR2q9DU w7pCUMFYLUa4yiPVRW74aziWdW/uPXXrUTEIBCqg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0FD03F8057A; Tue, 26 Sep 2023 08:25:57 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 5B6D5F8057A; Tue, 26 Sep 2023 08:25:57 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B9F74F805F8; Tue, 26 Sep 2023 08:25:50 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072c.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72c]) (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 00EF4F80587 for ; Tue, 26 Sep 2023 08:25:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 00EF4F80587 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=PRkFO2/9 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fWulCmxCyridUDY8WnKYbXmT9MfEUc6DgS02iGEu1mbwr2csnqYedMDwcAGkuz6te9YNGFIVYKHR8zbNARz1UiSxS3kZzJnonVZAAwqxO73pUE3EPdOOt8StI7NzdiKqO22tYJEgb6vqs8hqofw0y0C8+snBbgCXUZTMLkpyMslLGfSAD+ug96I7d3tMkNcldZaLUjkTUXaY2jCdS5/NKtaEbtBQRuAHNc7a7NYairIY8ZLzAR4th8s/TxrTjdKESgCwcSLOeEe+9Lcm5pLNsWcVx5VQyb9fceYaGYPdGDnL5ObHV23pYf+UNd0Wl4c1lYiv364B36RJ+F/j1L5sKg== 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=mxew44fvwtOurbHt8+DnJZfyQMaAHfeNPFFAIJE36uY=; b=hwTwAeJSPEfMYkiwj81pVqk7O8DuHgy2UzgSJGpwhyH81geFx9FW06B+RzFf4fUMqPouHb/jwLUzw+yDBEp9ZI737N7lnZ3NhOlh4eJD2Z6MNTTvg117nXaDCerHPH6QSMG8br2LxoM9ds+Qg+/yclFWNFwAJr4h27A6xjl1eCpM9mWpfaa3L/Iy2R4xXoMrjsJbuQtiRmzchI6StJ9QlS23+rlso5kYV+kYqeihm3VeJimTiHVN04Tv0x2Caj/npndrLVllNKJqLDtz6mZxIT9+3SBhLM8LMS6B3y8ywXFih5eCgRRkO8vhkxp9xFICd4dlb7L9sV062thTyj1K7w== 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=mxew44fvwtOurbHt8+DnJZfyQMaAHfeNPFFAIJE36uY=; b=PRkFO2/9QDdwOvFNFyXKSTmvptfVrANi7iwInEh7fup/MR0ew1jSRFN90K5O6z7F+4QbOND8aeRFl7vE2AEaOyl4TrelF2Jpt1ryNARN/uOR2DWyBw4H6Aqqy/YsPHtbE8IyxnCJTCJpnE7SSovhF8zOyatIRp6fWpUFbIeF2Lk= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:25:33 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:25:33 +0000 Message-ID: <87r0mlfo2s.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Daniel Baluta , Jaroslav Kysela , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai , V sujith kumar Reddy Cc: Kai Vehmanen , alsa-devel@alsa-project.org Subject: [PATCH v2 41/54] ASoC: sof: amd: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:25:32 +0000 X-ClientProxiedBy: TYCP286CA0322.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3b7::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_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: f7c37523-2306-4b3c-5d7c-08dbbe59639b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KFueN7O1X8TfTz7zAEjvneQ1lB46GWCqYoTKbM7OqJ74fgL338/X84Kjmasbl5HS9SsP6iAKRdtIcASUFZ+RcC3Y0lcoPOmHbIVeKwQZD17K2YZqT+6Fu9+Zvyd9GsUCe8oR+PQ588psK+mPDTAt3kwe3Op+jes8d3mD722HuvPHdWtYJbI0lUzUAuAZ1/5Y4AoshzUcOOGqAuo9DZui/2evs5WisfW5i6HnX2/CgfshFF0khiJgZOqZpd1+XkBZduV1eHc5F7J3JXXeeflZCBJs6dYCUK42mxN+nNlqSaLBa+8wCpMcqTn5YZ8Cd0rjI0N7I2RoSqARIhqHVTd4MUeQoqzquplFJSzTfRCYdHPSFLwhdyyA8tmz+dJZtTqv/XfcHu8ykyzwUgLC/22EBUrJM5cZifJCG/uhrGyh91KxNnSz+KgDGXCv2OTgaksJ9zyAD+rvsOQE2aIItAZvCghWz73xhITwnp7OPIC9XKEGW6XyMJstosHZWAYWxhCWMOZi1JrXBZFvXAkjjMXAmjClDPp0NCXUTJfQA8yqeXMK84pQofhtzwqSSeu4NA+c02CnVeMn3INse5OXibRv3mv+UEGuJQSIEUrp/eupxdVnMF2UJnZjZxuEe+TlUua6e3UrrDMkKUedv32FpAvP7wLKClGdMl/aNRXGkHFAm3I= 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(4744005)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(7416002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(921005)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o80V7oQyucy/ahgkzRZzpDgUZr2A00oxvzWGFeJ6NulpQK2C2QU+8IcBJmhrrFLXRKCKEfH8AO68npJI1+eEMznGhuxk1jVzhUPG2+omPHzoYMSmrbLQhmxguny+l5H2uesI/J+mojUzr0RmSYCb2b+THhcNMRi+wwMvaurTHf+3AWHMTLg0blb3B0xjkdXneXfZ84NumIzByY/lyv3lY+2MGLoqHKY9vb6uOBikt3APkbYkkAEoBkplWk2kwYWBuNZDb9WwjUM6LLWp6GpGwmInCUZIor8+s5oBC1+AhiCR35rWkUC1C+NCaFQzgTzvKRQ4+ePnl35kw+1ANFquW1u+sE2firX/7w5AFzlzTxco2RrEQx0gVrjI6nIciV6y4ExKgA4PRibNDG9sf1UljBEPgXY//7ucMlDZCdWjzOrpRkgU1EYdd6OKWe/W7rE5dA1fzJ2+reUsccLk4tD/EOZ7lEdAUYHyxN04yx1dTDqZLjsaX/6PZmo+PrNXszzbwhBmOwZSJIrQlC7sUOWc+wjgpi73IKchAZo6xGeVDnp2OTmJBKb3dK7UcOkDpvz5+Co6XXCZU26hMFQlN5pqw1FNnl3NujqIBOSeBSQRYrTbLu+EgK15xlhcRhRy2rj6YmR1tJlFepquSntGLJG7mcsRPWYsSy4sPotfszNmz2tLf0PDaS2R4U768dA/rJ+yuCXuWRB/Sl+SBND4SDo1hs9/PE86tXK1grgQM2z9eTp4kt6kdowoDKvUQgPet5bZd/UNbkV2QoosteCi1yIZICkwfwGYicGtI1uB4KbrPjLQMu18jpqmn0DEoEa+LZ3t7Tndhjp1WavJ71wV61zA8AGQzIOuCjOQG6+KE4n5Qlq3f1A2xhRpLzKrF6ZrTNXQonFy9DJ7m0ISm4NNnZBeppaz9S+qyGTOugLfrJsmZEA4Nvnw0l3GhYeZI5eybYuCCBPMN3NNAY9SQzmqE0VHbxYKaPzcVe7/z0WKSUvWsSWvE44vYhBz9zwgvEGTmQn6MIyIaMuUq/KznwmNUEAH89OanLqOB1jkmSk6sKtey7Mn5iEyISSArs+UkU21ozYBVxDkTV8he7p7/QEx0GrQ8PhvG9VheOMTrqGK+WSXl9lEZMbF/QFBanhqf5h0tZeOekmzAfjysxYbtxMWBvlD9KCCApKyiHkwb4DsSyIkyec/YdshWGYpamA+3g5N+NPhPFHiaUhBZDL8z+t3oROzfI1NuE6IW+PUBQjVc8Y98BuD/18QvIKfLiv1SUJ/aBs84kMM8X0EmVzLp3cgecI/HR/WURzRcHb9ssPBlZbfLgaThfIe7nAsTDpvw5wTEoTRVRI/6LoYqnyvM3y4KFII6g908HJcub7/K1BRuDf2/njoEbmKxlvw26mt53tOLsiU9A3H6QG/ZhZTVXuT+pKGGNNMumVO6HN/PdnXRGI2QBqL76LqXnpdQuc+23v2jqgkjsoAXnr0gMZyYRnwnO35zuI5Amsi2AKkMclCEYhJVVfdGHZy/tvk/mMkfciYucIsq8RTo506THJxD1ka56k1T2Oc2Plu01gBDOVPnA53MzyHhk7J8JGZ6c4KxcRYMAAYv1C6M6+zJU9xSaQ3p+1gP84QRMBxCbUgX7br0UzE0Yo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7c37523-2306-4b3c-5d7c-08dbbe59639b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:25:33.6614 (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: RAoH5dVTzsy+X4gOpGMoIkGuqt1vZNseS+sY3cMpSsDmoT2yyWPKGIOwP4xUfWAy85mFi39iA2lFEs6weodfVxWQeqZmpykXwsI4HciaiNoA8IWjeco9ITiwDv4WjkMN X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: C67TNEFM2IKRX4DHPLY54MVDHSUEOX3H X-Message-ID-Hash: C67TNEFM2IKRX4DHPLY54MVDHSUEOX3H X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/sof/amd/acp-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp-pcm.c b/sound/soc/sof/amd/acp-pcm.c index 0828245bbb99..cee0b1154874 100644 --- a/sound/soc/sof/amd/acp-pcm.c +++ b/sound/soc/sof/amd/acp-pcm.c @@ -89,7 +89,7 @@ EXPORT_SYMBOL_NS(acp_pcm_close, SND_SOC_SOF_AMD_COMMON); snd_pcm_uframes_t acp_pcm_pointer(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *scomp = sdev->component; struct snd_sof_pcm_stream *stream; struct sof_ipc_stream_posn posn; From patchwork Tue Sep 26 06:25:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726432 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 BF9AAE8181F for ; Tue, 26 Sep 2023 06:33:14 +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 0611A1015; Tue, 26 Sep 2023 08:32:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0611A1015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709993; bh=uYulVZQPgcAC8ulzMWBz46AtRDI6tyQE2UquRTMSgpo=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=YSjxq8j/OgnszwkM0cGXrruF/f1IZp9+1cFnXm7YXeFcIxakMaU3IKpcmtBGx4zcF BKULPltMatPTmgIkookbZ7isk4xtQnYqlQSfY1e54jvDwnF5ZwEf3Q7dG7S+yHFuUg bPFwSlgC21Z7xaqyOxnXy2VZd+XAQnhcqtiOu4Po= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A2790F80608; Tue, 26 Sep 2023 08:26:04 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 21268F80608; Tue, 26 Sep 2023 08:26:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D22F1F806DA; Tue, 26 Sep 2023 08:25:59 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70e]) (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 84819F80603 for ; Tue, 26 Sep 2023 08:25:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 84819F80603 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=FkRQt4oP ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cbB8esK5XK1uZ5u29khX83pEgqWX5v7h/wJ4ivpdingEwergCO//Xn89tGdXGbSlEwp9JpZgorHvRPSwaSKPOTa8bljtT1pTlqslSIEzof9DWUCwlWlpgB35MSfmv2OMIVoNvp6u+plB3yIa39J3knynoeQqsObhXIAuSg80SmyuDyBsMGkfRRiCAjDMuHPM9hrUKdabe7o7NJyJF4+CAqM7pC0mzBqlTyOXv9n5DW0C5UtaYoUjHDINUYOm7SHsgF4lhlPtewFkcFxLoA3QVUC/w53+wa/DrrloJW1KFy+wyn00qFwFuY1ZzV7iapQ6wmTV0XOUxSlyFNf3C1gNRw== 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=C352d+IPCoCOFALMR4CyXU3Z25RWu4A/g1B1XtzALzw=; b=YP2YODDrX7q6ZcMwSStY3GaXdVwqT+C7d3lIilEa4WrZNC5YYKJl/c44qS7Bztfo/GJTE2m15PxB5fagmVKGI8QuX9HWEREx4BF8fFIZEt/DY2Wb0EPK4bLbn+SvdiWadgf4RhydE+8elhMilWGHi9lv3GB283g6hj+2+ETwaOAXiYxOsHYA7nt6ErVSZuL1rksU9Idf77V+uD/M1Zk1SETHy0YczCJV2GBBdodl9mF3Yle4oeXlSPoPX5bBvaB9aZJCg9KX5kPe2zBnCCyTslysetY1x1rv/Uw35KcfrjQG0pqftuKyzkSdGTFpMzKbtjsfHFFqnW6kku+jfa/T3g== 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=C352d+IPCoCOFALMR4CyXU3Z25RWu4A/g1B1XtzALzw=; b=FkRQt4oPHaRqgclQyCy2rEhhnCVk6Qnj0ITvUMTjO6eYyPlQ2sDn+i0biyLw0bsTXAZutnkulfsvHannyh6ZF4Ll12jubV/3Hxo5+eiUSI/IGD5Ur4dLNdr29WB/sKdl+u1ndkpbtapNGO/qaZZfgIuKoMDweFuUELcaA3B6VYg= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:25:44 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:25:44 +0000 Message-ID: <87pm25fo2h.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Daniel Baluta , Jaroslav Kysela , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai Cc: Kai Vehmanen , alsa-devel@alsa-project.org Subject: [PATCH v2 42/54] ASoC: sof: intel: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:25:43 +0000 X-ClientProxiedBy: TYCP286CA0171.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b658b86-2c7a-4fa1-7c29-08dbbe5969d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /AtgFpxXQsJz2Nu3s57T7Nz66QiwJ282uU+MDuM6LfxLDb+Pdrr83K5f43mRgWcgaFvocOshSPfCvjh24FjGHrroTt+xwjGdJyocoGuipJxPCwdMGX/ukgG8CG7kl0kgcuF0VwQ3OIqGmKEi/8j0tNgPOQhFPFZUl340eh5ZoLshiOCmQXJcmXgbr0PF5oAAod7s7Wj3Ewkd411IORoxFdthykOJ3Yt4+ODHqZ6Uy6sstiF6RMV3pi1bJS6xrVoLGdKw5pVKak6mpwP5qscKR5c+eJ56hEKX4h4dpiyIhyDz1pzgR/azl8ahovTrxZoKo18b7qqJ+6XrlhaZ6zlC1jAReIiZEL8BK8CHwwSzg2NP3GeYDU65lYqKeEu38a+ogijDFMpNw9PsMTCm1xPPNlW/fbx9P2m+B8StjbHE3eg1nG1evwRuro2BJ6fPL4j5cGNVxTy9TSIZ2C02hWTfYb7hafBCy/6XdXvd/DageCZTjK0gBT61H1BY3ekt7a+jQPHrvIVu9q+vj+ujLiaQMmdjG9jrKmKLtCzyyu6aEErVsWjBZocGj6M6JMirs9Ez+UA/F2SaT8Axq8vye2+2XqB66+CkRpTXAw3iE8iBLuxVpk8UEMdmnAZfRtlfeRHSmUcTS+jMYWSd5Vo+UH6koA== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(7416002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QEmV74dDO72Yxk69yQQnmF+7fbt6ystZ1jTcvu36D0LO94nynd65aImZx0sTOpnBzTj5Dijpe/PJP2IK8KAfs0PY5FjHzknDLwNeBExq4zq39/c49qvb87jYWTX36td5RkhxfQu4186whvnMe5bsmTtIZaLeTpMAg7uTRIGMooTj5cXT7X+z87aJsgaZWqbstvwPeXzlXSVd/x7meFO7Ve3MfzEqZIxRzsj/RZCjjjvfSdGlKUbpMUO/7+392xTJxDIeaz40sPMn9I3JULwm57NleG29q5VROMo1z1cL2D7c7pDSSLNA+0U1RCtV4Pdou/W25qSISXetXgVOR+bwVkaF8WyVfSY+RNzq8RArtVFPtj/R6X5pZ7X02P+1fbn4SDtR03ncLw/FHRqRyppTL2rd2ARzADxCQ4bw7xHR9MtvKlijfDjWahfjEgzFoPOzfK6Zs5pH7yc7VYhK6snlucIoGsEG+q2vIz2iuE8Z7Dh6UEfg6qXtA4MZb8tms3NiYeGymoy5d9MHRLPoWacnqUWf7XgB1NFOtCHfSG+TU7UbGwi5R/Ppsq//HbarKnZK3X5MhLRhyeoxxSz6JfDExNA607IKGV+MdsDP/ro1Zhb3+SMiKxb5hjgfg4m0xEUfujLz/yAZmycVAl+fntby15um0QxYGoc6bbj//Wkkd2G7P9bSg0XA2Dg9NThgIAgJm7fQ06u/ckyiyO7ibaJfqYi020xRY33FrDpKqXogvFJw00fPQAe+6hCrxCcBZa8EavLfnsat0hSYEdGl8Z+4fi5xjBaK8ahJPQe/9/kRZmfGA7pbgKCGwHqyw8gUNme0NKQf/3b2mwoNTk2rtT7nTS7zQX8mWunL1BYtKfpuPwTQ1d9TQhciZwJKZ/xdpDO+F5Uau6785PFHV6ls0GhPxVbSM4BOIk6BPpthH3CUcWS9goLL2rKIBjcNn/mq8FQfIfuf6QABc7Dr0Nt1jYA4WdhZMlsS5MUy93QQX7ON1sdpwWAIHhH0KJfrqdZKGZgOfsZl11FquO6MNbEbIR/oilw/3dKSF7D0DopOXa3VnPJDKnsiVHqaxGEZGzSDJYtnPb+BiRKImGpeIWzr8JBHWqqos6P/uwoF+MgWNmTMECi163NgQobVINEeFPR7xcuKSZFK+lPwx/PQ3deLuLNKGU5Ly6fK/WnGKJ1gaYO72VRstlyOtVfNgLG3Dw8b9xL5k97iNLrM/uNi8HC3tK6jWCV+xk5/lG9uuGqUzEBM4H2P8YpS/rosEtQh3RQdlBdUPPU+2o87Kr4lwxfMMTmnxYL1gtLnSfhBywmDfAhUh+vYwSP6HFb0QiPO2ygLlnRS483uYpgwTd94pqkOXvmqrRLdxxp4juzpVnRi75CitxUQ0Qp50ceN53koMrAUQ3BHfUoL1DdRwjJ/bNu62CbRN4CsFg3d1eHFVaub8KK/YH8lX4EJhrJNczBFD+jIrczCPcTWORYYunb/vrcR87vxMqmo/aW33tve5+HuWpPAy+ttbWdr8bDcRKLZyMSz98unv8wKJyiSezRy+J1HMsDgzWaEcRfy8xKsG3XI4HV4+OqCpQ8vXvz5Q/eZnF1Nz3lVNF3bK3VZxLSx7jSCi8krPysDunxRd5pRDa9gJDjoIw8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b658b86-2c7a-4fa1-7c29-08dbbe5969d8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:25:44.1780 (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: cXUiQWj+qZCBUbWatHL7SMH1VFOcWicBfNncoXgjLOMgkOYDopdMuoeqaOLt3rTeZs3OtYiaVLgkGAZLPUc6CLsQNDGFxBHw3fZ80tMKJJqIRvAjWZ1hhYEUx4LqUJ4m X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: EM6TQK2QXMMZQQUEWY5COJJJH7C5Z5B3 X-Message-ID-Hash: EM6TQK2QXMMZQQUEWY5COJJJH7C5Z5B3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/sof/intel/hda-dai-ops.c | 22 +++++++++++----------- sound/soc/sof/intel/hda-dai.c | 8 ++++---- sound/soc/sof/intel/hda-pcm.c | 4 ++-- sound/soc/sof/intel/hda-stream.c | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c index 012a75f366ab..87935554b1e4 100644 --- a/sound/soc/sof/intel/hda-dai-ops.c +++ b/sound/soc/sof/intel/hda-dai-ops.c @@ -43,7 +43,7 @@ static bool hda_check_fes(struct snd_soc_pcm_runtime *rtd, static struct hdac_ext_stream * hda_link_stream_assign(struct hdac_bus *bus, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct sof_intel_hda_stream *hda_stream; const struct sof_intel_dsp_desc *chip; struct snd_sof_dev *sdev; @@ -145,12 +145,12 @@ static struct hdac_ext_stream *hda_assign_hext_stream(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *dai; struct hdac_ext_stream *hext_stream; /* only allocate a stream_tag for the first DAI in the dailink */ - dai = asoc_rtd_to_cpu(rtd, 0); + dai = snd_soc_rtd_to_cpu(rtd, 0); if (dai == cpu_dai) hext_stream = hda_link_stream_assign(sof_to_bus(sdev), substream); else @@ -168,11 +168,11 @@ static void hda_release_hext_stream(struct snd_sof_dev *sdev, struct snd_soc_dai struct snd_pcm_substream *substream) { struct hdac_ext_stream *hext_stream = hda_get_hext_stream(sdev, cpu_dai, substream); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *dai; /* only release a stream_tag for the first DAI in the dailink */ - dai = asoc_rtd_to_cpu(rtd, 0); + dai = snd_soc_rtd_to_cpu(rtd, 0); if (dai == cpu_dai) snd_hdac_ext_stream_release(hext_stream, HDAC_EXT_STREAM_TYPE_LINK); snd_soc_dai_set_dma_data(cpu_dai, substream, NULL); @@ -193,8 +193,8 @@ static void hda_codec_dai_set_stream(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream, struct hdac_stream *hstream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); /* set the hdac_stream in the codec dai */ snd_soc_dai_set_stream(codec_dai, hstream, substream->stream); @@ -204,8 +204,8 @@ static unsigned int hda_calc_stream_format(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int link_bps; unsigned int format_val; @@ -226,8 +226,8 @@ static unsigned int hda_calc_stream_format(struct snd_sof_dev *sdev, static struct hdac_ext_link *hda_get_hlink(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct hdac_bus *bus = sof_to_bus(sdev); return snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name); diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 318a21c12cd0..a20deaf3b428 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -316,7 +316,7 @@ static int __maybe_unused hda_dai_trigger(struct snd_pcm_substream *substream, i static int hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int stream = substream->stream; return hda_dai_hw_params(substream, &rtd->dpcm[stream].hw_params, dai); @@ -408,7 +408,7 @@ static int non_hda_dai_hw_params(struct snd_pcm_substream *substream, static int non_hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int stream = substream->stream; return non_hda_dai_hw_params(substream, &rtd->dpcm[stream].hw_params, cpu_dai); @@ -526,8 +526,8 @@ static int hda_dai_suspend(struct hdac_bus *bus) struct snd_sof_dev *sdev; struct snd_sof_dai *sdai; - rtd = asoc_substream_to_rtd(hext_stream->link_substream); - cpu_dai = asoc_rtd_to_cpu(rtd, 0); + rtd = snd_soc_substream_to_rtd(hext_stream->link_substream); + cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); w = snd_soc_dai_get_widget(cpu_dai, hdac_stream(hext_stream)->direction); swidget = w->dobj.private; sdev = widget_to_sdev(w); diff --git a/sound/soc/sof/intel/hda-pcm.c b/sound/soc/sof/intel/hda-pcm.c index f23c72cdff48..18f07364d219 100644 --- a/sound/soc/sof/intel/hda-pcm.c +++ b/sound/soc/sof/intel/hda-pcm.c @@ -177,7 +177,7 @@ int hda_dsp_pcm_trigger(struct snd_sof_dev *sdev, snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *scomp = sdev->component; struct hdac_stream *hstream = substream->runtime->private_data; struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; @@ -208,7 +208,7 @@ snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev, int hda_dsp_pcm_open(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_component *scomp = sdev->component; struct hdac_ext_stream *dsp_stream; diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c index 65e9242365be..f2ebadbbcc10 100644 --- a/sound/soc/sof/intel/hda-stream.c +++ b/sound/soc/sof/intel/hda-stream.c @@ -38,7 +38,7 @@ static char *hda_hstream_dbg_get_stream_info_str(struct hdac_stream *hstream) struct snd_soc_pcm_runtime *rtd; if (hstream->substream) - rtd = asoc_substream_to_rtd(hstream->substream); + rtd = snd_soc_substream_to_rtd(hstream->substream); else if (hstream->cstream) rtd = hstream->cstream->private_data; else From patchwork Tue Sep 26 06:25:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728177 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 E593DEE020C for ; Tue, 26 Sep 2023 06:33:26 +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 51A1B151D; Tue, 26 Sep 2023 08:32:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 51A1B151D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710005; bh=DIr0zRppt6DiUiznCuK6MGZKGQFmudWRIaMdCuhcM8Q=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=esXAOYWqp3mX4KZEYfxupWtGTzmfm39aqaQjLcghB4Xa90zqhozUXuS2AzHyUDdrG 4QL6/foYllXF/Kpy43JvUR89igWFY4LjlzYRMKOdRFUxcY9n6k6STEsxVjo4elcTHC ikt9jCrUI6UpjsYT6zZHgEXd3cHbzGeU1LSKhAJ0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2DA91F806ED; Tue, 26 Sep 2023 08:26:08 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A6C03F806E8; Tue, 26 Sep 2023 08:26:07 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6D669F806E5; Tue, 26 Sep 2023 08:26:05 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070d.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70d]) (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 4A4AAF806E1 for ; Tue, 26 Sep 2023 08:25:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4A4AAF806E1 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=VfMfgGjy ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MuSQRJl5R9DPS6DFPHrT9h6Hl8wD4ECBHKx6gclIHdsDIR0oYM0CELq5std4FKoSsGtD6T0uPukEpb3Hz00R8A6ycMYv/7fXGPZeV8KcTUvTazdiUMmH+kuEGC7R87icdN9krEZEcVN3JzDvJcKSNLarggzN0bZZo8s+He0JWUljxbIbGznrcKGl8nlAo8De3o+KtZmfvtDHVWTpR4V2e8R8sZfwOZ6ULlVSkpOaS/PQ59khrVxOrzYZTVOOsTOrJftXLW18CmfTu0vhGBRM8K68uJ/Vmg9Ig8/ZdwtmVHjoxWhabSK1l2+TznlSHKhffwm5cvWnodG3w+aJgWTSMg== 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=2J2FATrIGzY7BjbMhJQ1zVoO4L74ha+JUZmyLQV5Ssk=; b=LCtG0dBMFLZEWVLbM0MuDaMQDb3wrvJoTvAZkkaJi5zrl+++/Ttno/c2yuBRRhMbCz8owSW4EVFv6k6armsEd325sUtG/FALhjlT+UjLA7LqYKu07RwqA+LRweApL6ilCUM6k0Ewdok2VRmUtcHrRLJFbyWihd7pNBSg8CifZlVGol+YH63Cf8udyHxTfqK2MpljNf+XVpkWH5S2lWW/V2Ktqv0BYr3tx7SqOmmaxNR23GSM+5nipHhtsTIAjutXGWJV1nWMhp6XPbv5JVNTY+DPTVBRKkTlhpDslGYQYig2Ewwx+ppnHHLVhfT5cc6pTGJCZyZouSCytoRpR494Yg== 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=2J2FATrIGzY7BjbMhJQ1zVoO4L74ha+JUZmyLQV5Ssk=; b=VfMfgGjyobou5IQ9ZRtpFvJ/dtP3DfAKd+/8qVsJHtfxq3IElKuSKe3Dsv8GfG1VMcDh6VnhlMczrVw5V/dsJrKp4Tjy9NZAOdRbJhVJlH/PwouR97GQ9OxoUaO2+buWVjT6I3Q0ufsy9nOzRrddstNpoXMeTnYxuz48GZrnIpQ= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:25:54 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:25:53 +0000 Message-ID: <87o7hpfo28.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: AngeloGioacchino Del Regno , Bard Liao , Chunxu Li , Daniel Baluta , Jaroslav Kysela , Liam Girdwood , Mark Brown , Matthias Brugger , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai , Trevor Wu Cc: Kai Vehmanen , alsa-devel@alsa-project.org Subject: [PATCH v2 43/54] ASoC: sof: mediatek: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:25:52 +0000 X-ClientProxiedBy: TY1PR01CA0198.jpnprd01.prod.outlook.com (2603:1096:403::28) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: 8463690a-498e-4c27-4992-08dbbe596f59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p3VfFcER6BQTD0vE75dZ4iJjbIbHjDe8cywobMVjHoApO/pSQ906plVsc6XM28vw7FYA+9xgd/g8bur5sQu45IxmOvjqry/9/WAM0PCTkaSWRYsWpDzGC8LozU1vJACDEQ1Vq03fSYrTm7Vb9FlvN2Thi3RnkPgiD6TIw6YkylxpuAWW8t9bGcrsD3/9J8rlFtR1EyD5rmS2d9gzcUf/OC1bVSPP2FRqYKE89FKEFYTsS1AsCvvydsWINd+Fk0TkoVTfff2aACMFLJG7gibZa385GvRMJVTochpaRLaZAbXA3Dv5RKHBt/ZzNJzn/9+EyHxH5w9tpMTttoOuuewuVnJpS/y/3KcE3yJIq2I1t6RrzYFvtkQTRVpioCUROxBoKn7XUwqzJbTTaSW9aKOF13uIQ7Xxktearyc6cCZNRUPqWGDlc4GG+KG5e8NljUV+grkqxYqz9uP1NGIz8gdfUe0dxtJYM/Gl0+O6aflMMF1hZWPmvAgvBA5NDLAPpsCJ5prHl8ELKQNZ1CSEcDdl/G6f6WFLLdWv2TGjZ1fhFHvUNRaw5/r1iSip/XaPyoSsQphIJQh5x97RRlN93O8V7zCVuztAU1hfZhQvwgwmE0z908SLnMDdV5qEIVq2zqk9GOyyMSesC+0voO09OK66Qu0fwLp9DBjTVzonwrCdl4k= 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(7416002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(921005)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V437DiZnBJLuitFME+E7kewhj8+/NWEN6PVT2aRHPr1ycNY3PeS3xvitbnBCGScjwOTDFHxnjcTMlv5aEw3pOXLETkYTQo6u0/4m/hcm/Damsn7ABcCkDdWnmQsZ+TPusOlxvhoO3Tx7XP4Q69mtW3ibw6uMuyg1H83ja73u7ZssbGHIdTOC/NS+4V/xnmgqeUQ2DSI0YyBcGDCcaS4umyYTDtOrPPVylrkagb8jvvPXEzcjzv10yokTz0Y+pClWGNyn3wXDps63EnrUDlksvzYmJUL28k2NGbIVyYbkNg3dZN7d1qHz33DFI0v4NYTBSnyGUiNAJhM8f4vaTU9e3CD6PCCRU4QVRHXtVto4ACSdSQuF+oxJb3Q2FR8PcKFP6A6l7HsXsoUpYYLM74InFv6N0x0SZ6gLKnbkGIqXEP8Y7HfJkrd+Fs7z0FyXNYZhkBUnQ47vTdxEUDexJGz7M+h+vo5ZLXkOdxGQPcFDdqns6NDkAfxhU7l8L68Od2paVvB0GR4Bc5mgwjsCf5K31609XOt4T/LWm3e/rMCnfGFTryyFd/D2tnWrPZRZASd83KAxQX1zLiKO1z5Q/cgJjLgUa+PIhRb5/4yMHSwxAolNEYT34XzlEaos0K0kk/GzFaphSh4ickiB+TGco946RGCTB+b8yiPBPMhnyc3G22erVPaNsANsp9q6y4+O3Hh2Lo9q3DBNuYQu9q2LueZ8G4z3+bPsjNzgr3CZ7KcUn7X4WF5jfgf9B98A6W6YzUYhIbgJBZlIHzs2dfs/fTPxMIBkOAUzYILD6taG07gN+5+MkOwN8rEPfvUSjnqCcD7UWCS64EXXYJSFtRegnFrHDudr/JihhCQmVtm8VI/kSIJ8yyhJ1tlr2PYNnSHBCif5guzoQ/JuVMsXPoI90B+GOCqCdo2iaypqWDqKY0eynMdZisBD6qmHbqH9SOnCJfq1UU3TV/v6ce1sxncvsH+m5ukk03/OynpYUwaOVeNG69+gvAbbYhBTDuOdu5eXItqCxOCN1YTKUKBiBd/fctJJJCb/VbxzWg8pakHgqIhdp4jmaDl81xFYt7QSZNEg34mdK9uucsAac2Djwj2RPG1aIeh9aWtwWvVCgRz9VztSqvgu2aVJvIIW+N6F5WV5alUOHF7CuQcb/hcyf+Vlzxr33XPDA7FSNxFMadzXza71Rv1JvOCyvD7xy84/o+9QU1AkDrj6X0mA1vYVpF0rjY21m9lLF536HCSJmX0v0AE1VVu1vRFXPQjjFKbXuXgHpbfZxReLIO0XiQMLp7XzUvF++1rw0gAfQ8Ug/tjRCMIV8+wjaBqTidyxbskff1/P0RJWOEAUB/qf/wavegEJNB9UaOCSMqsqmTWqoXxqnt6moTWmJDZhw7AYOT5q0727Yk9PyfZNLQn3Gm+cCeCUUU7Dr94CbIuZ2g9nPI0htdo76J0bladx+p4AaOaG4hy3tz1SuVxC9KF4bp/Q8yC1nAuwZCB83VrbMzkPeEqbEOq7dI97J1FwvzZFr//Wb9lFA/qp7XkFAjuzzTu33Y34mFReduPb6LlPVh7Ys3c3ElUMwIqHNi7YcS7L7ph1bYAKr/bxEViwMtEQfC2vvEHYUcYfbvrFs8KKiS9WVuPEVqfvH9E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8463690a-498e-4c27-4992-08dbbe596f59 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:25:53.9222 (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: 65ibpgQguuky5aSHo6R1MwJaeNQF75wHk0ofHuRPCRDPwdGswi2/5TQfvKUvlR6nI9swrpbWle5yBJazuCOxfJIqDzkvXIEC8a0U+8IbGmwKIBpvqZNvYoWARFe6yW+N X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: JNMVE3VULKO24CIRHQBXMHJ4AQX32IGV X-Message-ID-Hash: JNMVE3VULKO24CIRHQBXMHJ4AQX32IGV X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c index 8544d65bc2cf..811081d9a05c 100644 --- a/sound/soc/sof/mediatek/mt8186/mt8186.c +++ b/sound/soc/sof/mediatek/mt8186/mt8186.c @@ -457,7 +457,7 @@ static snd_pcm_uframes_t mt8186_pcm_pointer(struct snd_sof_dev *sdev, struct sof_ipc_stream_posn posn; struct snd_sof_pcm_stream *stream; struct snd_soc_component *scomp = sdev->component; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); spcm = snd_sof_find_spcm_dai(scomp, rtd); if (!spcm) { diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c index fab2d5af8610..21d4434dd729 100644 --- a/sound/soc/sof/mediatek/mt8195/mt8195.c +++ b/sound/soc/sof/mediatek/mt8195/mt8195.c @@ -476,7 +476,7 @@ static snd_pcm_uframes_t mt8195_pcm_pointer(struct snd_sof_dev *sdev, struct sof_ipc_stream_posn posn; struct snd_sof_pcm_stream *stream; struct snd_soc_component *scomp = sdev->component; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); spcm = snd_sof_find_spcm_dai(scomp, rtd); if (!spcm) { From patchwork Tue Sep 26 06:26:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726431 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 71055E8181F for ; Tue, 26 Sep 2023 06:33:46 +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 9E5261523; Tue, 26 Sep 2023 08:32:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9E5261523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710024; bh=wtqBgU+vCy3vMo7ukXmgpEzDRgpNBhMgUpUUvDhlSek=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=CsEHs11M6xcGL6mYqNR+vH+Z/KMqel1GyI9lHc3Epc9WGQf/mTsypPXzyMSMR0PxQ dVfUSQDy2RbYFnKOAYIuf+TVNd+g0x/Qc/ir2OcRJMyujX75e8xlzjY7NOBaUTJYXz 7JqHjIE5hk/KUugpuy4bkCQ4gHruek/2aZuX9wu0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BC1B1F805FB; Tue, 26 Sep 2023 08:26:11 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 94EFEF806F8; Tue, 26 Sep 2023 08:26:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 49952F805A0; Tue, 26 Sep 2023 08:26:08 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::71e]) (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 95E6DF805A0 for ; Tue, 26 Sep 2023 08:26:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 95E6DF805A0 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=KP3YakCt ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ENZ2NuXHflzQ+D3+kbQAEQDFQpVqDaL1NXcVDDRGe6IE33CCmQjRG9gXk/fcZdHFT3goOKilmF/wbMjQ9GM46JNA89ExRMcnzTxF7kddujj7oYU0EyonJ4ufIh9VcnJlpjrJPUB4R2WRVgNk162vlUjmPz6fWk4CF9o83bPYhfwumXnk091JP2P1AmoV5nFOO1R7sHQm3I3zICk3I+dZv7dB1Uhz3quz2gQ95NLLGgd23CAhyKPZP9tx3jZBOD2wWKpQ9DiefNVr7XvnwxSKviG/xXZtnIBSMFWvZ/JfKM7zOUEYbrcqRARGC5pnKR9jMzir/uFwYqxldgBHEsGwhQ== 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=+QBEz8mMZ/MRU+gwK2VekSWETETvgFmQLJhFR1GRbUs=; b=Bg2t/3xUh2/XZioKm/YWKJgYNc6W6y64bqV7prYHzQq5PnvFy06Tiwvgu1to68HRvrhHhjKK3eXM+SusLXREaEMHs5DwovQP70mV80zjD4W0sQ+m7rW/b/H1zK8ooPeCqQzuZg7CHCp+wdKRwHXMOvSQ9BBo70xQSnZVzcTUdHXIkR8dBSlFG6tVCp3IR9L7ianU4u0C/rW6ECeV6TlV2WobcNziN2PuxP58gGMTdBiXkbCHigUdfOSGQREMNEMldZorJ9UbaAAHrJIRVJvXFCfsDEs3GioB6QL3Vmm7GbpuI4pMupmFDYbxp9eWL4bS6G8ZuOHQg0GSC/42cPmrzg== 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=+QBEz8mMZ/MRU+gwK2VekSWETETvgFmQLJhFR1GRbUs=; b=KP3YakCteBWENaxrcK/0rdvUp5AJDjjsbdbhPM/obXKwOd8JDMggpGwWACRC7CrIkLqHyBGyIEwLmfn4F+acOkq2acNAcIOd1aAIZ/q9oxXP43LhhJ0OLb3sW25BQFH9fwLQSdikKhLUAHyVY/YUC1tyVjwW1FwOFpB+gfGpxFc= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:01 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:01 +0000 Message-ID: <87msx9fo20.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 44/54] ASoC: soc-dai: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:00 +0000 X-ClientProxiedBy: TYAPR01CA0013.jpnprd01.prod.outlook.com (2603:1096:404::25) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: 7feb8719-d1a7-4ed6-7b29-08dbbe5973f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ULfrvBOAPWG24kFhWLmkopD+ofSOgSnTqYwC/vC+tb9vvrlOSuTxAm+GIByu3bK/ryV/1Csi5OA4IQQq88dHfEa1Au9+6YUGeLlRE1FonvTtqZnrcPr6ofsE40zw9FyFShUeVDxdyqxBjIt1Tb+SdlIY2PjR2PmcSy1IG3khHp4vy9cQysgzr9jGHDDZIsvWSmN8yXwTFTPReruDKyaLqRS+/QcqFvTCEWumZJD9HJYeZI3b/H/PRjuDvcjGZ6ZT2jzKXiu1CrdRuKvwlEuZWDyfprJgxRdy1ffolz+LS7o3zlnrUsMIWzMscK+R6hRKhfBkI4EabFwCpxuIpknNemnrlg57T+HWfwgvEJiIvmdAp2xQq0+Hf5TxlbUoC84f5aYNMdm59mrtQVXshzafqYwiUsMnxqIrBC7+jo8mTrN+WB0ag9wFTfhTREVBZ2UbA/u4BfReZCsGKqfny/G4FRpMwTAicem+G2ylx8BH22rCQgYAYcMy6sb5mTRlxAZ6KafVCJqV8QuHGzf+47sHBJeKMNCCo/7GtHbuFPG64W+lngPN+wxhOT8gBnExR5F8qjQOpBTqRSDmPQ141xAXrRm51rbOvH0cy7+3OXl3vOPJWxOpp1k85Uy8djyTQXUsMQxfE5L3hc5exv24vUe2qQ== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3sHcPfTiNjt/Zj36m/5eaL95QnV8JpG4mnhViW4hZ46vD2+orvLC9myYsm4ccjyCeO5mIiMJi8/oOISLQ8e2zS75XiW3rXle3VDcGT1bk/vkceyOrhvtdlM7+OzzV33i8QzDWSwmQ4VNm+EgWNQoxdgdpjj6O8TVnLKF/kqtynq6fRA+xx1gxdLuAxL/wAOh8y8G2wisZYre2lluZ5uckdCCjo/2fEyKA0abSTZRpaUzodKzEZFUBmdFzrdRdfGJ+XCUoXi2AdAx+m4tw4NIZOZK6XpzrdFX4LOmeIbBM9aq7idoRIUf6+W+lzP8BEo1mA7lM1Xv4JUzySoFXe/VJPVoosXksFhFYVevuKi7zEE3dv1Y02jwJ4ML7/Z6+TKoqPhsJIw57cub3mSvwHfWii1wM3k4UgG2NPS8M93hj4KctOSjqmkcvGx1cSIxuSHq9HF0qN8bT3C4aXQEFL+SE6n0slOKZg9eUI9Ts7IlD93T92S0SzMf7ND5sK9EoPjUY18q8xpNBwGGOX50jN7eDow868tkux3uAfJ4eeiU0rkh2tDvDnBVLIvSvYmI8zVXPpsb4JBPjOLKuZLEMmnS4HxlX7+db3Wr8rdqjBQUNnJU365MHjCGdfDnJm7ULh40kbn0VXJuT/fDxmstb7YApPdKtWsb6XoSIRbdpQ0uypKIVrNer/GEUuoIANADMRftVcubUj/cv+PYHjAQf7/KIDr1UTq/2oIX7qg9yMCVFCyhpbNWyFayP47zm9hER+VeYqNeIEzJi2USnr9mF+3n/Ub0iVjwFMx8V850Uk+PmWVQ8kSlrphfmBi6qFnZxLMLW8GHt9oTSA0G1MOY/14tGlJVXKtrMuFwKcmbCocoNP05ivDMXTNwbuiiX0AigWXTuMqweTgy3fWP/u5LwzOMMlZK0bA3IiEH5HcL/g6g9FIludnPkFfPaP5Zv7JzeQr8e1DKGtPv/9/gzcQ4aP+Im6+4Pu14Fu00yIPtGHEg922wDHyGvAuDQV2W45T1XAG+X0Zp6d4h6XZQ0AvjzG5JtCg6O/Mr5f8HY/h2WjUUX/T6woEpYe9jR8yxJFHLoj4MerNxvg54v+we3sUBeeuNiU9ZKMCAvXJGhRLoyTxOMDm4SnbA8DkTrh5YPnlSSwZItjC+Sqc2QZ6WHjRGR/Gsfigz08NIyYKre221uvMS3E2Bw9Y00Zi+WwLwuNy8mHe9db+ol5DdY3deOK/kJtfrGq7GmXqr7NlKunB9VFXkAXSNWwQYAyo6J2fXv8f6UAXUexlvMZGQsOcRqwUj3LnC6aXNIh8TmTFadvnzn3Yk9kdSmQNdG33AVE686tS5p/mGg7+qlezFxRHYTTWOwS/VrpmiC6uDI6Y4UCiTw/7dMHlLTU+MCpxLsQHTi2/CSc927vLzbSk+maH/5UHn5cL6Jm4yq+sdZIoMYQ0QTUHO5iYKUbKxXzb7kxmWY0W150yEy1cQ/rt3NhPfyZBfk5zOTmBQ66hwTH6AsMPYqRugmQlkibAcjb+aURs1+qQmpuDWP2BNoKL83R/tADaHazYpq23NmKB218UaGr33YxpNlPLgXb/zj6FeevTdhvDAw5E59TeGV9S0FHfEeeRMIsQFK/kebK+0hihgiUSU2Kh9Mcs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7feb8719-d1a7-4ed6-7b29-08dbbe5973f0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:01.0562 (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: MwLjycVIN7GbbPIWSGmyaWFVtVQW5llM+2OMMN8xovmySSdKj6zpC3yL2aKwuF7aqAg8xBnTsRDD0YgpyOqLDeDo1JpVLaN8WbWVte534IkVTEJLya12Pr3+pbxsMLUw X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: DQVKJAQPSR2PL5KAI4PA2SHDPKTX6IPS X-Message-ID-Hash: DQVKJAQPSR2PL5KAI4PA2SHDPKTX6IPS X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dai.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 3f33f0630ad8..3fe1271204fc 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -610,7 +610,7 @@ int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd) int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *dai; int i, ret; @@ -646,7 +646,7 @@ static int soc_dai_trigger(struct snd_soc_dai *dai, int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *dai; int i, r, ret = 0; @@ -681,7 +681,7 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *dai; int i, ret; @@ -702,7 +702,7 @@ void snd_soc_pcm_dai_delay(struct snd_pcm_substream *substream, snd_pcm_sframes_t *cpu_delay, snd_pcm_sframes_t *codec_delay) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *dai; int i; From patchwork Tue Sep 26 06:26: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: 728176 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 D1EF6EE020C for ; Tue, 26 Sep 2023 06:34:05 +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 97646131A; Tue, 26 Sep 2023 08:33:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 97646131A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710043; bh=UmL0d15pmKbeIEY0h7HB9FrbhgKuBH98lI8+c5/E5p0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Ll96JKMKysGa3kWHdnyagUWdWKnWyGAQZPgWBaelru0Z1NsOGTf72xdbjlAGltHfY zxccDCWmJLhPNofnfSbuJbU26gg3ZdLIO/qvTzOHC6x932nf3UZLxrVDps1NECXtDz hq+bJlDcEg6UjD+C94LIv8wqFq7ZSviWQmcIHwVg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3F50AF8070E; Tue, 26 Sep 2023 08:26:18 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id E2B99F8060A; Tue, 26 Sep 2023 08:26:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 83229F805C1; Tue, 26 Sep 2023 08:26:15 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 46377F805C1 for ; Tue, 26 Sep 2023 08:26:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 46377F805C1 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=oAoCaI+u ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=USyP6UIf6XJ7UNu1KsWBhnY2opWqoE8mwYeGIVN77B+k5IP14u959SKQGvxlgCAyVzImR8a9/Jl0qmERvJXhKaXg+vM/LQh1YSURUGsZEQPsPZm7AF4KYrG63mR0cAONBiVCa6/IJDPqwh/D63X/Qd194H7J3c3EB6B/bbMQb6IZBUJlcOBF1SIQOKTZw/Rdyb3Fe3LNw7CbpQAQKtO5NwS7aPh2Vc4ndBYV3iGrDfxRk7ZP56ZvEZ09erUKeKSkF3CUSLw4AKZuovURjmRNlQWPTFYkkJ7aqIXAU8jKGRNyP3IYvOsn5NNn6Nd0bXPlQZTjM9LTKTOXsy6Hl4bh+A== 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=JibD+hsLPTTmAcd22km7l1WZZtu39vsdXurD+thjpAM=; b=iKOk9o4PxWrzq9Uv6D0efXsDpAV464CYF4A/wkJHHNtXB55PrSRRqmkZq9N6ZjPMNJb97668X8+brwnuhVacqzAXFKp6cAywV3BnRExOPXJ1yjGr1ixLX/nj1HWkwc7qhr1aDZWsBNNDPfDLOUJbk2dZzdZHTtNL+pvwIhBSeWA1cUu4c+HJkyuvf/lmBDdxrs0OuhqNEef2E1sUtJou9XndZUY3SK7V5ghpPnnQTcEQ1mcxMKH7rqCVT0p8Q/SCk4A62MsnJ3OLTM398EVVbg8ilGIDGCkPvUA/xYyWermLRWuiS4BLA8+cHwdvOZJ/kfY6Nd29hWTRMkiZgZ7X6Q== 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=JibD+hsLPTTmAcd22km7l1WZZtu39vsdXurD+thjpAM=; b=oAoCaI+uNOSV4D4uinYc1BxmS5SPUe71gjqlbCIvVkrsDVUsrzYuq1RwPowBMghgada9lQu/vEZUarsZwZB9dF/fuwTKt7xq/BnL7slZGAbZyg2vD/GZqpDqOphLHH+B33ujdpvL9HgnXj9h/pd4mtRXVyXcnf+xpH6l3MGnl+M= 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 TYYPR01MB8000.jpnprd01.prod.outlook.com (2603:1096:400:f9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:08 +0000 Message-ID: <87lectfo1s.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 45/54] ASoC: soc-pcm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:07 +0000 X-ClientProxiedBy: TYCP286CA0108.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::14) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB8000:EE_ X-MS-Office365-Filtering-Correlation-Id: 37db167d-c4c3-41cb-4134-08dbbe597815 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vk3EqTqoxedWxJnCE9mv7SOoGNNPCxLNt/MAMkPlVVtg8obex5sTaWoTk4UEo6zFTTGx6BCXVvJQZ3GHj4yNU79Y4FEKekThKFDepFjeN7BDJgDchF8QX/vL1BCE891Coh7cXOrPqE41Ii9/jmqF+/bIh/Qer0j5gZRZp0bfrRrCXYw0n99sxGIMW4pB1nyOkn+meaJqt+nxTA8LRYFyGE4tqDZ5IdmK0CAxhaSlMlJYMXjCSsgHeJQxEe888/V1fpTjc9lSRMtJH2QyV3BTKPhcusxX3m2no/Ymh3+OBaR5ucT4tKf73mj5dA41OBIr6vNrn8uvidsNzDLHbOJWkmTJvanQbp/ER0XMSGWmmVgSbyLy9NWyfnUWa3uFX/RQHoJg6xvNt9NHeK37brzkGTsSMgangpK4QOvOko1tzoqEy+/Ktk7e9p1Hlm9WKdr0kA5Kg4eoSZiDeWSQ/QuakiVfAya55i0C/4j9qOhxlDvN9ia/PePcAK/NwNwhB/1AfVNlcJBg0ln/VP8Sbrva+ceA2s454MSqsdRsdth5HaH+ClYppdW/KwU66BLf1hsVwxqsve+LNYoqn/OVe6xIH3hiLGjPWf00VK5j1lFvOxsN6AD78c32A265nINkahWuXRXZ3gndrKb4S+onUKJ01w== 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:(13230031)(136003)(396003)(376002)(39860400002)(346002)(366004)(230922051799003)(451199024)(1800799009)(186009)(5660300002)(83380400001)(2906002)(316002)(41300700001)(30864003)(8936002)(8676002)(36756003)(4326008)(2616005)(66476007)(66556008)(66946007)(6486002)(110136005)(52116002)(6512007)(6506007)(86362001)(26005)(38100700002)(38350700002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qjv4wDG3j/FxvYRlsyIrgXVdoa14MhDtbk7LQsrIjDlkHH297AbcCn9r/i+LQePdq74J5c+mJ5x/NhslewAhd7fTTsFbncIaow/mcBuGSi4qgkiKjAqyIGEEuUxslmDriN4piW7vsmK07NM9qgfue0KiwnARo2lTYtwNxAhcZgRVpwgn1U4XFRj0eRD4+7Vqr4Bd+pUPQikEX+yaycyClHWhtHcxYJGwCvLab+yTs/TQNLK7xrfPWtYOsmpWKh47Q12XHF4Oo+G0wBPlC9SPUikSqvsTw3alzu+R7BLyFea1BnYaqwdikHX5cvs1ELlVSFyr1/me47ACaGJbPHhYmUKINRKRWZpb4vWgj0wxsR9cer8nSLiTl5AnOPGMjwiAzd/dcbSM4YSTG0CgsvtMJ9PxiuK1JKMuUyKgz4kHTF9q05HOBa5MYFMHMVxLGugAFjlxiMmce/pCwXD4aSeGCz21Vgg8ugGgthsDTV63g71/j9iMsG0FazA29fwJgRMmULGQCbMh0NYY3CxDtNPadWBv6horWO3KLASByz/xEiRHl9pf7WQvct7EthBQOvT0LVRlWCsxskKaPp1c/PwIkge6yUTbzHCUbWewo0uTpeFHS7IPtnoRe3/yDGta5Mct47/pCRU6WUGvNT0E7E62Hf2lEXBpTbcbwiekOzJYqGJdwpL/I9x/T6FdZ5GLSvQUw2gGbXaFi1MUrcUF8hJN99rre3rorSGeA+YUWkAFy7efZXJmlgfAMPIlTCDcD3/1MS1irg7EgjKJuKj6H8VKzzbvI0/HpY3aBKLVJ9uuw5d4EIT1Y+1s9EE26/cyYsUORIPbvpiuIHM5iKOyMVcMORnjWt5CR7YE7Zt2pL+Vqh8Xpf159e5fUhg9mBbMWBvHM0IIx8y3U8hIhP2qalJnlMwk/YuTcX3r11rV7GOPNLY5ATdJd/DGKO8gV1jC6JUtXK5176LOSnTWfE/nFX7UXh6mAPxpZi21Cw7ZZjWbhOZ0whdq4M5a/HCA1Y1Db86HugBXPv7H0BepjW3vVibs8w9hkQpYrIMTP6LYDJth9GJ/yQZ16IlZSFMI7CQlTnR3CT/kWBCEuGN95TWCIaHitmIbTjY6kfOu5VMwRLHUNF5MS2ke8kMoL9k9hGaoV1XhGgaDaF9gjSfaaiSdLDGLu0ffl+aBvjDPhMBIUkOWfpGsiep/1pKmnYtSJFYjc7wt1fG05jg1VABoTPA7vzz8gbodZUnTSWGiB748EvV7S5PPjftO22q8BrMFPNmBq5LEqXsALvwcOsQNiGDQBEewl1xnMqO3ffw5ykwmTTTaF3UqVd01sjjUTQ48m+L0LJhqTBvWr7ygMMuudO3T0TfVi+8yZ9Hhuetlps2dZOgfL29vjiy70erPxLJ4cIZGkfv6rQbgen9Y9HQc0emLfcVRGSiTnbFiNutIuzNa5Tu7se08QnGQz2kIUAhx433d54hWBqvZ39p02ovyUf801mHEkP/WgCE4GERoTr2QCI1MNWNBZUPGiExqnaa/lR4udwMYqU76UbRh5U4rXWYmlA1Q7LkjMniWNxfCjWk5vh550BfEQd1eLtFMb33Dsu0JB4GDfOak3Hs/K/dtGoHxWJA9pB4vd7ujDbK65suaNYRkAls= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37db167d-c4c3-41cb-4134-08dbbe597815 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:08.0274 (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: 2K/6oLeipeSwPK7ysWjV2FvI3NTXn+m4+N8KAJVH7vza4ktgDYXO/hnvuWxERC4OMdr2DmdvVNbbSR5uuNr28NdYWwVzr2J7kdkR1fuSLe190KGeS4WDL8eMxS5ekJzz X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB8000 Message-ID-Hash: PBTBSBNG6KH6TPVLKMIPVVXANV3OXP2A X-Message-ID-Hash: PBTBSBNG6KH6TPVLKMIPVVXANV3OXP2A X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 90 ++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 54704250c0a2..b63019c66224 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -71,11 +71,11 @@ static inline void snd_soc_dpcm_stream_unlock_irq(struct snd_soc_pcm_runtime *rt static inline const char *soc_cpu_dai_name(struct snd_soc_pcm_runtime *rtd) { - return (rtd)->dai_link->num_cpus == 1 ? asoc_rtd_to_cpu(rtd, 0)->name : "multicpu"; + return (rtd)->dai_link->num_cpus == 1 ? snd_soc_rtd_to_cpu(rtd, 0)->name : "multicpu"; } static inline const char *soc_codec_dai_name(struct snd_soc_pcm_runtime *rtd) { - return (rtd)->dai_link->num_codecs == 1 ? asoc_rtd_to_codec(rtd, 0)->name : "multicodec"; + return (rtd)->dai_link->num_codecs == 1 ? snd_soc_rtd_to_codec(rtd, 0)->name : "multicodec"; } #ifdef CONFIG_DEBUG_FS @@ -184,7 +184,7 @@ static ssize_t dpcm_state_read_file(struct file *file, char __user *user_buf, snd_soc_dpcm_mutex_lock(fe); for_each_pcm_streams(stream) - if (snd_soc_dai_stream_valid(asoc_rtd_to_cpu(fe, 0), stream)) + if (snd_soc_dai_stream_valid(snd_soc_rtd_to_cpu(fe, 0), stream)) offset += dpcm_show_state(fe, stream, buf + offset, out_count - offset); @@ -386,7 +386,7 @@ static void soc_pcm_set_dai_params(struct snd_soc_dai *dai, static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream, struct snd_soc_dai *soc_dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; if (!snd_soc_dai_active(soc_dai)) @@ -419,7 +419,7 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream, static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai d; struct snd_soc_dai *dai; struct snd_soc_dai *cpu_dai; @@ -452,7 +452,7 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, static void soc_pcm_update_symmetry(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *link = rtd->dai_link; struct snd_soc_dai *dai; unsigned int symmetry, i; @@ -473,7 +473,7 @@ static void soc_pcm_update_symmetry(struct snd_pcm_substream *substream) static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; if (!bits) @@ -487,7 +487,7 @@ static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits) static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai; struct snd_soc_dai *codec_dai; int stream = substream->stream; @@ -636,7 +636,7 @@ EXPORT_SYMBOL_GPL(snd_soc_runtime_calc_hw); static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) { struct snd_pcm_hardware *hw = &substream->runtime->hw; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); u64 formats = hw->formats; /* @@ -652,7 +652,7 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) static int soc_pcm_components_open(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, ret = 0; @@ -672,7 +672,7 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream) static int soc_pcm_components_close(struct snd_pcm_substream *substream, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, ret = 0; @@ -738,7 +738,7 @@ static int __soc_pcm_close(struct snd_soc_pcm_runtime *rtd, /* PCM close ops for non-DPCM streams */ static int soc_pcm_close(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); snd_soc_dpcm_mutex_lock(rtd); __soc_pcm_close(rtd, substream); @@ -748,7 +748,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) static int soc_hw_sanity_check(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_hardware *hw = &substream->runtime->hw; const char *name_cpu = soc_cpu_dai_name(rtd); const char *name_codec = soc_codec_dai_name(rtd); @@ -854,7 +854,7 @@ static int __soc_pcm_open(struct snd_soc_pcm_runtime *rtd, /* PCM open ops for non-DPCM streams */ static int soc_pcm_open(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; snd_soc_dpcm_mutex_lock(rtd); @@ -908,7 +908,7 @@ static int __soc_pcm_prepare(struct snd_soc_pcm_runtime *rtd, /* PCM prepare ops for non-DPCM streams */ static int soc_pcm_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; snd_soc_dpcm_mutex_lock(rtd); @@ -965,7 +965,7 @@ static int __soc_pcm_hw_free(struct snd_soc_pcm_runtime *rtd, /* hw_free PCM ops for non-DPCM streams */ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; snd_soc_dpcm_mutex_lock(rtd); @@ -1085,7 +1085,7 @@ static int __soc_pcm_hw_params(struct snd_soc_pcm_runtime *rtd, static int soc_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; snd_soc_dpcm_mutex_lock(rtd); @@ -1110,7 +1110,7 @@ static int (* const trigger[][TRIGGER_MAX])(struct snd_pcm_substream *substream, static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int ret = 0, r = 0, i; int rollback = 0; @@ -1397,7 +1397,7 @@ EXPORT_SYMBOL_GPL(dpcm_end_walk_at_be); int dpcm_path_get(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dapm_widget_list **list) { - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); int paths; if (fe->dai_link->num_cpus > 1) { @@ -1670,7 +1670,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) static void dpcm_runtime_setup_fe(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_hardware *hw = &runtime->hw; struct snd_soc_dai *dai; @@ -1704,7 +1704,7 @@ static void dpcm_runtime_setup_fe(struct snd_pcm_substream *substream) static void dpcm_runtime_setup_be_format(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_hardware *hw = &runtime->hw; struct snd_soc_dpcm *dpcm; @@ -1741,7 +1741,7 @@ static void dpcm_runtime_setup_be_format(struct snd_pcm_substream *substream) static void dpcm_runtime_setup_be_chan(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_hardware *hw = &runtime->hw; struct snd_soc_dpcm *dpcm; @@ -1780,7 +1780,7 @@ static void dpcm_runtime_setup_be_chan(struct snd_pcm_substream *substream) */ if (be->dai_link->num_codecs == 1) { struct snd_soc_pcm_stream *codec_stream = snd_soc_dai_get_pcm_stream( - asoc_rtd_to_codec(be, 0), stream); + snd_soc_rtd_to_codec(be, 0), stream); soc_pcm_hw_update_chan(hw, codec_stream); } @@ -1789,7 +1789,7 @@ static void dpcm_runtime_setup_be_chan(struct snd_pcm_substream *substream) static void dpcm_runtime_setup_be_rate(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_hardware *hw = &runtime->hw; struct snd_soc_dpcm *dpcm; @@ -1828,7 +1828,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, int stream) { struct snd_soc_dpcm *dpcm; - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(fe_substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(fe_substream); struct snd_soc_dai *fe_cpu_dai; int err = 0; int i; @@ -1855,7 +1855,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, if (!be_substream) continue; - rtd = asoc_substream_to_rtd(be_substream); + rtd = snd_soc_substream_to_rtd(be_substream); if (rtd->dai_link->be_hw_params_fixup) continue; @@ -1874,7 +1874,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(fe_substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(fe_substream); int stream = fe_substream->stream, ret = 0; dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE); @@ -1911,7 +1911,7 @@ static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream) static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int stream = substream->stream; snd_soc_dpcm_mutex_assert_held(fe); @@ -1977,7 +1977,7 @@ void dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream) static int dpcm_fe_dai_hw_free(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int stream = substream->stream; snd_soc_dpcm_mutex_lock(fe); @@ -2080,7 +2080,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) static int dpcm_fe_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int ret, stream = substream->stream; snd_soc_dpcm_mutex_lock(fe); @@ -2283,7 +2283,7 @@ EXPORT_SYMBOL_GPL(dpcm_be_dai_trigger); static int dpcm_dai_trigger_fe_be(struct snd_pcm_substream *substream, int cmd, bool fe_first) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int ret; /* call trigger on the frontend before the backend. */ @@ -2314,7 +2314,7 @@ static int dpcm_dai_trigger_fe_be(struct snd_pcm_substream *substream, static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int stream = substream->stream; int ret = 0; enum snd_soc_dpcm_trigger trigger = fe->dai_link->trigger[stream]; @@ -2401,7 +2401,7 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) static int dpcm_fe_dai_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int stream = substream->stream; /* if FE's runtime_update is already set, we're in race; @@ -2455,7 +2455,7 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream) static int dpcm_fe_dai_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int stream = substream->stream, ret = 0; snd_soc_dpcm_mutex_lock(fe); @@ -2632,7 +2632,7 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new) } /* only check active links */ - if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0))) + if (!snd_soc_dai_active(snd_soc_rtd_to_cpu(fe, 0))) return 0; /* DAPM sync will call this to update DSP paths */ @@ -2642,13 +2642,13 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new) for_each_pcm_streams(stream) { /* skip if FE doesn't have playback/capture capability */ - if (!snd_soc_dai_stream_valid(asoc_rtd_to_cpu(fe, 0), stream) || - !snd_soc_dai_stream_valid(asoc_rtd_to_codec(fe, 0), stream)) + if (!snd_soc_dai_stream_valid(snd_soc_rtd_to_cpu(fe, 0), stream) || + !snd_soc_dai_stream_valid(snd_soc_rtd_to_codec(fe, 0), stream)) continue; /* skip if FE isn't currently playing/capturing */ - if (!snd_soc_dai_stream_active(asoc_rtd_to_cpu(fe, 0), stream) || - !snd_soc_dai_stream_active(asoc_rtd_to_codec(fe, 0), stream)) + if (!snd_soc_dai_stream_active(snd_soc_rtd_to_cpu(fe, 0), stream) || + !snd_soc_dai_stream_active(snd_soc_rtd_to_codec(fe, 0), stream)) continue; paths = dpcm_path_get(fe, stream, &list); @@ -2706,7 +2706,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dpcm_runtime_update); static void dpcm_fe_dai_cleanup(struct snd_pcm_substream *fe_substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(fe_substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(fe_substream); struct snd_soc_dpcm *dpcm; int stream = fe_substream->stream; @@ -2721,7 +2721,7 @@ static void dpcm_fe_dai_cleanup(struct snd_pcm_substream *fe_substream) static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(fe_substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(fe_substream); int ret; snd_soc_dpcm_mutex_lock(fe); @@ -2735,7 +2735,7 @@ static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream) static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) { - struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(fe_substream); + struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(fe_substream); struct snd_soc_dapm_widget_list *list; int ret; int stream = fe_substream->stream; @@ -2819,9 +2819,9 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, for_each_rtd_codec_dais(rtd, i, codec_dai) { if (dai_link->num_cpus == 1) { - cpu_dai = asoc_rtd_to_cpu(rtd, 0); + cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); } else if (dai_link->num_cpus == dai_link->num_codecs) { - cpu_dai = asoc_rtd_to_cpu(rtd, i); + cpu_dai = snd_soc_rtd_to_cpu(rtd, i); } else if (rtd->dai_link->num_codecs > rtd->dai_link->num_cpus) { int cpu_id; @@ -2832,7 +2832,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, } cpu_id = rtd->dai_link->codec_ch_maps[i].connected_cpu_id; - cpu_dai = asoc_rtd_to_cpu(rtd, cpu_id); + cpu_dai = snd_soc_rtd_to_cpu(rtd, cpu_id); } else { dev_err(rtd->card->dev, "%s codec number %d < cpu number %d is not supported\n", From patchwork Tue Sep 26 06:26: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: 726430 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 EB3F5E8181F for ; Tue, 26 Sep 2023 06:34:21 +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 3BE0ADEC; Tue, 26 Sep 2023 08:33:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3BE0ADEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710060; bh=tvQeaGu+5DFg33G+CzfWiw2mCu7A6p0DH9cgubL9sYw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=LsmaIzUjscwhX8t7TGiwtaVIzrpKjSshxd8mAns7+QdtwrL1/Jn4X7rISCZwRNnwN F3cJGZ2NJfcr4ZfrwVRQ5dHG2QtZeRCOEoAAFURon273v0aF1ZYxBGBf8WMYk/MzlD /8QGsdnG/YETkzhQgn0ufIUp6MlbaO4M7S+uqz28= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 17570F80615; Tue, 26 Sep 2023 08:26:29 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A488EF80716; Tue, 26 Sep 2023 08:26:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6F38CF80713; Tue, 26 Sep 2023 08:26:25 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20725.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::725]) (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 D28EFF80710 for ; Tue, 26 Sep 2023 08:26:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D28EFF80710 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=mqy1byud ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eif6kpp+pymxrt1JnQZnpJLp0IAyE7jhqeaTSGlWdqHDdrMzIYmPyz3sWscEUy1W7xI3nbxv9sleBsNr4DIHvJIDTa4b1fBvRoRae6T5D2mQLUSD9YnK0HVVrab2bNMW0g1Laxm4BQE28pFcAVO/uE+aXUsZpy8ghVXDDnyWaohr8x0b3oMWeGYTrBZtg0cIZekEKlruF9FevHv0hdxecGHfvU8ls18clGE1ES6fFx1kv7MrMrzzVMqpN8U1XPuz39l+OKC2zzuSNtBxRjCiJEjhgbpdhsAGxttjDyTmAkz+lNgG9DQIdyq4Zt9bSvawbfZcLaGONNy+/puCsXrZ6Q== 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=4dxNSjESGgbi05VT09QsthYYyJ7a2PHkAq586MfwhSA=; b=eaj6J/qKbrkVLZGiGGxfaWKyI/BHN3SAci3c4AsTG53Umqk1Wj8e/WXnle47zk8T5+4NLbUN69G5NTnLwHswCi6EE4n0etRnjs+NkSbUQjCKWt2gSd5nOVxf2BHk+zcZmHhGckwrWyiWJg+nT9Y9yqSzaF4755Wa+ic7M/4hhBzdQ8PMJFbKnNzbPr6DqPrpbiFTAbktvUdMMnRehJ/xebgvNiaQLDKisikir7gTGKab6RaBvOXqKtGuALudpzusHqyqsJCW/VtS+kygNyB+FjQU81f1kkRq7aOKDkKKnnar1mB+Gx7xm+dABPbv+AuuhnpSI4DjsNux+bUl0rV8fg== 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=4dxNSjESGgbi05VT09QsthYYyJ7a2PHkAq586MfwhSA=; b=mqy1byud43eJTPEqAD8GpgCdfO4ipYb1QQm8uvcmwWBegq3ovHMbV6buX5jBy5ivmxO2B3XIAN6BmN8p/HyZByqjuO/YumX0twnZ4sIEV/jrUHdgs4hV0hciduvHpwe6p8lQiT9lTV1a/BiPcgGUetxvKVeB/Y6o592QF9y5vmg= 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 TYYPR01MB8000.jpnprd01.prod.outlook.com (2603:1096:400:f9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:15 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:15 +0000 Message-ID: <87jzsdfo1l.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 46/54] ASoC: soc-core: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:15 +0000 X-ClientProxiedBy: TYCPR01CA0107.jpnprd01.prod.outlook.com (2603:1096:405:4::23) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB8000:EE_ X-MS-Office365-Filtering-Correlation-Id: 914198d0-24e7-49a9-9f2e-08dbbe597c75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y678YsMr1mDY8VGX+ZxNcceLCkAluMj2OC/ZR9Tl+psAdAzGOZ41TUAQdv2/Adk64Pg/U2UV8TBbsR9BVTJr1RsVeyv5C2P5Ys5VMKXgREjn6nBQeiOEcBqJmQn6Mq/thDs5Rh6vpWpdONC//e4fPBwgOAygfG+Qlyc4/da1ALy/kdlt0ZdZzEYkok4DEbJ1Q9Pb/vF1HReQvwv4AjqweLtcUrmKGhTUbFSnkmC6H1RSVosYJjztn3sBqPPlEdIC/Zn+LfkZckPTVK1bif2waoZ64sHS18i+Fih+DpDlC0u4Ck7EIo2hvQPMU1gcpNI6jEmxelHtBLWhABD7RhGGALE198n9qJKIpb3fJEp7rIYtQCJCkfpP3DyPbBx3qZpA29UE2LFKE9jShj9Gqf6G6nCK2M0IOlU35eK+ZKbVNY6wxqiFmSHWTw1TjL6wvdc4elulVnogQyiUm14FvrziZHF/OdphKdlmG0iEV0E7uowOLRM2Qyy783S8NIS9jdTJP7+QND4+49+6FjfFSCWGEUBlIhkjxdCWiZyfWH4BSYw0KRr+liEkQ1qx0MPEaKnrQk48v9ksVjUPr/C7DIHrOfuUkJL0l7GiSjkRSqFdlUY2KZjbKMHUOxyWgua7xwxw0hQiEtar9osHpOJPcCktRA== 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:(13230031)(136003)(396003)(376002)(39860400002)(346002)(366004)(230922051799003)(451199024)(1800799009)(186009)(5660300002)(83380400001)(2906002)(316002)(41300700001)(8936002)(8676002)(36756003)(4326008)(2616005)(66476007)(66556008)(66946007)(6486002)(110136005)(52116002)(6512007)(6506007)(86362001)(26005)(38100700002)(38350700002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6ZX/cFcGeyRm9DHR/r78SQaQegacm6rzDsyTDj72e/qAO3cUH2PtP64owDkuj0ISdttmury1FMzii0VsA0BPDx08Tt2v0UGI/YdQw0Gcx5OPUijeKl3CNaqlQPezc4CtTgNTcF1DArsM0W4MIqvyr4XoiD2q1kml72GVql59oEG0OvMcDsIHtEPny0xXumTmgzkXXezRktmEWV6yPvqLXyb4l09FQTjKjAKpKOITiari5jnZig2TKIWGyOMymoWrlBgTCTal91USz5H0dsRPtg/rPVlBrPiVJnyQsow7DswZ1FTh8NQjhd1HzH4/+UdNMAzsU9YzLow5wFy3WeIBZK4icAE2+APrIye5Wqk+ebocXokA7jf9fOJKAcOWX2qvgpZQz8QH+7tS9E8CfCrfuXRFj3odoVxnCwzrGREeGjnL8L+6Zpd9stzIWPaJnNiBdD2TcvT+oke7LerRgCe/rOo2z6BLEXpGWdkWdA230WvnC3qCKMrIVaAb/Onl+o3xg20oFTlBrfgED22sy1pb5pm+LmzdMuoonY9z9HnQB5uyJdosLRhbYUhNDk5IragivmAvRD5jLvHascf8V/evlL+mlgayE+hfPE0+Hk+E+20q0RZ+0TbEEzcp1bQk+i/qBgogLwpkJ/uBj0X3VfIVBM1tV6P3vZkZM9N/sS6WKRGGi5snmbHb9KJpoFxDdVT2DnSzPDE9BBXjbbNf6p2FO3f70wdZ0nsp7fjfa3jpVdMsdNr2PScVWkLtnxf9CmTP3SKSRY8Xt0iB0ExA4Eku0A598Yxu8Ro1hR31yn3hrN0VQZhrwZ7D/uIry9ahtD+KAxK5tf3hL7CBqBSMB+MP+cQj8IvP+0IAWU9IuLAGunjo4tSyPQhjHkkK0vaXgU0yWT9CYzuheOCjQSdXAwxpTLxd4FQs6yd1ptFqAheJEPHnfmInzYgFz9D5z9ptZMwU+x1Bu/wbkgWiusOROAG4BpjawUeybtdzCXL45WhdQ7/3NG+YeIk+FHsKxkCCOGjAmur4MHkn0rOYoR+W/iUux7jkinsZKcWjbkonu5kBozxI6tGZ2H23InTsH9szoJdyHGBALfTQXin5eQwrOKQNqzsiclZgpP1K3AOMT1CjwOdnYbP+OmISPm4BOQHBmpuxIlCafpNxDlLpZpNHa0DHZGNLd3hfA363so6jon9RnJBFeKlqKx+0OZrDzGaMgBV00QMIe7H2KIGoN2VamRy4uZIqTPe575KPWTuqYv2LihGFtuFxolXm18O9e35HORjzjNiifba5kg5xg60s1fwPlXq4XMjHrZKafjCMFY+rz1ZNS6fAxfNKDTTGNDgYLuthjptvdjYYUBmBWZ8qmB7oROxwIowZiwVaV3xhHvvzuIRKZ2vjs3asIyWv/xykaPrL0TeCvNYX6+uzzl2ARdLPpkOnlTMV+6PjR5ITkCVQXn1BGDcH4uOi6kngjE1qv+4DcCMC9glCWimybcM67xhiewQnrrOTXu5va/CXmvbAHAzzROfnro8POWtolhE27c2+a5/7edl5YdxyH5fALzbCNM8ijBvDEwTpA8qNUB8Lq/0P9p1qqrE6h2higpmrsYvoeRo7H7c62KN6hp2J+E36MeahFD61TDD4jyQVKKI+eDk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 914198d0-24e7-49a9-9f2e-08dbbe597c75 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:15.3443 (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: m3hNJ/b2x/LOWHc82gguT9XCZUgI8rrZgikq339a5g2czJ1UXrGIT0dSwIS8Qz+dfZqg5umhCG+6G1kwGRD1LzvBVau2J9nHklg47e1eTQrGKgpNdenFQAr1c462Ujwd X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB8000 Message-ID-Hash: 2IQNUC2QVDEDX5T5QM7KSKRZH4WLYDPE X-Message-ID-Hash: 2IQNUC2QVDEDX5T5QM7KSKRZH4WLYDPE X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cc442c52cdea..c305e94762c3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -420,7 +420,7 @@ EXPORT_SYMBOL_GPL(snd_soc_get_pcm_runtime); */ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int playback = SNDRV_PCM_STREAM_PLAYBACK; snd_soc_dpcm_mutex_lock(rtd); @@ -554,8 +554,8 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( * ^cpu_dais ^codec_dais * |--- num_cpus ---|--- num_codecs --| * see - * asoc_rtd_to_cpu() - * asoc_rtd_to_codec() + * snd_soc_rtd_to_cpu() + * snd_soc_rtd_to_codec() */ rtd->card = card; rtd->dai_link = dai_link; @@ -1078,25 +1078,25 @@ static int snd_soc_add_pcm_runtime(struct snd_soc_card *card, return -ENOMEM; for_each_link_cpus(dai_link, i, cpu) { - asoc_rtd_to_cpu(rtd, i) = snd_soc_find_dai(cpu); - if (!asoc_rtd_to_cpu(rtd, i)) { + snd_soc_rtd_to_cpu(rtd, i) = snd_soc_find_dai(cpu); + if (!snd_soc_rtd_to_cpu(rtd, i)) { dev_info(card->dev, "ASoC: CPU DAI %s not registered\n", cpu->dai_name); goto _err_defer; } - snd_soc_rtd_add_component(rtd, asoc_rtd_to_cpu(rtd, i)->component); + snd_soc_rtd_add_component(rtd, snd_soc_rtd_to_cpu(rtd, i)->component); } /* Find CODEC from registered CODECs */ for_each_link_codecs(dai_link, i, codec) { - asoc_rtd_to_codec(rtd, i) = snd_soc_find_dai(codec); - if (!asoc_rtd_to_codec(rtd, i)) { + snd_soc_rtd_to_codec(rtd, i) = snd_soc_find_dai(codec); + if (!snd_soc_rtd_to_codec(rtd, i)) { dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n", codec->dai_name); goto _err_defer; } - snd_soc_rtd_add_component(rtd, asoc_rtd_to_codec(rtd, i)->component); + snd_soc_rtd_add_component(rtd, snd_soc_rtd_to_codec(rtd, i)->component); } /* Find PLATFORM from registered PLATFORMs */ @@ -1335,7 +1335,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dai_link *dai_link = rtd->dai_link; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_component *component; int ret, num, i; From patchwork Tue Sep 26 06:26: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: 728175 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 4BE9BEE14D8 for ; Tue, 26 Sep 2023 06:34: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 73C88EAE; Tue, 26 Sep 2023 08:33:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 73C88EAE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710075; bh=kc90EtinS3ieS2Oqj2Ai/0sRpLTklBqkjY+Bp/ouyDw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dn7mnRw94qpvm/Sw5xYL3kga9kTW/QhSKMi3Ck5F+Jpv7APiDXQaTqjehh8bjvLsn W53eCi4+3BfyASXSZfnSXK9nX8Lwr57o0ndnCE7g/D7mmxoPv/+CF7ETrjuO/G4Knk h/CQcPJEXwp18v2HlGENvLOoMVs5tUtjbfX/d7l0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 585D5F8072C; Tue, 26 Sep 2023 08:26:32 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 18916F80724; Tue, 26 Sep 2023 08:26:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4A2F5F80713; Tue, 26 Sep 2023 08:26:27 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20707.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::707]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4C91EF806F0 for ; Tue, 26 Sep 2023 08:26:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4C91EF806F0 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=ig3b4aqn ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W9e+lmOcb7gLIe+6OqY8FvU8+dfqgAo7j8hxaHd9Tq9MDtUuZ0yaBYke5Q+1t7VEgM9nnjPesQvhPU7EAyIV1IdzfOJYxikyWXrhK3EZ0+7T1Y+qqko9tjbgxBgPUBVIE0VZLXKeLqLTHoGM3QuUi3RY93n7B7GfWA2MNLiVdmbG/vPbymlOV0tCF66WgSywWrni3YuvDw5dOuoxHaV+H9N9XN7kTJGVBFqiZx2MBybm9FXlLQxDwRF6DOQ/RYyXFKyjQ2k/REhlO1vzDsudoZPVP6oOBnLIOACvlwTeYmflPZb2sTXr1K6JvJLVZhEBUEGX1OiB0qMb/iNTHuGv4A== 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=PNuZJ+gKfybAwD0XDDa2SonYeXoFkMaiS0xGW5rys/I=; b=CNfwh3p6Z8Ao4EV2vcWXTTZWCaAsaz4O5ByFtgybtYRhzLiK4HIERaKUch4BP5jCO6SmM27Z8obbgQB23VpmNVuyIH21+GSmaktvWwflmrOW/pK7Gmg0otczZtBdyGDAQLtQMP8ByH7D10Haj+lB6oskIxoeHCk8osEYT4LZabKbpgwQEQNzAag1+IHAIbYU1tWx7F8ybbKKQ//R7vSscLbaMjuZICEYQHRKmfc9uAyHgOtoZXElDINFTJ4NQBxeHOoEZ0vfrq+S/3SAzxjyIPymUMWfm8PCYgw+X9WOCW4FRYt40CuiM1ncGOmnQuRAkJ4VrfJ7NcN10woEf6UIRw== 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=PNuZJ+gKfybAwD0XDDa2SonYeXoFkMaiS0xGW5rys/I=; b=ig3b4aqn9w7CE7r+jrYEK2wLP5bEPkXPaUSKFBcKRqeCr6IrJ370kXdb86rUDwerES0CDAf78lySDA7g4UXORGzp6PeqXWcZKkMtZUzYc/QCF/r8ERfVlJQSokZP+f7f1mtAmC4McpiVhZfwiPJ8WwJY/YludRAO7xS0BjI3+Y4= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:21 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:21 +0000 Message-ID: <87il7xfo1e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 47/54] ASoC: soc-dapm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:21 +0000 X-ClientProxiedBy: TYCP286CA0332.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38e::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: e56350ed-d691-43a0-4411-08dbbe598055 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zU1LqtdM0piaeIF83WNI64THY2GBpMzcflFoQ5NfghnzufvTeZVDcdWcWMxaRao2Rmv54yirRqNPEdBTsSfqtAHQrPeDrdyIw9rFJzXKsQ46m7JV6i9B7RYk/KU5T9Le50q1ooWf4GmsadFl89t39TJj1tGz6WhJILKR7+XIkRWDBsD9YDtuwBIyr8eED3yGNOv4u4+2MWyBMDlqWjWsbZ8GBe1f+YlmJyMPGwqYg8GNwJDmjWpeOdk880zF3W5z3srCL/zAh7Y1JW+RxnB09+Z4lZFk6IPy8eE/jExg8EwsBXhKbe458RvMHHsOgPGuEr4T0l8vaW0vYwDgU07e3zVqKtOU5kTod9167r1uOxCsNro5/ucgOIYCarnRbnNQ+ijbmvXK8u21gyJ3d1yiDUWnsY+olXtHByRbJxQJUxNBZbsjo6musN+cN7n8R+th6P7qGIpV9GtAM43YiWfQADOvqQ393m3m20gN1WjuY1f/xBBfiaWawUKgK4Ix7zsRvUP05KvkC+DH4NLJ/3VcpEYKI6zPm+Dj2pdzPYZoaN9xbdK8CAhQSnVlRBBIQz6DN2Lo9AYHs9WPTjMEAO3N9c9t6cj/7ZFEQkTigXh2was+2MCKH6QvwI8fkWGfEOpRaV88b9F9df8BldgnAyEq9A== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C8GYaHy6aH1Hvh/h7t+gscEFO7iX6VgH1qSBix55PejQIHhC1t/z1T0jsuD4mYuoY+wxgCB5XlPo895Yi9JANJ8H4To3rMLeaFltbqSKpdem+qv7RjwnIBUjXeAm7E2PG5vEkeYaVXqig2mOV9/yec3HpBhl3Oox7IqSWUtZre7CJCp6fmUO7TrRSJcptjBBpRArv6nWjFew1Z6KlPdscxAJD3D83Qj3iz989lpShdDZMZ3tHsOk6L9hHTHF3Fd5a7jcWMS/4LNb4czerz1ZxTAT4Z46g0e13ecC6F/gD2pZTEawmSdZGbmejeY7DggeecmPziV8ZjKWlAnt7tvFqpDgImoQVYGxWpn8obIol2rUtjbhP6WaV4+pBVtjeE24S/Gnqb6IaL6w54U6kvQHoCbyfcfms/fDLxnVOhlXSzeQYuYw/jhAASkuC8EhytLf688xU66juRJ8ZB1JawGJjpCeO2zMCxSTGz/7jWoj8wvduD/AL4EcfYg9LpEiD/ABV7nMmFFxz++U2PPi8MH2BYfHd3eDevsXeNik5dszfl3w63xA+Vzy7U2Ono1hOoPrj/DhNLBo6MDatq16lQzpFnMXCM1V7Zpy9xtZcXFr/Jq4g02IaFY3MRVZwFzoVC+N8sv5I7iik69rHXXxDhB6lMj7k/L9Jvm41E9jOMP42q+P/NGIeQCrU1ZJekxuHfJDXbTe5qpmIvi3jrllG0mYksTs3gpCT+gyQCJOCcws4iFr5XyPdzaZ3qp3Mf0EKdHERd8wxrI5KBbWFPMKGN+/PidaO3cz/0YGGYY+twh6he/n8kP2gFzlNWgDO81dv6Pt+RVccAPj7JyYCQSxwq8Yfc/a16yPonzZGAi7kPcIHw/Gn6kv+fqmBnBCLecz40MX1cOmhhT24Z95O4hoG0YwXKb5wvERH0ih/0rsvgjZqrtAEHA2kZJLbcl28zUVC+hg/bJn59ZHbdfJpeeGlp0S3ktbmIq8pVWkIUbnPMNUjf64q4CWCi47Vzr6jpm5mvR0kFo5kDiOfghEkfmzGgLyQOf2ltS1wmnzn4AQ1XePZiEdr6xrUinTXuAzhVRYX/Vfa1uSmaZ4gLB7CXkZNLdMvAqWOslzaTjbXZn3l2iFP34wAgyOC22Y7wHc1c0/FtnpHZSmnSP86w/5HdWPhnQTOZk7BdPR00yyL0AhXwwFlE1Ep3TCm62Cuxt/7dGHn1OxlbJKgWjoFS3hOZmbIvKNS1Z8GAOUfpoO/+qYMie5zQZ+uoHJF1H8DazwACLsc6PVIZsuR6NaUfsvRjBFeYny+gCh8h9E/EXl0GEmIka42eT6VdfpIwDtVqmZL7hVt1CF+NxrHGS7jIX08G29TMc+wk9Q/LOI14S7AzJY8prrDtU1KViK9b2v5a4ziS0/O8gSlfuis7bEQ9MlW+6cDGDY/8I8FTCnoRVaLONS+85zf1BWwPkBBEJCKrWIE0za3JnuynVZtO4EV+Blp6xA0+IXUr4b957dbeQSBlGoowM00o7+Y+oKY82ynD5JYMQhCsvdfcQ9hEgHNK8L9jJg/VE8CkTzt4Mmgl2XIlo8qXfu0lnIpOQ4DjBjEA/Fu2nbg4Gc24SNbxoAdmvXMsTxQuHyAoO338zjusAsnA0/QslKQsQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e56350ed-d691-43a0-4411-08dbbe598055 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:21.8414 (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: TQkXBM2wrGBYgjQF/L4V84E/6gyuEBbv7rrvT0KZwUMGO+2e994J3xqlT4ZAUhjjLKOL150lrOIdYczaNDKyxlEVXP9iYVPS8vY1+ajZeQbkLCa88RTiYQnlOkj9f+GN X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: IB5JII3I4AJWJ4FCXFYORJJOQ6FRD33Q X-Message-ID-Hash: IB5JII3I4AJWJ4FCXFYORJJOQ6FRD33Q X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f07e83678373..2512aadf95f7 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2717,7 +2717,7 @@ int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret; snd_soc_dapm_mutex_lock(rtd->card); @@ -3822,7 +3822,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, { struct snd_soc_dapm_path *path; struct snd_soc_dai *source, *sink; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_pcm_hw_params *params = NULL; const struct snd_soc_pcm_stream *config = NULL; struct snd_pcm_runtime *runtime = NULL; @@ -4142,7 +4142,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_pcm_substream *substream, char *id) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dapm_widget template; struct snd_soc_dapm_widget *w; const struct snd_kcontrol_new *kcontrol_news; @@ -4441,11 +4441,11 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) if (rtd->dai_link->num_cpus == 1) { for_each_rtd_codec_dais(rtd, i, codec_dai) dapm_connect_dai_pair(card, rtd, codec_dai, - asoc_rtd_to_cpu(rtd, 0)); + snd_soc_rtd_to_cpu(rtd, 0)); } else if (rtd->dai_link->num_codecs == rtd->dai_link->num_cpus) { for_each_rtd_codec_dais(rtd, i, codec_dai) dapm_connect_dai_pair(card, rtd, codec_dai, - asoc_rtd_to_cpu(rtd, i)); + snd_soc_rtd_to_cpu(rtd, i)); } else if (rtd->dai_link->num_codecs > rtd->dai_link->num_cpus) { int cpu_id; @@ -4465,7 +4465,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) continue; } dapm_connect_dai_pair(card, rtd, codec_dai, - asoc_rtd_to_cpu(rtd, cpu_id)); + snd_soc_rtd_to_cpu(rtd, cpu_id)); } } else { dev_err(card->dev, From patchwork Tue Sep 26 06:26:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726429 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 87A13E8181F for ; Tue, 26 Sep 2023 06:34:56 +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 A1FDDEA1; Tue, 26 Sep 2023 08:34:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A1FDDEA1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710094; bh=XcOJ+miBOPBhpEsnP1makq0FYHT2futDKTBFQVk0y7c=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eOMydvdOCMwJIhzQFQ9rUoRgGu+MV/psaqz4gQ9q1BwER7NNsvDlkynciDozdAPq+ Jbs09cMDoHUMzdnII3LbyG9nfNtwxV8FuWawhD8yO8OkOGYLQMNqdpLkCEO0zLg7Qz CXj4V45Y8mWEZOf0020+19NTXlRAGA5sj52nOh8Q= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 39312F8072A; Tue, 26 Sep 2023 08:26:37 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A4F8CF8060E; Tue, 26 Sep 2023 08:26:37 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7D3CDF8072A; Tue, 26 Sep 2023 08:26:34 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20715.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::715]) (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 41A3CF8060E for ; Tue, 26 Sep 2023 08:26:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 41A3CF8060E 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=LREbo3lO ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qtt5gMgH25mcRTmJOLpbqsJHzQilvW4G5CQm485TDDmNd68NjXpFkrogi9WVb/AI3qiITdKzL68n/0fY+dfUdRLf44ENCfi5r8A8ADTUtGDPhTA1nho4jziFTB30NOEdnArUbXLKwvsrGL696+lfaV/qRA8O3fp/qVK2t0C+X00FibFf40jFt86jU1puFPq+0HRGrkBXa5DXwkW069GS2CkDde30yKBCB7zab4tFKFgKJkuedE3Hzh7wmxcj/HvFisIrbi7KsWmxDaYN1nTbqxaD1r0mOjTBa7KFZV6LcKn/EXm+GmKmy/hzFtTj7yFt72OrNn7IXrZCKY6B9BViTA== 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=xQXfnDWteiz8GE3/czrvoSSltI6Csd83QA100FZ+hl8=; b=FxonDInPVkOXkcJ+Qg/+zgy9SfcNGXEvNudYcxeWckVB1peHG2hq6F7e11881+YGv1O2ejsi+W5aprXBB4vCjjsloIAEbQHr0E3jhq3+fEmho+ihQAhHdAobKDxfPncAlRTOgtkVwwvTarY1S/auWxOf/1urWGklJVoZbSLV8tjPk/9yr2XrroPC8zn9W4R9VPJdw84O2RIWNRp9MwnzHUEn8xL4/DCGWCF5Qxd9vPrgu0PCbsDYQo/ujxW5eVT5pvoE2PdevmVHSZXosOCqoYhrkK5XmUqnJNDdCxnAnchjLQC5RE/BlBSvQ2+OKIkY4ydWA/lPB1fpTuS7SKGH2w== 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=xQXfnDWteiz8GE3/czrvoSSltI6Csd83QA100FZ+hl8=; b=LREbo3lOxK0eANC/yJtqU8KelXmFE/hy8vCPw2St5NFiLX8kSh8eincqM1lyLtqzdSzjXtTn8HP8Kq0Bz4LEg5KyWKtK5xhRNXaJNx/5u98wfFVz7nChyEgw7UMny7GqK7iuZ5X3Y7KziNm4wjfl42N5jP+HZWoxuKnxKoS5ZiI= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:28 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:28 +0000 Message-ID: <87h6nhfo18.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 48/54] ASoC: soc-link: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:27 +0000 X-ClientProxiedBy: TYCP286CA0118.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: d53d5e27-0735-4fe8-1262-08dbbe59841d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P2Sp0XxxkJViRu0OQ9Dl7JzwvpEabmQQqAHwtDg8PnTf8/Tu53TbDGMXVCx/L1CqioR1S2tThXo7CPQqjjldPcHznygf4T8hQb6CFiyGczMLQ2WiNCaVXgew8q6Z2DovU9Jg16r8L8PsmlMoYTJb+I2NBI4oXjocaQcsg1ly0iIAvgybZidWvq+tqa4s7dsTPbXpY256YflshUpike2D9dNxqb9wnMoWYiZgCUeeFgJEg62AdC+YA9mcX7vDZ3CtTeCsC11t+ESrIYvCaMwAEjFk4eJQUTb2xzWapWHSYdqbiJ7Vc1aUDeXOrhBgGkecqNYfG3co+6PsQnBvCptKb/LJfmkslUui3ckRE0vVMVlUaj+TwislHlHZoKdT+xaCIZ9P1MuUTUd6Z2LlVjxObKm2Xc18J4npS99wHcPfSWxANe8VfM074O8jEeWuNDWbF0upoXPab7jinKzAuh2N7WD5ygpWDM26ecdJlFdsjZKaBRtbry8jFc73FxP9C1l3bXMrgQ4wKzgQtc8Qpueff3ao6VcpkYEmuHN7wVe6LN8udPio1nRf8ovUbwmkug+Z3+bU8HBm8jNviqT6Ouu7DX/Tzad5K3Jcz714K2g1teSvuTQe2wYry8e+rXnR0ZBQiZcML8+IBncpXHdfv9tDlQ== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m/jDoCUaK4fXBRBO5ATSecElzz2vdgPpDGs6Ml7BpeKy/eOjpdyvWekzFQWAuEJmLQQWa67c4maWiqODMLKObg6ICwWrhv8ZfI4v9D0h2TVm8rJWt2CQNhk89oV4cJqysLPSeHkqirrDvar5PplWzmVlsdPwJHJroxupgbk8jrTYyKqGqXjx4vqnvATW5tsDMeRmKoF5mSxbQ5X3dW61TdWXj37C4ysrw/lwIJT6kFBa+XUSeJwRKhB1A2f2ai50dnHCr4eb1e7ER70d5yMaTbpPYA/AZhsLgvjWboeojy7NcKQ8tmrBeaUj/IVp8qbWXyvy+Vlc0j6BDvFHO8ohaaN6prBgDxc4Fokxxe3ToxoTVAt9T8SSDRV22Ezziq8dxejW9lrOn9zqFxeY/ZEfaA1P+P4fzWfdW/jiZYgczyEZA8PZeK9ZUycuO5+j/0KECXpmkcCS7lFI9UT2zm8qmpW3WkqrHr5lzm21nptJx4BhqUTrK/r/E8ksaMJsUT9wH2QoUrCKdyUnO8jgMqB+dIlHmlLwjJysjc81mgxITPli+xElTw5phFpQyAHyr8pq26DdRL4LzYhvN/9FNCd3OB3r9FBNGIxcur1//Znf6R+pkA/lmOsm4TgTWuAe812UZAfCyRlJsi7/HqZ1iIDDXCtUa0bMkzuD5kWHUk4oF3XknoVqNF0ykz4v8Pnj1dxvS2MOlXMFmTlBQPlsAiZfLAGezOFPZwuvgFeaIv1C3fA6piRbHkxTgd5PzTTnKvQMW5NrQMcPgul+DtWW+JVpObq70HeYsuanRmz7znfzul/w829Wg2S5prQa3wvn2AZ/MIhgdKKz1XXng7RDkrjWXjhzdHZ4RADNjcRiUX2AMM8vc+DLgF19An3kXOxumPYKlnDPW4+0k5ACNzFit/xZfXZeD+Lhy972IrL13wmfKmoAWY6O0lufMg15zeLTArB7u1iFazjzljDfhK9R7pKA78/+849XalLv75sGwxRMCZ7G3eQeEhQpjwonsBFMWqysbUURPW0nFdnd34oRMwNtm/WypTi5GdTyW2Xbc63C+y0eiMIia3XZGY/3e4F7/ZVnCitAMYFX0ZXHqDlh7t62mt8gcmrl996kToOUXnRsPQY6VMHfKfqDAk9r7+haaZJzH3CulgoNJKnE+ByKW8s1G71N8JEo1MRn19TspPZrewA5nCX2FLX1RWwGl6k/YFovATeATzEtWyv9ofuveoLZ/IH592/D3G1HvBmw/4oh2SrUrRrSE8sUINBp9ihKxWuX0MCVDOO+m7buU7S4eZ7Hb9dFDYD5VuEoaaE7zQXxpeYp+Ww2EATBrn5WW5bTaXSMrINeXwi5riZ6JkZXgEawxeB86XoFaKXgTsMGuZLcvVFcWiuutgpnltPjm1GoTaJmNxzcksmmynP1OC6nKSC1E9oeVDNFA3ZO+rr+hCBgz4VUQMGUVxTQZXgl2QDIEA/Zn9IN6qCOE0SImqeiW9u7JyObupXrgCxmcLDHC4Gw7/wOnIf6JG40HY0zwJ+3KdmRfTXrdGmf206mugVWXniwbIeA7A0/m0hYST2Lx+GSfNrVylugDbl5N0B0iRJGmZsTxDqgC8G5wtkZ30gKfeyGWxlChmN7260shDoo/DSPbE4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d53d5e27-0735-4fe8-1262-08dbbe59841d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:28.1768 (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: 7qKcIcoQ9xN/ipl8ozkbvwN6RhH8oeAF4n55H0VHUpymTn0E4WOCuRYa0RifICMryWeM4vxHewUzhcwo/xIhil7GMQFOQ/eQF1p8eeFMSa9JEKdivKA5cLe4x6fVw8KO X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: LVNFGRUYPR4M6M5EBFYRL5RVQ3IM2GMF X-Message-ID-Hash: LVNFGRUYPR4M6M5EBFYRL5RVQ3IM2GMF X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-link.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/soc-link.c b/sound/soc/soc-link.c index 619664cc9ab9..fee4022708bc 100644 --- a/sound/soc/soc-link.c +++ b/sound/soc/soc-link.c @@ -67,7 +67,7 @@ int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, int snd_soc_link_startup(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret = 0; if (rtd->dai_link->ops && @@ -84,7 +84,7 @@ int snd_soc_link_startup(struct snd_pcm_substream *substream) void snd_soc_link_shutdown(struct snd_pcm_substream *substream, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); if (rollback && !soc_link_mark_match(rtd, substream, startup)) return; @@ -99,7 +99,7 @@ void snd_soc_link_shutdown(struct snd_pcm_substream *substream, int snd_soc_link_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret = 0; if (rtd->dai_link->ops && @@ -112,7 +112,7 @@ int snd_soc_link_prepare(struct snd_pcm_substream *substream) int snd_soc_link_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret = 0; if (rtd->dai_link->ops && @@ -128,7 +128,7 @@ int snd_soc_link_hw_params(struct snd_pcm_substream *substream, void snd_soc_link_hw_free(struct snd_pcm_substream *substream, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); if (rollback && !soc_link_mark_match(rtd, substream, hw_params)) return; @@ -143,7 +143,7 @@ void snd_soc_link_hw_free(struct snd_pcm_substream *substream, int rollback) static int soc_link_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret = 0; if (rtd->dai_link->ops && @@ -156,7 +156,7 @@ static int soc_link_trigger(struct snd_pcm_substream *substream, int cmd) int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int ret = 0; switch (cmd) { From patchwork Tue Sep 26 06:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728174 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 C507BEE020C for ; Tue, 26 Sep 2023 06:35:08 +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 3F5B7DE5; Tue, 26 Sep 2023 08:34:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3F5B7DE5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710106; bh=FdpCWL+im6TX/sY4XQqTF86K2uZVHiqJh9vFjvdf20Q=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=U4RCG25lGbeV79kl9tnprC0MLVQ16VPRcP4Q2EXl9lGudRWFMsGiTyVFTil8x7DhQ cM0mHr+PuXtardJWvVofRnDhysPjaiE7si7vFzWcnfybPRbRUIp8i7vHS5kWCZKNg7 /du+J7mn2hVkKDhHq2MK4M3FPTnWR1loAN8EPLGk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id F14F3F80552; Tue, 26 Sep 2023 08:26:44 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 7BE09F8074D; Tue, 26 Sep 2023 08:26:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B9D72F80733; Tue, 26 Sep 2023 08:26:40 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20716.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::716]) (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 D0062F8060E for ; Tue, 26 Sep 2023 08:26:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D0062F8060E 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=Q4lnU1uo ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pd7KGtYobmRChW3XFr1+YV09xnPKkkDQjJRiT9bAsFpxU7UMwhYpSMXIu3v+iQonW/gLn7CmgF2T8KwU4Nh6oajp2G3ahOAyFka6ceMmyOX1Rwffa/5ufZ1IYmi6XJbwEZ62d152ir4au+9pCxcwhJ6Pj1n9Fazeg2OVGSj8nDHwM3sRiOmWbrwinFzfV1wVQGta6a7nWCX0MnL1JnG+D4cuRHJdmYIGMXGaCIlHazzkLPVlvqVhqvvg2zw2oUhO3CAHYF+V6CTU91oJMBnah3s1X6TeCVS4EUidxMcu3o24ZVDMsYhc5Mbm96fk9Qz5+IwseVu2ySFD/xlmy9O/dQ== 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=jClkt+zHhFQCVSwQfYD4pvEeTztv9ljh6OECMrx8P58=; b=fsrJH+eC2gcWGCe6RpNNTaKUbZj64s3a50l5/x7KJfi3mp5KGRqgkoY/behOL+Ozn3i1iS5Nv4en4KmhdzaoHrERp5ZwYiLc0mLm+MvfTbUxupzPI2V8GQVQXPU4Cys63tuN0I+NMSl5DFETIhtqxXRwXvLnc9vBRJRObEmf/SePfOL8T18ewU7sfdUauExI7dJQ+roAy8O0kWYw+WvbX6yETe9Q3Dn8Y7BWv2+ZaICPQ0EsXmER3rJOen9RS/PXiUDoxGzyza6DVohYZwFFzkoEHSrKbXDRsp1BdP1yGPmK/xW8GCCnIRbMt7NWoHOLGoQACT9GVvaAJ9f3XF+S8g== 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=jClkt+zHhFQCVSwQfYD4pvEeTztv9ljh6OECMrx8P58=; b=Q4lnU1uoZnv5PDUSWgCLCnQccuV+6JVHsuVbUALM/aghh93g97N0VcmnZTbIVzuKs4HbFg5aBWGjG6EKaYKu4U9IPB93C4wAbsJQDF9I3RDw8/6BuJzEVHYKyO1kVmV1reekmf0LQd65ie81rX2AsXYJVmWbReh0c7ax3KNGfkM= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:35 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:35 +0000 Message-ID: <87fs31fo11.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 49/54] ASoC: soc-utils: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:34 +0000 X-ClientProxiedBy: TYCP286CA0020.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::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_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: 470397d9-a835-4a97-ed16-08dbbe598835 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wj3sK5krCPdBHjw9LRbT8K4QOkILQhBVYeWDPy3u0Df/W6+UckW/3cCrbd08h95mK0vO4i2ui28bbZl6aWqKkZgHPq7p0V1eiCtlokCpfBreKSwoZCxi5caMEsEEIc/HwQf2FQT0XOSPfEw69Mv+egRXbVv1dC+TLMmvduRoZK4hdQpAgg9T9KCgTev4Vv9tgpxtLeezo3ehu9hESPdczhAClaltv648FzXhGRLsgTyHnOWdzxXuRMm7Qm7YlByICwyEUuMP0KRtEg4hGa4I4zX6+Qjsc6UdQL0m3lWIxzNEBnUckPNz0EZ6hupiLo+PjO3ZI+ewt13zonHe35wRki8Tdiu7tQkbHq37Ist7G+abJENSB2xLHvfkkxzkPKy832pFupAcSDsKnHi/Kk+BFHGQzPxqcWCbgz33vEzqkPw59tuNWR7OjdGuBmgvje3zcfOVGqiPijGhYV0fy73VtbvAol5eKTh51LXdaLDBbWLEf5swK3gb1iXfmjLH+WEdYxI6LjAqRHRLMsOgA2/dGmpqIKJViZHbI76RB01SsFFxfCsBLEnYYp6+00RRYz3W4Zn5iP/UiXrafIX1dqKNYn8tc/gz0F5u+qC9cO3xxPNOhqx8ieJ+ljbJCw0GofxocNA9bLp7sX/fJ0ts/MRgpA== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(4744005)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cELCToblYw2PV5nj7zccLyQ+aC2js7MC3k9D9sjr5Z+nRzbHMiClvWPlPZ3TqmX+1rFTlbFITJSQhLqqLSnkyXbAUSrBiYSEayjqtQwIzrJZUwdZ4hrO6b/90rXaedBtpo4vKXd5KLZZLoY1Rgu31qvNUA2VFewWAs0Ud5a9HMRrpXo7ZWhS14rIsO/XOX18dmcM7td/WowmlI/7SaYHf/m56zkrtklKGOdnRth5dBzeWD2zXQq7wVtyS20d4NxhIfRxpJ0SQex2XUktRn1KZZOnTH87oUK9g/7B76UweUPvaTrVdJ5rsrC89Y9+Mhcu6HB6d3Y9fRr4k68nfvPfli+8iGX7gUMnTupKwQdzyxALUP8nO++udeUJkmRZA4DCXPUtNEzi3pKf3BzDHN6MZFsBOZu3q67b5L+lFiYxEgHBI2DcQCPN/Lm1nX864BktL8gzODvyQHoQ2SJAeQBN6HJRQ9I8mKnkaNci/RtlErB+ATG7cp0kU8i0R2ubOBDgcq8pBaJowiQoTpFIJhlbFulHVfqSNQAMfeFf6GrHkHEp9SNwm/ALxbjssg0U/EPpdpuDEWK/gbvUAdYuexRAaj+dV641f8k+dzr7x/nfTr7t9/c1QBbApz/4lKCp+RnHPyVV852QT3ezUA2Grgus0yPLqTJX6AtUWCcuf9FUEY0K1gbWhPQ/121BflCAiQN+HA8KLUQVtwI9HgghPKW/vGWnfVP1uyOk3e47Fb61EXGKq7X1XuQI8Nt/WpYdoxv7Mkq1ukI0CQR2tIg0cR+O3McM0E+iRJbPSa79IpQU/314vWTzG9o/7XL2LFeYwKqhMwwyJQ/vy5/pJFpVaLKJOv/6a/HATg4WLFWVMnznnKaXxij3UdPie61Ossm8saJdEIF3DmJ4dv33hTpcpR3VQqxQc9QpxXYo64y+45atwW0pchnb6AJ8LBwEN7eyFlnd9zQ6MsaQiatXnmWehHS81TiEDNKAc2d0LZtMCitmkRWEIdvfoyiwsTVyEV92ZO8sAjj0DariRiwNCri+FaMMFsRlxJG+8Fd9bsvodZcT0Md+d/MEZOUfxQorONXez5Iv0WOTxA1pOmZm7+BES1zS5u3/WX72Ts8R6yqSP7i4xxxB7cXIYAsS/6AgnUW5eYYXVRip543/78nPkHGidpX3RaZRzdZ5dGWhWo3Gn6r5KRpX3rr+TruWdPwsrFgYh55MWyVd/CEywbCzluJCpYpDgzleX7nh/T1Emd2YHg2YCceEhFTm5TDLCrB7bdnemm7HuLwonMeh26PAVMXcJVy5ch0w7QtJV4YjDgM/R768c4jtWLb0aTreZqpGNDex6OjSMdaPnO6KSUMNt99X3wm0W8jcS7EyFFrwaQdG43IiK+MWObkbWMNhClw82qrjoncsGi+752uxgtCSwh+g0P6WcxiAvK1XnoCi0SqKofQ3H411VJNHVWVX/37vIAhqKfm+ofizip/OHjLh2UzR99v+GXoWPmMK7BRA8OLDf1/iejf4XtdUPpbEiqfmHaVVaDRX+QdgrbRYMZSClxV7vEn2yZUwKAbZpXdKmfZG2iEgymx2btx21adnjEXqXiX7sYMBSoSc3JWuk0rf0lVkkcyIPBdLSJRe6cx5GxjuDDzqjIU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 470397d9-a835-4a97-ed16-08dbbe598835 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:35.0490 (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: qljeb4DNiDC+pzcKEPVjjwISH8mx/JP8+yBgaSG4eyda4HWcjfbgTzfHUzBRpPI6M/YpXL32Ue2jzwrNjsoFULZpx+yoyytfL1ZUxWrx9jsXGPsdU/nF+YGM26ibhN9y X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: 5KYE2CUOIN2B3XTZMBICOUJ3NVX4JAC3 X-Message-ID-Hash: 5KYE2CUOIN2B3XTZMBICOUJ3NVX4JAC3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 941ba0639a4e..d05e712c9518 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -115,7 +115,7 @@ static const struct snd_soc_component_driver dummy_platform; static int dummy_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); int i; /* From patchwork Tue Sep 26 06:26:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726428 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 991D0E8181F for ; Tue, 26 Sep 2023 06:35:30 +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 B89E1E9B; Tue, 26 Sep 2023 08:34:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B89E1E9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710128; bh=W4uKr/oH2f7WMhwQAT3AefHoCCgGfdp0EqXdaDrnpFs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=KN3c5aLCblTERZP2Bmcs2LCb5CJi4Y32yvLRTJjsMSLd0YCTqyt8mLeAtykbqiqlU zJ84eQcINfFl6GX0FFTdI1VfcacAUxb59FFcOMTfbqnPgZB3gcYFclmD4IHNIT/aTs skvBGdajS05tWTx1tclgJPpqdXLPZqAsCDtawrgk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9E98EF8074E; Tue, 26 Sep 2023 08:26:51 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 3AAB8F8074E; Tue, 26 Sep 2023 08:26:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 25F54F80751; Tue, 26 Sep 2023 08:26:48 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20718.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::718]) (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 77242F8074D for ; Tue, 26 Sep 2023 08:26:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 77242F8074D 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=UNnTi+rH ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HkvwgIaDzSCybhouiT/THTLqC/QW/AZIdcYByaIwrqCazQS+OHfxH/xM6chWcWcgjxm2ltffJ+Avku/KWXrT9Kp99VHbyMHISAS9UD+nh9OaM+bSeqM8qS1s5PDygahQLXJSCa6gx82ANU+FO+aBPc7ni9HEb5eDdxw1oiCwq2N0uvSMp/Y+VnsqiGO4ljrW1gbYjsEFtTtQRK3n1GEqsIo3hUkleGqYqcn+CvONkyhN4bF1RJuoOz6uMQC9O/H1vPxXOew0YVrlv/5vFsRhFA/OA4kVAt/rDNh1XMH6lG+XY0umtSG2CR+4Bh/fYtp5/hPT+iDe6Yr1JohBZnThcA== 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=8KL1Jz2c16Y/SQCY9ScUByCGM3Sq/wO582edYyukzNY=; b=YTbGTyGOlam0sWyq4wURKg/baVmZqH7E60GrMMT578t7SxNv/6R59Xp56dHNMbOWqfBjGl1HurQ/tPx6OFW6+17t5MkjDzQvv/Qzd34LV+FvJjoOrY6bkGQ5gdYr9TZ7bva8KI+sdoQyasZ9V0tRd1aHNSiraWrjL+svD/30Uag5HMjuLXyOxQ6xYIXPBR285lrEkdztg3Y+7PqhbQ4zIKWgjbElHPWdOa0Ol2tZp7ab5UsTxjCgsQ9dHpHgmhN1L3z7M4E+lczERASfv+PiOP6JVi5tY89RHU2DGRCvHQPf/tYgCJoGoSeKZqNQn0QOvuujsqYnl4c+qMMfsouIdQ== 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=8KL1Jz2c16Y/SQCY9ScUByCGM3Sq/wO582edYyukzNY=; b=UNnTi+rH4CTPHSHMgwxLSp/2Cf60fL5gOZNGJ4nSNvGsYzgkbX7ZNuv3s+e6JOgBROlHElq0tgxu3smfyTXb885az5IYz1C8E+5SndDSwI3i3xjNmrvvwlteCWDfHREacu/OXlzQsAqS2AGKgYpNtiPBDn4ni6gXBGYmOSEWGWc= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:42 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:42 +0000 Message-ID: <87edilfo0u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?unknown-8bit?b?IkFtYWRldXN6IFPDhYJhd2nDhYRza2kiIDxhbWFkZXVzenguc2xh?= =?unknown-8bit?b?d2luc2tpQGxpbnV4LmludGVsLmNvbT4sIEphcm9zbGF2IEt5c2VsYSA8?= =?unknown-8bit?b?cGVyZXhAcGVyZXguY3o+LCBMaWFtIEdpcmR3b29kIDxsZ2lyZHdvb2RA?= =?unknown-8bit?b?Z21haWwuY29tPiwgTWFyayBCcm93biA8YnJvb25pZUBrZXJuZWwub3Jn?= =?unknown-8bit?b?PiwgVGFrYXNoaSBJd2FpIDx0aXdhaUBzdXNlLmNvbT4=?= Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 50/54] ASoC: soc-topology: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:41 +0000 X-ClientProxiedBy: TYCP286CA0125.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::7) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: 32bd7d10-a781-4aaa-dc79-08dbbe598c42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: svSQz59w4pDPPgh8OaXPYWj9XC74EAQxgxedE1G/qnY+cQka5btMZaZHdPk4Gqo09TSHH2wHbhY4U0R6zpw61xKXVvt3B2sW63jBcZxB48IC5gn5uftG+kh6rLmspNUjNkE9nzaiok77mDxgzmOZKzMz19QI5885KpHe9lwMQc/l9d+LktC/89Pbriww1A+vGOxnmwYscc4tgMfWnJNp6+bqbBTlFuo0dRBp17zY78pcYx+mETBS41/rdQo4q+4zYb2SdJfCnb94NOotDzmw/xSnxfYvlf5+Ya7AOXYAP8cbBeTLgRwa/f2JIk/X20gQefAkVy7KhE4qanwuu75dMXBha+Q7/j7Hp9hpBwkVnFkzJcf4pqbMJRioBqhvZz9fdK2VZLaNXyTZPiN6auGKNKL1tWNPhYNDiKPtzAWVw0vR+GDH7EorC4nYHDzCasu83jr5BU61Zrg6bp3p1GAyYPY7wLmytkXgAYnaI48Lg/rDDnMW2I7U3n0dXsPN801XaahmcuuIs+JQjD1eL2tiO0iiOVKWLHCNgmaOXagOihB6tCANI//qg/Bn1P1gkkXLLqICiwC1WHq6XOFJ06zW7SusMZw+AbNjxEwCJcYuSKb/HI7+ns+qEradc9jqd7qGlAN6/hDiCCbj4Wz10Dx4nw== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E8Ucj2bG9iIApvNnmCuyPR6g2xViYxOtLZh2uxJkOGDSTpxRToRUgCMwd9FjLJmFUk2akDbHQHmU9rAv0yL7iZmXfoM5P4Lgsrv0CG24wJ8esVNacc2h5xFUEHjVGf9IrJW/+m1ZpDQySCXMfYsczh28EnZXXRVMeT70fPR0NKmNWrcAtfyXrPkQHy3T1Hx8p/kb69cSlCBXnR6TPmpUYO5y/oow21jHA2KIFnSgkXgyqJ10Q/JrpV8zd0bTN0xZW5jF5t3/TTVSJbTxU3J1AWc+QFZ/38JJBM9lr4+Jxa5iHDgO4eXx3a69NtVxuybndjo7DtOgvH7Py0aPVJ+VnmFGW7y876en4/M784nT3cyp20cFop6aL+PrbnrYAczjSoriFAHFBHPpXG1+YoSdiMJI0Ct6u363Q0IFTl+vzMBJDZB+VmT11+BtsxBWDyGOFxWBrWw4sIBd8wdT9vzAupkqbFBol4ar/QLSfzpqBkYDSDzvvg39iWaSiGIx84bYqXr+LTPILZPV45OeKBcnmi/vFSJJuaMiGfXKrdzNDIRDSpbl/kzUrNXB8FH6FeLMNIAyp1uQYchRvvXtRTQyUN/lWQyCH/jIBqD/lDMz6hZp8PNGoMq+tGD224Cof7xEGzNMvTKAxBaIkyoDXH4Czd+ofLO0d1l6PYKO08XiynS6azhzPQuONUGU//4q4lPRDqYUWFBCNrwI9+9HiWZai9d971JfKnIz1+oMQYG/NeChFaVAAuaQn54y4J4dd6cMvdfzj7TTEGGleqk6+GV+bCXiXU4KGZ0c0g64FWng1J+XukXYrZNTfnYjorfbpYXJwU8FoVT8hc/TwG4yMTyxB1UgszbjbjP1ole/J5MaPEohEhbdDZV9w1EtIUUOBHLi/9DU3Vsih8+tmVRh2VlH6u3Vu/ZxvIb+5OS0xYldNj9TMs31yYCbZPe4NTYgwCHzExeAqdfMuvtBJi48C6hkZagSYE3RPaSGDTFD8pBvVwFhRGfPcffn+qu7s4cwcD4Muk9H7yipzKuinEOmouLQG3w81W8qZ28efjnqllovqYC6RMVWAaD9QDsYvWBEyhTa2sNMXiCp6tYlpB8fsBfXCKwp9/cJWEcgk/PDNeRZVMSUxOb/vgnNWAP48fmpSK24FuR/16/u8J4vKZznDG3RQm30Unooq6/CIUNlyPAOJZnR3W4ty1G0Ktjhku1+IUGHzzuZR81OK7bK/RMEJqqVTqdUxSpQaH5NqoYcvXXYAxXG/HVRsC/4ODPvcp5Iy+rFAe5pb+JQFRdgUOXj1wRHfG+Vt8QrJCSE29nj+TVKHp0KkNTDoDxqMM21TpITRyduLvegNTeCBBeC91w5MHj9dtqlsuwVLIXR0sGMF3TIxxDKzbv/Vxf+t111n61iq5nmPYUIJ9M7uEkbE7zuQJs2ZehQ2f1Ov78xCN5euyz4FOXEvDrlL20JMdClUIfLPt2Ur+oSNvdtL9duP0Sjwr4qliv29f4U94te0iv99ofuW2FwMckl97joqKIWxvxNp5svaCFAS0EKcQRP/HenzRDedHo7MIyyqr2lyqghJI8brcZxfCQr5UGCilQZFSgE6ikyA9m5U25d2DN4zKWM26JQ0p6jXmtkzjaG7VfyMrXeEuw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32bd7d10-a781-4aaa-dc79-08dbbe598c42 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:42.0229 (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: 7pj2nEDPTAwAs4On/4r8jzT4K4D65/Kk/zwwhF5eDArTM0BqaRqKk/p4hKPnSNMiX/IGba0h1CXdInoF6Lej0glYYzvdLnWqY1lHroWM1Nb6Ke0rGNhGE06I/CaWjJ38 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: YT3H2W7GHESYOXGEVEBGHFNS553LLPEE X-Message-ID-Hash: YT3H2W7GHESYOXGEVEBGHFNS553LLPEE X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 2362c282ec8b..ba4890991f0d 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1706,14 +1706,14 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, /* * Many topology are assuming link has Codec / Platform, and * these might be overwritten at soc_tplg_dai_link_load(). - * Don't use &asoc_dummy_dlc here. + * Don't use &snd_soc_dummy_dlc here. */ - link->codecs = &dlc[1]; /* Don't use &asoc_dummy_dlc here */ + link->codecs = &dlc[1]; /* Don't use &snd_soc_dummy_dlc here */ link->codecs->name = "snd-soc-dummy"; link->codecs->dai_name = "snd-soc-dummy-dai"; link->num_codecs = 1; - link->platforms = &dlc[2]; /* Don't use &asoc_dummy_dlc here */ + link->platforms = &dlc[2]; /* Don't use &snd_soc_dummy_dlc here */ link->platforms->name = "snd-soc-dummy"; link->num_platforms = 1; From patchwork Tue Sep 26 06:26:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728173 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 858C3E8181F for ; Tue, 26 Sep 2023 06:35:39 +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 A8F26E99; Tue, 26 Sep 2023 08:34:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A8F26E99 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710137; bh=g/uRo5pX6xLe9PGc46O2MfVNhRpMUwI72fGmoja1NrM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UYghKjhJxSz7aXycvrRjls+AZQcI0/ABQBqy4LjPCVIXKFNo7aaVseQ7S37zIQCZ7 u6k3x8zzcYKfsBtJcwxlmF3wM/O80lo/7UNU1/MVDMr1i5dCzWEbCDQIb29FTyZKj8 D9aL6Wz7IAEvbS3YuT3qbwAL4rXTbI9HMAsoVwm8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5314CF80620; Tue, 26 Sep 2023 08:26:57 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id EA5D4F8074D; Tue, 26 Sep 2023 08:26:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E6634F8075B; Tue, 26 Sep 2023 08:26:53 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::727]) (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 D9362F805AD for ; Tue, 26 Sep 2023 08:26:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D9362F805AD 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=mOtJIvHL ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jbTJqbRz86hg1pXr7OrOTwqlhrCnYfv4r2ln87j9E9G132Fw26vb4aIqDBndQyVMcFd4+IChwLmcr5Qd1x4V+fRJ6uAdMTZGF5xTe0Gqsq67JatQGuKe7h79lYpKB3VYJCB/gFfZaOcpQ0t0uXnUxKH4ldkrCPNYNPCDexHBuLAjLAx+lw+pwzS3TFldyu7BxqsgFX1Do+FvniTKTdXmgl5CxJ2E1ISBM0rwFIp60YN+u4sf48ialcRDxc0yaoGWjG1tnWlEWmDVTx3tmG96Jtr+BBOnuAwsxh4+ST3DTsIJeOVR5TqsWzpL0FQz6u6AfGxxFGU6YFelKnzvIPPMjQ== 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=jPTSuWywHW/fgQwhMlw9knhno4Pex0N9j7jBjLFbxwg=; b=myOyj4d0JIdsQCUYhxdfP0AWAvqQS2hjoSBUz4l3k2NOji9k3R6NO5d9ugfR0Z1c/Pj6darHhvfvhAXSa6AN2UvZbO/CsTVAl+Nm+qtdvBw5t+L9erYyxRU7KIhE5b3q7lzjL8Pi/oznio54GCUOniwKAByJAMIHDdP4GvTRBIeuKSt+8b5LQ6U+FazhD76RMtXj5rFOPFV823FBAWZ4U/tajmswXX7r97zFsd6zabGXcOhwfJcoG1Re22V4hV6/TytizZO4E0RA1qWet8fP2MaGnlyeLV0q81W26a3e7lFuOJca7Ti1vUErz1zTGmZsEanYk2+kaKt5pWEu9RA7mA== 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=jPTSuWywHW/fgQwhMlw9knhno4Pex0N9j7jBjLFbxwg=; b=mOtJIvHLwEe2RH6QXwFxgmRrE+X1w1iEJWyEDs7LfZGeI08Q9llTPGtZETMTLvTKW5oQ4EVoZH6q2uk4zrgKTI38EtXoYq5OS1QhfM+EqdXw862t0E+vfUHiJV2qlceXx4G7b6+9/2kVSN3wyWlJEBOTEIZVe2Wl5VfEJ3XA/BE= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:48 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:48 +0000 Message-ID: <87cyy5fo0o.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Vinod Koul Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 51/54] ASoC: soc-compress: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:48 +0000 X-ClientProxiedBy: TYCPR01CA0065.jpnprd01.prod.outlook.com (2603:1096:405:2::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_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: eb546f04-424e-43a3-1c25-08dbbe59903f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fZW5N4s9XmApBs9SijHK72PlTWO1tQuXVHdWOO4tTYBmWlCD3VM7PMZQ1bhmGQ5DOIqSzi9+iJZnkZ7pOuiC3eBM8ekXUZEKVKooZL7+sfGqm1YGg6pyseT7z5ScAKfTjJTLY7isPaHf/yhrnXIrvz2pmXzS2VJ0X1Qjk86MdTiH/awaVsETPZDTX9Ic/LPnH9u5sYQtfS0sVPqlfjW7aYE6US3EfJ9bGMiWdoS7O38ZUVCe7U9TaacWPVa6jm210UCAyWFrSu0kZh+wme2G/ewMslRTPsntKwepkfPxn80EfALpmcvzAIIR2LmAjIWaR4IyvGrHPWCvoKJZ1r6R+y1Hi7WjIecXEe8gdixs90nvBrcjGSrbBbfvK5lYvh/cqIfqiUcpPr/1mECkFI0QQvaD7Fdldzl6XXiLZ9A2Blku97OMCa+vtGzTKyWZgpKtjICBvUedqzfpnewK6zHfWQMa+/zK7v63JjrIUnoczpXnbGswEXVeu+vmpDxm9IDwikz5YYG7F9mWyyrmm+4GqJuShtxXQhof09DjZN+VUtE2E8Kgebibi3FRa8q91KaUhWLQgzF9RFatgO9EnVBbWdiqHrC1rD5YnazgxdeA05/sN8fKP+oCvmVDw30j2dUDZJTMzoUrT08Bk3BOh5aVQw== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wR0z/r8dioPPAbCvBwsrXa8IAUeCG8pEPysxgO/Nxe9KR5QLmB8qoFEHH42PXZO84O9v45iWgsY1VzW+o753yxJ8wioy+rAhLOZdr9eGJ7S05wokxFlzMweI+t7drrAsnxqaE48pmpv4yLSJmBD8+Agrf6E+M1jmgmOSb0gQBuVMmJwsOMuHkLOojz9FUNA8PLznWNi30MyCYq8kXiJ/QkBfHH6+W179Yz7m/pMlFgbkxZcqRPktCoY7OrPoVrFlliZXW8h2Xuf54tN8ztO6+mAFduenwVg5q7gYubJgEQ9KVMoqclX4L7kYn9IR4XHcpD5dwBVfaLk0tc3qJryrBE8uOcMs77kL1GB3VfVAaNOe272yhZi5KxJSUFblMFIaTSXU5NJ6hZc/sCI6C3YZw8QQg6wvzdNISrKtgl1r90diU6ucT52f6kBFJsoeLDZIv4RF1Iu8Ujjdh/I9xxLJSKkRLhLCTkQavrPwm7iqcyFP6dsRetuqP57z6LAMRvzlIzoKg7mIOPajy2gxHbYhrLZY+Xf5qvZOIxrM26NEqcJuth/zF3ci3tM7btaPuFI7z/ITWPojqlPI46CF7Vs9kGjZk7orWfjWkcwH54g5KG31Opys911jHoctHcZmWzY42vvmvLEt+dC2FtQ9Dz/G9uyMaoh6+lfSpgNv61qxlZUL2iDitrQwLCmISEgM8H0UV1vZvioNz9xb0Jsfw5Ru9AUIujC5OOBmcR8tFmxWgFkkj62XrKKVEZTFSR+09Vev1Bre58vR1N2yHsx//CcqyhLY70yTvfBpD439Bs6/rE5YtkLeKRcP18a/gohssONc/FhQ6k4l2a10oVINUwTO9fl/+EcqJpQLtIoxh0kQAqENrOwTFp7bkTrSMP5K4mJDXbTJq8Gr6Dxh0dUZcX9+nU4G1+YrgRi5gMidUesZtqp4RMQYnATunPAtQHc8/FjBJX2GhTtnRM66uhUTQhq+JK+fjg5I8nLSiP4GoaXc9qsjovvzf6uyUYkHt4xpbxrfffK8Bq8nitBM5J4D8RbYRejuHCqfGrG2ENcrDv5o254cGC3qpNPmL0O9RTlLjvhuxrPVwZ0cydQIqqhuRXm74o5PzFLVL+8S63+LLfli1zTOsXYCsruSzOFNtqYa6B+RQ228MoC2JvG7gdpKUxbJkbncb2DHOiihbNqz1dcp8Ujk94co+UTDlkrR7fxO1ehgBrByjOJOjzt+IRj+CEXKbsy0Jl7szl47q1j6RSF63WGOthQwZf5UxyL8kwwRSZmCmsuFbICzsgD86lMB9dx743jNj6WWKEvM2ObjHZ6uugpCqll3bdCEpvuDiUa6Ie72/BpIi8FRZKdq10mI5B6bApC2bohUoPfQ4NH5jOdDHHHuJRW2sRUPUAcI7F2hTOMydYBvmTeHiyPQk/OKmmFqFVPTZk9X809CKy0eKmMFVszPVy5/clO1qZVIytaOK7/j1HX+/Cxh48nSdvqKhqjyatQRHmCC1eRHXw9GvhE4aKqmlgMKaQ2C2qEcDrl7VUel4gmEoijzfTe9Ui+4zVqdS7JkY3IcBFWE2VB7dd99SVYYMCbqEAtssjNSSaWGruoxikSB1rCPBJjKR0pFwODK38SoFOm6n5Xw0AxPJeu+ghA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb546f04-424e-43a3-1c25-08dbbe59903f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:48.5197 (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: +qwYPPdnnHaa0X7hiagwdmX7S1fZclA2e7RdhAV4w+g5uih396m4UFr3Nl8AQ/pn00FvmenWWntvb5cBzYLl0W3cmRDvvJRRR+MKwIQ6SRqMc3qqamEsSZzKsrmxrnHQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: ZPPHMMPVY2LFT7EC5B2WP2ICQNO3KK3J X-Message-ID-Hash: ZPPHMMPVY2LFT7EC5B2WP2ICQNO3KK3J X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Acked-by: Vinod Koul Signed-off-by: Kuninori Morimoto --- sound/soc/soc-compress.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index b58921e7921f..a38fee48ee00 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -57,8 +57,8 @@ static void snd_soc_compr_components_free(struct snd_compr_stream *cstream, static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ snd_soc_dpcm_mutex_lock(rtd); @@ -98,7 +98,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream) static int soc_compr_open(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ int ret; @@ -133,7 +133,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream) static int soc_compr_open_fe(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *fe = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); struct snd_soc_dpcm *dpcm; struct snd_soc_dapm_widget_list *list; int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ @@ -203,7 +203,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) static int soc_compr_free_fe(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *fe = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); struct snd_soc_dpcm *dpcm; int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ @@ -244,8 +244,8 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ int ret; @@ -276,7 +276,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) { struct snd_soc_pcm_runtime *fe = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ int ret; @@ -323,7 +323,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, struct snd_compr_params *params) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ int ret; @@ -369,7 +369,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, struct snd_soc_pcm_runtime *fe = cstream->private_data; struct snd_pcm_substream *fe_substream = fe->pcm->streams[cstream->direction].substream; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ int ret; @@ -419,7 +419,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, struct snd_codec *params) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret = 0; snd_soc_dpcm_mutex_lock(rtd); @@ -437,7 +437,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; snd_soc_dpcm_mutex_lock(rtd); @@ -457,7 +457,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, { struct snd_soc_pcm_runtime *rtd = cstream->private_data; int ret; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); snd_soc_dpcm_mutex_lock(rtd); @@ -475,7 +475,7 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream, struct snd_compr_metadata *metadata) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; ret = snd_soc_dai_compr_set_metadata(cpu_dai, cstream, metadata); @@ -489,7 +489,7 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream, struct snd_compr_metadata *metadata) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); int ret; ret = snd_soc_dai_compr_get_metadata(cpu_dai, cstream, metadata); @@ -540,8 +540,8 @@ static struct snd_compr_ops soc_compr_dyn_ops = { int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) { struct snd_soc_component *component; - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_compr *compr; struct snd_pcm *be_pcm; char new_name[64]; @@ -644,7 +644,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) ret = snd_compress_new(rtd->card->snd_card, num, direction, new_name, compr); if (ret < 0) { - component = asoc_rtd_to_codec(rtd, 0)->component; + component = snd_soc_rtd_to_codec(rtd, 0)->component; dev_err(component->dev, "Compress ASoC: can't create compress for codec %s: %d\n", component->name, ret); From patchwork Tue Sep 26 06:26: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: 726427 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 DC200E8181F for ; Tue, 26 Sep 2023 06:36:01 +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 C113CEAB; Tue, 26 Sep 2023 08:35:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C113CEAB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710159; bh=82xofIYd5o+WpoSLani/R9AQGFOPNRAoZ9g4wzOarLI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=T7fXCfLTwGG1cdXyFp9ZTooLEJvE0Gp2uCq4ZW0e3DyCxmVVarCNPc1vmJMeW6+Ph W1XZb6eCd3o9egW3iWCOphZdWRb673ilVv2nLxsq9MjgFIRK/OjP1sVs4IHHqQkWdW uq+5hn8fvlG/Ea34j8E9X0XanyOB6TW9GLtXDTog= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 748CEF8076D; Tue, 26 Sep 2023 08:27:07 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 043BBF8061A; Tue, 26 Sep 2023 08:27:07 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A96CCF80768; Tue, 26 Sep 2023 08:27:02 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20707.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::707]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 70A83F80614 for ; Tue, 26 Sep 2023 08:27:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 70A83F80614 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=p4EP6i7u ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FaE6NRq7Ct4R2DSQuk+wW+s4IzAw/QwYeeYWvPBFC/6G9AJnG/Lsjnl1oosZp8yJqPDdAQ2CkIy20P7ig27XV/kJWHT3WNvdHsCGJA0Ts3HmU8geT3399iYMcYTMWs06THaOQ3avukxBJsv833uF4ymyt60p+9/XzL5cbKdBroUpJYxZjZwVkr4/MZZ/k2JTXEHNCDZcuPxu5WCNGba7AugBdmRwGuCf0C5KGSIqbFQ9ayQ/O3LxWDuyS3vFNwju14izhVAhhlRiVp6kEGguBPQrpbJDZoTt1s8SBRdoWq8F0LzuNh/R1VCv9htvefb1WKbomPOOzO58OYQ4eiRjSQ== 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=auD6hv+BQvoVmPLvC3C1Tl3oe3cFYZpE2qtcQoHgC4A=; b=TXoboTVVB60d2goakUw3dWWYpUeNjB/gC0RL34dpKp1eIDBaNeyAwBta93DRYbeD1hcAf6X+u52xK4o2YRaKlVJGgoi1fAjHiXahyEELlW4qQf8xIT8f50Rfmx8Jb5PJfMD9Hb9PoZu2VIjSSCce0m+f3v04FuAXTbn9y0m2ArhxZG8en2FZ2GU8hto++33RX0NvNP7nCZHW0fhcClhSCLz/TcYZq5w/fsonpLZbj8UZPXsXmPmP/EbRu6sWKQZb5PX8i1Y7NkTFZzaA6IEQqqZvjpNoiZk4deBTzpt9omUdYJ7wwiPMvgtGMNp+OFqcGo7SEsaVdCML3+JRckh39g== 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=auD6hv+BQvoVmPLvC3C1Tl3oe3cFYZpE2qtcQoHgC4A=; b=p4EP6i7uEfT8eFPyyobmGQaA8zoQNY9vRkkNi0OgKRTjHRW11C0AmxJGCxBalExVH+Q0Upnwj3q9BkKdXqFcOAnwUbhSiiyvQxDWxR/jYVDaGQw/UDGmoGWen4kQccxYkWEqiveF4by7iQl3G6AHBCKS8W7GnYSCV4K7vYj/CSQ= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:26:54 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:26:54 +0000 Message-ID: <87bkdpfo0i.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 52/54] ASoC: soc-component: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:26:54 +0000 X-ClientProxiedBy: TYCP286CA0001.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::7) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: b4b89c66-eac0-40c6-f02d-08dbbe5993c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mbfTOOEWPehjYnDrtHztpumqLGFRqXEtZ1aHd9F1Sd7CwM+dp6oVqbIHODhb0yqTkoONhvlOr9lwNefr/MDuncIZTR8+Hv1qLgS7qYl1j+DH4sqKgjgseu7yDXfqAQR38DLxM7Gh+knnYqVj9HW3g5vNLMNRVcQgD26HKCsqsYG+V3EAPUJwbJibeNeazWOUYk3h9Jiine5cD8qtiqDdTh0XN7j3So0Xq2ZxfKxTAxqJBmGsIm2xFkMvdN1s6DN1nKC7PPiplH18Exzli4RkeY5CUg4Yi0JsXdydyMBpnRIonb8B5g3FIRcNCu6riq1cJP8aB6dTOM7SsbCKujbcrTKmHXfzS6G4d5oiYZWzverTLXD2EDcOI+f4i1zCODhTPrj/gC9rhzpE/X6CklMaWfebt0aFvB6XhP7yrcQzTE5v1lZCgaTE7/1I4WRphqpCjfpEoZGe/apR4V/BFW6D8X8wDsl2B1WL5kmmpS4B4CO8HirRogB7YVaXXr3IFDxjMppWaePi/nXKWPeD+Ukcg+jqKuKgFfS3dfEWMP/hm3l/AqQdyNvnhOBu/jPhAXXXSeYrTxS3puEUOvdoOG52SEeNOWcsfH2X/auktEY7BSMk0AgctP8/nYC+VaB6DSBAZSchYqgVuoX7dWH357k7Ag== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1cPmNGGHgkfsyKES31cJ9fWtVOo/sAFij6ZKgu2ggD9RHC3dpV7o1ldNjX3swXJ/g4BG91ahDaE7kJv4S+OvCy7BoM5PnlSMXuWP6n7ZiBoa00F9eAa1DV340JNJPK61rmkMfX+MSOayhY1mdteDAYc9f2bRzq6yR8bu80BVgdLs08LBML31THq3NsMDt/bpV2Z8nQlapvUXkV19idDQw7287LziPXATXBjmADZEO8CT8CdR0FrLvJX3jFGYA1ejGA8EZYlSKlzQn/6KUX6aQyIkmf9q1ym7QzXQ5mB5KTMYr20K8GQaqYfs2lV85RmXJXW7EuXpQZ0H2/b5aQrpif8WNC9VaPWz9WS1iMFpDXdnO5UYIhB+8Xcj5lgMUp8wZYVgyRePdexdyRijiP9FuEdhpAbaW8wOszgx2h2sKEGcoGgHhJPSs+wqZQDjNbrJGR3otpTKnKkhYBH/mffJ1wz57MFSfvB/JEWXoiYT5hLfxdLMF+8mUNKaBuz9A8j3AquEKSUIs/HqJ8ybd61QWYsiA9D/QKpcwKaNIethO7bZXj1yvO4aUQsxhsR/AWx0mIcl7/CVBwSAgvirxopc3hh9yU+uQ+grxvkZXxBGStjKLo6rdqTaVmHeZ5ifsIhxy/r9F9pSXJ8xjE/gGkLJsiDOHryQixp9NIyftvVo68vmlwMn0xsz+3fJDh8r00HHGjSs0O/y0FmmovAU8DDqTEVetQgxfMSWKlKcovPCaB0SL3vNOWtRgdXH3n+zN8prpIzFZf1BEVKbeWc8FKKFKX603hQk3cqcpcCBODmvOihUExT+8ZW+NwQ7V8MbMTuDwDHc7bHDy39FD/tJL9bYAPCZPQMe79TTz7R9DcqR41Ufk6DfwGSjdqQap1+oaIA059Xoe532AibzQs2kH11lt1fcNIb/UUJeYKgYL+cx24g55cup7RBqF3j65f0f3t+so4PPBLbm/AE9lV1qIAONKCh6lgiiUuFWRvCX0qvqVjfgzIcxli125MFa5wrPp+m6jbJThQFsDFFlTqYum/leBDspAr87Cv7cY/1NZb2PMu5p5XeGIfL+WwbubtksZrOWnjJ4hCKQ9z7dtv4KxSlc9QQaTj81pdxzyorbTDdVAW3js7/nw6IYduBa5ocW80nJhTOSAH2oZgFpC4R/5p6hnAE8/W3J83zAOewrNYj3dJhA5+M/FzLfEFMlP7EMGWTu38b8PGkhXypoVUamG1cjpRR/WROAcaGfGsxfcE6JFWrCvN693bqtKpSpZSVvfUeAOYUPeztjpu1N9yhGbC1lGR1bhCvO7SILOeiCzijSKEtSfHcLbTJZwR2HgkihVg9wSstQPVGXSZXUU0De/29GSn/DaQDSnGPuJIFN3+C8FwGr+oBZQD7dq8cASTNEpjoGG20EQM3LiphbIgNlQJgyC/Nyee+3aakyaQZkZl8Z7kMQgE94j6Vz1XhX5LfUr5liqmBN/0awxJaPyCmO9U7sG1sXHlDxHSpEjsjV83ZNIeilBV6cyd7evdksEFHmyN3TtG7nV84bCzG/70dJ0tblScsBRLNVCKNXoWMsVBtel0JCHxp/r6X1mdX6pwWspS6tcXXtVaYOvywOQb7CLqJ1C2AnidZ/oBoL2Jul6okMeKg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4b89c66-eac0-40c6-f02d-08dbbe5993c8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:26:54.4724 (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: 8m7+TpldZP7ld0dw5W2Of9pSqEBhMHAmZ7aLQZnuZxjXU6t8Hu/4jNNP6GX4yE14XF8HS0vgaeNQnBKr9PMDm6FtEC5hJOttPN7f9jSVMsx7osKVcQbsbtRazhtrr6Hb X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: C7PVFEOH555SEAARONNQJUYCZLOH7QZO X-Message-ID-Hash: C7PVFEOH555SEAARONNQJUYCZLOH7QZO X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-component.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index ba7c0ae82e00..69198de39e79 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -962,7 +962,7 @@ EXPORT_SYMBOL_GPL(snd_soc_component_test_bits); int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i; @@ -992,7 +992,7 @@ void snd_soc_pcm_component_delay(struct snd_pcm_substream *substream, snd_pcm_sframes_t *cpu_delay, snd_pcm_sframes_t *codec_delay) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; snd_pcm_sframes_t delay; int i; @@ -1019,7 +1019,7 @@ void snd_soc_pcm_component_delay(struct snd_pcm_substream *substream, int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i; @@ -1036,7 +1036,7 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, ret; @@ -1056,7 +1056,7 @@ int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream, int channel, unsigned long pos, struct iov_iter *iter, unsigned long bytes) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i; @@ -1073,7 +1073,7 @@ int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream, struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, unsigned long offset) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; struct page *page; int i; @@ -1094,7 +1094,7 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i; @@ -1141,7 +1141,7 @@ void snd_soc_pcm_component_free(struct snd_soc_pcm_runtime *rtd) int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, ret; @@ -1159,7 +1159,7 @@ int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream) int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, ret; @@ -1180,7 +1180,7 @@ int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream, void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, ret; @@ -1214,7 +1214,7 @@ static int soc_component_trigger(struct snd_soc_component *component, int snd_soc_pcm_component_trigger(struct snd_pcm_substream *substream, int cmd, int rollback) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i, r, ret = 0; @@ -1285,7 +1285,7 @@ void snd_soc_pcm_component_pm_runtime_put(struct snd_soc_pcm_runtime *rtd, int snd_soc_pcm_component_ack(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_component *component; int i; From patchwork Tue Sep 26 06:27:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 728172 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 89582EE020C for ; Tue, 26 Sep 2023 06:36:21 +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 7C7A9E86; Tue, 26 Sep 2023 08:35:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7C7A9E86 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710179; bh=3ma2lXt5PFXHYLaMco8remmBQtR+Owoj3r1Mq5g5JTY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XXCjafrXGSkB3AXGuppbofOPj9yyQOnOwl4p8H7Ub+IZCyaz2kMnAllkWuIW5DnBS ME3CqEL3HRSpclDpvugDY6VnZw+c/rigFrQRx8VoW2wgoKbcgsOCx8CO24MVeULQYF JDlrs3AAYf2lgyHxsVtmRKPyzkAS4IA+Ea/COBIA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B33B4F8076B; Tue, 26 Sep 2023 08:27:09 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 88B43F8076F; Tue, 26 Sep 2023 08:27:09 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5ED94F8061A; Tue, 26 Sep 2023 08:27:06 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72e]) (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 5E667F80614 for ; Tue, 26 Sep 2023 08:27:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5E667F80614 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=S1Nriu6f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CDTqT+dHO1HprocpZuMWb2NL3fTY7ZKVLrkeAizmcBUyRvhUVK5EcRfd2y5AHCFmfp/bJcEXiaUkFb61VrHPvnEH0CJiIOrEwOj0VnYuaHDwSzsfzmMe6QCtHEzDcL7oy7cCKy2iuGLg/ybd224zm2/YwkiIP3vpqjScCCead4MhjHSxRP1L+tV5KGOjQK+0UrNmiRv24G+bSsiEWxFLa4iKd1AaLMpnrH0BD9io68EMYD1ymTjsp/vIjI9P2XthVvnrEL2Ldk9dwypbooQEoanwKUoicW8EpOLvw3AuCgIhqZy4IKQ0TjeZ514DbRY5y3dOuDX41kKQ+Q1ty6b3bg== 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=ieKZK76b92YthWhL3vni/EtsN9v8Qa++gUYAs/WMRSg=; b=mfXA6m9Ewp4B/Ycd6qHl8OXElRpZlVGWZF+zKX6oBEu9jaYvfVcEOQprZQb3wwpNsU5ukYhZHLimOsIkUKmH1OXZyPIf59vB8xSRMXlI7XoViv3qojyOwNLN4z6gJMQF+FLDaIlgC7iEoks1lAvmvsbMvbbfzIFWK6ebNOJE2neQRlDluLHO5jJOpFCuhRrpHW4qsLUwMqeUjNa9XqZvdNUUt2RAW847YHDH2CnLvi13RWSHfvBAYnbLsb0cbbwVrO8FNMFNY5k4AxjRQzh9nLMEXAZIoB5ItKBNtICrRO3J9tJ7rJGkeHj/QjJM7eK7vPZUlZG6Mfip/75LjUAr9g== 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=ieKZK76b92YthWhL3vni/EtsN9v8Qa++gUYAs/WMRSg=; b=S1Nriu6fCnrel+G8ldKSeHrhi5Z2oGGOP99Tcv7weg88V922ldLWoneSqwTaANLbcTPSWumaUV4Qmuzf2zOq9fwmUSP879ElCn3/+deV5i/5Z9GK/4gpJiXVJYSVSkXlViDN7xLOctEhyFBwpdBQfymSYLJ8y29DDVHlza92a70= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:27:00 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:27:00 +0000 Message-ID: <87a5t9fo0c.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Lars-Peter Clausen , Liam Girdwood , Mark Brown , Takashi Iwai Cc: Takashi Iwai , alsa-devel@alsa-project.org Subject: [PATCH v2 53/54] ASoC: soc-generic-dmaengine-pcm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:27:00 +0000 X-ClientProxiedBy: TYCPR01CA0112.jpnprd01.prod.outlook.com (2603:1096:405:4::28) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: e4c85e70-76de-41fa-85e1-08dbbe599776 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3x25K9x8OlrUvorUEaSGUzI6fVOhQoFylqm/5YiUM77Mq90XKXYi3n7SlM6nPIcd3x54s0bh5aUshtvxX3yok49LVqgDF5YJGP3MiDtkQEGZN8MigH3U96VNXrEWwNYMTfW2MhGiIxyl0Lzhrc4/l0D7+LBdALcXyUYTiWRBP0/9z2M+Am5ECw7G8WkAs4oBhtA8L/WapKjAyud0YP0p7I7PtLW3Ap8sYHWRg8zW/y2goEwC2SfJ/6Ki1O47ruiWCRKK9skcIw9zK/Z1PX+nENYySAUcM5Y5EMKIOMWtU2gpPyca4TGh1qtxkKqt/hDkqJJl2AphcEYz4vyZVEMvvzYX3dzWOUaIJcb6T+jhUt595g8mcSebZfazw5INOf3n2thbDqz+LB0+uS/Zag2ZWLicRJotGDjRkFUQbXfV6yHAAARtKtVg0TZ7yl8UeG9XM46O1HvnTyMMePYwd18276LZQm/ZNal510EAWO7UpwVQledUN3/+Bt4nlVZ7gjhXcOkquOmmcdBvIsSt2nJJRUJDvrS1V+H5S2jP1hjPN/22bPWLgs+xKg/+I+kGD5Mz71SX7G4SjOs+qtLx18K17nrr+T2yIX1Zmh04BiB7A3EhqR4kezZ845bXkJBFCkIF1k7xDXLnuMlj4tg1jIxyDAjkaTHu2oV+hhk1KyuSndc= 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(41533002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L9JZFvrPlh6VcO2v7sQSDQCNCMFsZ9rUppoXlQf4pBOxITZVnGEP9/Yr/1O8UNg08mWvqIMBPJt8BJZHYteW6/Od/4y7LDfRBBMHebsRoCeD/d+GN1gINRm9hH0oqKvadgCE+VamH6siWElg7p+QTx0kAb0xrqERPEGmw1DRRHrX3Mq3sj08t8evXhyX17VNlnhQscAMqny+ZJLGZ6LzJjDPZkCile5/L/yKefR4aZoXJaSwkVPdbq2JgFxaEpBPc+dOI3DW9y8KQ2ox36LQuUwS74lgg7jzh4Q4G8bDj4jeGT/0DHehJAApfut1irdA95TDc53HwusMbUxe+oSx6sBkbFbecfgUFfUyOjQ6P4ElzUa8J9JR32qHBbw/+tPxiPiSnFsvak99oSmiLIB3Ko67ZY3GW71jRegpJf3rnPxnofHEFQXJtyk22sUCxCXZ5ydT9uBygopUqqbyyd1bxEaSnbVNbO72atDeSteHG/d67c9YLPqUy7ql2foQdekRLHJ/bNGkeHFxoBlFZy+zCFWYs2je3S8GZjJaLVV9/NlMtjo+XKUgW4WPIel+qowPqtvOVmNxnQ7+mhL5Qu8KzZKnyDUCZO/ozX/qnIL4lSjF1q9YsP/dLT8Dgq5lQh9aAblLBcYWe8OQlS6jvonyYgtPZ1ffyFLOH66saA0n+h1cZnZqXpn2vAEWHORmG20mycl59BsUYcHo4QvlB2RhzmHltI6CS8EQD5X23nr8XqJ/aN3WAZF+Y0J68AkcJBqCOYxuLl/ocm4tOkRAwufiRTnjp+eXtrFZD0YKCqFr3cKvGM/7spd5zHjMKEL5FEDMaxqKIrmUNnTOcUt+bvRY0zDlrTupJMIRLaSBW1Ixjy7P84eiGaJa039fKVa0/W0s7+71W3OHdr/JWot57XoIgkGCiG4IcfTP972+ft17JECxmO2+bz+oprC/jKKwSlaEhFRs4lsnyChu0K+Kv56IBhOvpUZui/o+NN50I0KLVSTxRtmiI/ZVeYV6HFiLTNxAVAKpUXUg4vxfhS7bNqWUP2qqSIctynWr5sxWH6JbHRBqRKCryDrlNlRdj4OqEnJyJCZzZhU0o8rrevGgeTmyeixOSJ0vCLKT+LL2p1INWp6AxQMDErX1ue/xzfQsltCno6AWrDcun+BJV7SCM1JqvHDm8ENqR443MpDhnES89HoSDxCSP/QqNz009Glc1XISGwqD0cKC7BwDy7blNVAh+L77pA6CBr8b1NwoAPF1IBX0DJOf9cwD/3hucf1cetM/C/J9LVGyxpmYlN5SiiCAgTeQL5xr+H3mQ/BRV7S08XVClJ5UPCKNzk/wZPn+VqoqqHXinJOmZIx+SGUF4kvekgAcrKDCId0jGbCIVwXK5MBuAwTLiC3+pGSTBYvP+MUgzjOGZPPe7OOSc8FIb9BNb3eZMe/V5/orv42IneB4tqcgTBYCLlOVmPuX9qpgEzucJ4o0gnnXrr4IEew4rh/V6+zkf2ukGrD/ScatcatevJ145LD/A3qi94OqeAXbEpB3RaJPQXG409bxjuEp37mtT9F78HAJ6xHCk8CC5v8qSEiQNOUFOn4LFYZhlDC+wZ6srAe8C7bD2E7GxpwCqTmkF45Ldt4tlfX1G1MmZm0jeY8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4c85e70-76de-41fa-85e1-08dbbe599776 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:27:00.6303 (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: 9XBnb0/yf+aWY17GDWFUFtBZqr52Mr0GXkR0IzaPFJg4DAW0L1+zjfoWLE3k0inCFk7xuvcVURLErfrBCTVHLiykFzSwOoV6DnYuKP8UMkNAYshW1669FAvj9ttzIa0O X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: ZTSLPPW7FJZI4I3H5CAEZN36NPEUW53D X-Message-ID-Hash: ZTSLPPW7FJZI4I3H5CAEZN36NPEUW53D X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-generic-dmaengine-pcm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index d0653d775c87..63ae0c2310d7 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -50,7 +50,7 @@ static struct device *dmaengine_dma_dev(struct dmaengine_pcm *pcm, int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_dmaengine_dai_dma_data *dma_data; int ret; @@ -60,7 +60,7 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, return -EINVAL; } - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config); if (ret) @@ -98,7 +98,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct dmaengine_pcm *pcm = soc_component_to_pcm(component); struct device *dma_dev = dmaengine_dma_dev(pcm, substream); struct dma_chan *chan = pcm->chan[substream->stream]; @@ -115,7 +115,7 @@ dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component, return snd_soc_set_runtime_hwparams(substream, pcm->config->pcm_hardware); - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); memset(&hw, 0, sizeof(hw)); hw.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | @@ -185,7 +185,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel( return NULL; } - dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); + dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream); if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0]) return pcm->chan[0]; From patchwork Tue Sep 26 06:27:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726426 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 14D6FEE020C for ; Tue, 26 Sep 2023 06:36:36 +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 0296BEA2; Tue, 26 Sep 2023 08:35:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0296BEA2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695710194; bh=DJTwcCgHAiyf9aahDbqgJ03AdPEI2d+kFuvTMkXfkKo=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=AK7HrRwRaOcC3WCJtNFJxPXC0h9JOAbUGqcY2AwCaGPbil5fbOCI3crcS8ND7v3Bo Grnc3xN3ICYAO3uet17e4YOII3NxNI4xZxkQZ+LwNM04apyXQQ8nWKy9P75tQIxAsB w1SyIeZXR1zmluJJs7YbYsILalVUgYHnfRJFwlVM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5CBAEF80793; Tue, 26 Sep 2023 08:27:15 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id EDA6BF80579; Tue, 26 Sep 2023 08:27:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B9E02F805D3; Tue, 26 Sep 2023 08:27:11 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20723.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::723]) (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 73566F8077D for ; Tue, 26 Sep 2023 08:27:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 73566F8077D 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=j0O/AyLC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l803Z7xDNWo/ampSOKng/6ZnoMNMKg9M+z8/XIZu9kEz16TDv4ESE0XeAwN+I7QCN4Ijdqltm3eULhrOTbF3GJRVLBdse4uRwQLk1X15hYL53+q8iGQF8PB+POP1troGpvQs5Itr77KE4nDj9ibxTnfE+DOIZ/TXpmXC/DpFwhOsM2jXG1PeZLDiGUQjoREPURhs8RVBycfLAKKkQXq30LrSMcI/kqJ/EMh76EeL/eWvgEBYOF+fa2iWACIzGKoJwmb5m48ptU05a35cEEszgv959MIxgIuWVD879pdQLgd87X1b7+AwbouFuYgQr+mSzq7RP5avuDgRi8gqvtiBgw== 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=XhbPDGzLyecZQjtcxDPhQKnTYIrpw4VqEMg4HK724sw=; b=BAsiEiDgZTXRmvY3Q8UeokBJhkizulrnj+gW0ya4NBhzCGuRgL3XXfcV3iFgDs8BN0Vfq+7vsLZ0yNqsXowWl3NM1EKw6fksCvt1p5Q6sBVldLj6qNyRoaRyphipdeY1bpdvufdMU8TpzctsV7/UaVtsLqVQV2nrClXeN/ilG8cKSryq1xpGC0JeKKr7xGnWIMPo8QFNUt/NeAUwAIxUk3rRHkPi4UusbSQ0z8CJSyyV+5sZrIvEJjKzlfi7Re9trQm3jC/GKgQ7gZYC7D+V85XlKuVlpK5ukFdrGtWBQJy16fNevdBYGJb/4rAhZisJplyzUErUzW8fGoTmBjq/AA== 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=XhbPDGzLyecZQjtcxDPhQKnTYIrpw4VqEMg4HK724sw=; b=j0O/AyLCUl4l1wdaci+RYo9pEYkmjYiSVjylvoY/oYAa2XxK0Ol+7N+SpupM3qIjpZGYLATdBtghhbLRQhzGfjfgbzrcRTCcNjHyd1PgKVs+PU2Uh3RXIDUkAe89OjjvYFp1rTJefb6CqhhluFBLi7dldwcqUcRY6Ra19mH0UKQ= 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 OS3PR01MB10043.jpnprd01.prod.outlook.com (2603:1096:604:1e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:27:06 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:27:06 +0000 Message-ID: <878r8tfo06.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 54/54] ASoC: remove asoc_xxx() compatible macro User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:27:06 +0000 X-ClientProxiedBy: TYCP301CA0030.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10043:EE_ X-MS-Office365-Filtering-Correlation-Id: 39f39252-04dd-4a95-1e60-08dbbe599b05 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OS1ryRKviXX0Me4/jMBDsYeU2ueN/ZQY+SNp+leGosjlEvKYvtOTPhUSy73cV/8/M3JgmzNz1saDODsI29q3LDQvmy8+q+7dy9zKo3W18faY8SNrAuwYvStoaKSma+SG7Ux9lJPZIJiq4/sRll2IwqMkA1KLFDURm4v60iMZeGAdZqbcstbdcICl7cf4ZqR27CT5KaoxZFSe66fQbPoR03ISU6SDteNlXuGIs9xxNHiuRBQoZWiKW+h1P165WZgL3jVaEaMnyoA9simHfDLC2H1d3QcqbOgfyGfJtbK3cGd0U7Eza3+yUHmXlcpj7LryHljZdTeFeHi0tBWrqQB54wXXVIM6G2y5upLzSnnKjyOpHFITJcndFGvb9mNuxUXUuip5OqpZMYq57+bctgsNXr3G/UnzUOMaO2/8oFoSMhbYxOol7rKwYmkMW+UuAHyH1e5X4DxRkpDGHIlHlH+bQwzWpwe9bwpJEbsLf1LTdQFhur8F+bx8aa2QPaBzZzvLxImCGQXfxLg5uUhXadRrxzZLCLwMv5kKZZ9ltkWePo/+iI+IOgjAo5XJ3hZcnF0EbXuINgydxkWs0CNuFf8vQwALxYXOpIRF4wVoAJ9A/VOGh86+eKFvOrM0nhjrpW1H6wxGwgbgJ0yq7YDFpfisBQ== 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:(13230031)(366004)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(1800799009)(186009)(2906002)(110136005)(66556008)(66946007)(66476007)(316002)(4326008)(8936002)(8676002)(41300700001)(5660300002)(2616005)(26005)(83380400001)(36756003)(86362001)(38100700002)(38350700002)(6506007)(6486002)(6512007)(52116002)(478600001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2Fb7BayGi27IgzvPULkUsIRNr3gRCL3arBvplalYHadXEz3f0I2SdYSs+r7npa9LVnLEWVjCy5/e9rUoag8pRB2y+muB8ZrkDMp3Urt1oXA+09Fpqt3EILBhVp93/1mFPI8eLF3kF5+Zj7QtA0KK9vQ2bM0Y2z1ENBDF7MqKeChjR6flpurDflWfSWFFwKOeOVD0QMzlALQYEFkjdLn3cr9TqA6u+XEqlsEY5/SQFBKuLMaGgRLy3rsue6LTjpMANp4eyiPoi9GUdTj3sufG02iL9hV/Wa2A7FLWYGyJBmoaNTQr4NhTyyp9gsPM3Ut/flC03M/cyGKvPpOWF2zI9UemjIR0QFp8no0AGqjLgI4MrtU7gADsoDaVoJBD9LsgICipTIvW576lqtfkyzQn2cbP3dMaa0R5VBdAkIvpGZ8jJB6qCyBjfGsc/nmDxR8Nd5oSuUWLdoOpRHnyHYTTLoHHQBcXJlg786+iI28RVihVN7thiP8aTv0GpDJqIRDdGEXRA+TUD2s7r5AMFLlkCWhR/r/mmctPT+/tmw4SRxLHdQQG9T8PbJs8ARjAq2WX2vuyD107zgtcpcRZ8mjflAFuvsv9ulFSX/0ubYW7Y+dqZh+gSs2/hO+60YRYZ9iMlz42DLYZIsySofKEBf4ISNTgsU23GT92oY+ML1e/D95oiFUu4fsSsprFc1b1/mqpUwqoN15OB/WhvhVcxfrxKnV/GojlpjEeDw/BiOHX+wuxJArzmWM8fenT044cGlPpnW6khtIHSlUudIX1TqAQJc8Uz5O+9LnCSoz5eEIbQxPBtCuu6Dqdu8g11QDuGSOftQx0knG/M2RyuGJk58P3O6XWl6Uww40iCLUITj3PQf1LUMz+umf+bM98Xg+0H9z4LAgfEGyQP/TNdzlT1hocwWI938dbxc0KWw3v+tKLVgqL2nPaMJKSQwz+9YQ2VU7DhoA220HoV6waFBRU23805pucQDn2enIZpJTmOR+vNtqFi91331dku4GGBlTS4ncnB3ZCMtfeKjVlVfH+XLHzdcTqTJ58Un3OJ4BM7C4bfrdIs0xFB3DyxpELTVFDvaFOr7cIy+LxR2XW/SzLnnrOX0Ao9lhTzhwSPo5WSHkpvmySwt8bhqFhtc8ylOqfU2fACbNLdZ3gpiG7Z1t/znDYNUmPYzCDnqh4YPRuU2OpU2NWGPj2hjluHuK9UWp5Fc0iY5mAZ23gUl245SiPze7a5mvMFZEySbPReI1b9tXsGAiGYQL4W3b1WJ9tzJoRWELBueBzuQu8EqXpCIqdTXvE6g4k09niJXAthprDjF+ENrEA15Q1aZZvQIMxBkV/qNLhWLTg4jxIV+YxeL5NV1wLPu0OzCI44y4391SbZhw7+MAxLZtiQiWU9nmlb1QXv0xtM0OsSdnhnmcxGY25K0jeWk/SzGlgPmHF+2fhRYRX27dnyADt5lICjUcScsSJpGfj14x61zPjvKkTA1+1v4W4uk93CUr3kLOdxOmGJiBJL12JF6OQaqX2UqJ1NSz35z+xzfpRZVK/XGIYvsCsaWJVy3r0FKxKnxQXK5xPdIrlDDu8kf1JU4tOgj4dU4quNcrcd9mWo4yrF+gu0mzpkkc6s37ixtc62gOLUtFwmNZpXwY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39f39252-04dd-4a95-1e60-08dbbe599b05 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:27:06.6564 (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: sS6B/cTrEXU32ckYq8yr6NKSchhew0/Op2fLlRytFo6LF8RfNx0SVKhUizcUAgUZQdCmuu2PR0oxzq7TOOxkLZ8K0LihF4/1VUBCUwc3CSjsPida6s4e2dMl078fCkNj X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10043 Message-ID-Hash: KZAXQIEIMQGMTF5WYOKMAVYQ4F2MMZK3 X-Message-ID-Hash: KZAXQIEIMQGMTF5WYOKMAVYQ4F2MMZK3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.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 driver is using asoc_xxx() any more. This patch removes compatible macro for asoc_xxx(). Signed-off-by: Kuninori Morimoto --- include/sound/simple_card.h | 3 --- include/sound/simple_card_utils.h | 40 ------------------------------- include/sound/soc.h | 13 ---------- 3 files changed, 56 deletions(-) diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index a2f214388b53..2e999916dbd7 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h @@ -12,9 +12,6 @@ #include #include -/* REMOVE ME */ -#define asoc_simple_card_info simple_util_info - struct simple_util_info { const char *name; const char *card; diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 0639c6df15e3..18e7a0b89395 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -11,22 +11,11 @@ #include #include -/* REMOVE ME */ -#define asoc_simple_init_hp simple_util_init_hp -#define asoc_simple_init_mic simple_util_init_mic - #define simple_util_init_hp(card, sjack, prefix) \ simple_util_init_jack(card, sjack, 1, prefix, NULL) #define simple_util_init_mic(card, sjack, prefix) \ simple_util_init_jack(card, sjack, 0, prefix, NULL) -/* REMOVE ME */ -#define asoc_simple_tdm_width_map simple_util_tdm_width_map -#define asoc_simple_dai simple_util_dai -#define asoc_simple_data simple_util_data -#define asoc_simple_jack simple_util_jack -#define asoc_simple_priv simple_util_priv - struct simple_util_tdm_width_map { u8 sample_bits; u8 slot_count; @@ -141,35 +130,6 @@ struct link_info { struct prop_nums num[SNDRV_MAX_LINKS]; }; -/* REMOVE ME */ -#define asoc_simple_parse_daifmt simple_util_parse_daifmt -#define asoc_simple_parse_tdm_width_map simple_util_parse_tdm_width_map -#define asoc_simple_set_dailink_name simple_util_set_dailink_name -#define asoc_simple_parse_card_name simple_util_parse_card_name -#define asoc_simple_parse_clk simple_util_parse_clk -#define asoc_simple_startup simple_util_startup -#define asoc_simple_shutdown simple_util_shutdown -#define asoc_simple_hw_params simple_util_hw_params -#define asoc_simple_dai_init simple_util_dai_init -#define asoc_simple_be_hw_params_fixup simple_util_be_hw_params_fixup -#define asoc_simple_parse_tdm simple_util_parse_tdm -#define asoc_simple_canonicalize_platform simple_util_canonicalize_platform -#define asoc_simple_canonicalize_cpu simple_util_canonicalize_cpu -#define asoc_simple_clean_reference simple_util_clean_reference -#define asoc_simple_parse_convert simple_util_parse_convert -#define asoc_simple_is_convert_required simple_util_is_convert_required -#define asoc_simple_parse_routing simple_util_parse_routing -#define asoc_simple_parse_widgets simple_util_parse_widgets -#define asoc_simple_parse_pin_switches simple_util_parse_pin_switches -#define asoc_simple_init_jack simple_util_init_jack -#define asoc_simple_init_aux_jacks simple_util_init_aux_jacks -#define asoc_simple_init_priv simple_util_init_priv -#define asoc_simple_remove simple_util_remove -#define asoc_simple_debug_info simple_util_debug_info -#define asoc_graph_card_probe graph_util_card_probe -#define asoc_graph_is_ports0 graph_util_is_ports0 -#define asoc_graph_parse_dai graph_util_parse_dai - int simple_util_parse_daifmt(struct device *dev, struct device_node *node, struct device_node *codec, diff --git a/include/sound/soc.h b/include/sound/soc.h index 45e005abe03b..63b57f58cc56 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -775,11 +775,6 @@ struct snd_soc_dai_link { #endif }; -/* REMOVE ME */ -#define asoc_link_to_cpu snd_soc_link_to_cpu -#define asoc_link_to_codec snd_soc_link_to_codec -#define asoc_link_to_platform snd_soc_link_to_platform - static inline struct snd_soc_dai_link_component* snd_soc_link_to_cpu(struct snd_soc_dai_link *link, int n) { return &(link)->cpus[n]; @@ -896,9 +891,6 @@ snd_soc_link_to_platform(struct snd_soc_dai_link *link, int n) { #define COMP_CODEC_CONF(_name) { .name = _name } #define COMP_DUMMY() { .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", } -/* REMOVE ME */ -#define asoc_dummy_dlc snd_soc_dummy_dlc - extern struct snd_soc_dai_link_component null_dailink_component[0]; extern struct snd_soc_dai_link_component snd_soc_dummy_dlc; @@ -1146,11 +1138,6 @@ struct snd_soc_pcm_runtime { struct snd_soc_component *components[]; /* CPU/Codec/Platform */ }; -/* REMOVE ME */ -#define asoc_rtd_to_cpu snd_soc_rtd_to_cpu -#define asoc_rtd_to_codec snd_soc_rtd_to_codec -#define asoc_substream_to_rtd snd_soc_substream_to_rtd - /* see soc_new_pcm_runtime() */ #define snd_soc_rtd_to_cpu(rtd, n) (rtd)->dais[n] #define snd_soc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->dai_link->num_cpus]