From patchwork Mon Sep 11 23:47:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380371 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 B38EDCA0EC3 for ; Mon, 11 Sep 2023 23:48: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 C0D481E0; Tue, 12 Sep 2023 01:47:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C0D481E0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476098; bh=FNU3KzUP+Ljn1Z0UYB6MrA/T9mh2Q7rM3Ec0ZZJl0Z0=; 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=GQ3RuQ8venaWE6KnCTpgDeMJ0fALcfg9R2VkGkKHXbNRmig1qYmCaurgmlwiHw/Fq TQkc80o4daaXMEP9TALnjlpKE2b4KBNL1Ns1soS47CXirflQB3x+Kn9xko28VN5Xoe Woenbj+4J2aGS0FPgeyP+NTqP3TaeDVHNAfGgF2o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id F02F7F80425; Tue, 12 Sep 2023 01:47: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 A7BB2F8047D; Tue, 12 Sep 2023 01:47:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 615AEF8047D; Tue, 12 Sep 2023 01:47:21 +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 AAC37F80246 for ; Tue, 12 Sep 2023 01:47:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AAC37F80246 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=HtgMpEBP ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KXnZU/S/9+hl1E07BxdR+O/EWfHuCnUcT+cmdXcBoQlAlcK7qrUVhDTkh9OEgdtoPLuRsBymWCgX8w2ZcUD213hqpPsTh3GA7F2h0gj2ycAH/+scDb05l78CYDjCJng9/rFkoV5z7j999l+x8acedc/e2rmG+81JK0oRyZWX6F/eckbOzLqzp0KETAQCpYU2s09PwRF7t+Lgua3tITCodZS8DNzKMiKUOGA9pbLf1vO4p4ElNuCzaV+3uPf2rpkVV3To82R0JCP8u81oFbwhmCQIRQBDwsFss5XHUZGjAffhV16PLNJWUCh96veC/itUoHiuD2wY26AEKcsaOCXy8w== 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=C9cggvY4V2W7mAR9GVXepobwThGN1gYNw6ZJPEPeZtc=; b=Jkdw8n95F6RLLiGLB3bqCo6QuNqSqV7SnjbDjWCW7h/uuRRaZCzxb9pPE6wi307BgoPLOxuXFJfL8xnZuIeYL8xwwumrkkX+o1NUc0K8dpCs4MeC++TGVi4bSlbZwEssfFl+x8F6DrFSOm9M44nfk5ueOQdk+fQT/sngpkTjhO87k6cGoymySfefOVUevpsJkAPle2zJO9biY1MSfURJPVkTfiA5XopWUjM6XfenBvDr8n8rUmSgSoLnvZlKJkjciv8WATHBS3RTBsuN4Blz2CbBQU47tAUdt2HkcPg0lyqbZuK1zQm3vWzYDdjKIynLy3M5Vd0MjB8kXmG092hTQg== 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=C9cggvY4V2W7mAR9GVXepobwThGN1gYNw6ZJPEPeZtc=; b=HtgMpEBP4cB49ch9fax3itxbiuAcMkot+Nc6s6RdfYowZ7R4qxs06YeN4W6ABAYHqoyhRol77j6CpYF5+fs7MF+2Q+fMZxjzzWraLIJnq1/WXdSBwxL9OBlwux/f29uQO06Kw8HmC4kBUxWdQxAe7RzD4JRNYdUv+dGcWjwbhFI= 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 TYVPR01MB10735.jpnprd01.prod.outlook.com (2603:1096:400:298::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:02 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:02 +0000 Message-ID: <87fs3ks26i.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 01/54] ASoC: soc.h: convert asoc_xxx() to snd_soc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:02 +0000 X-ClientProxiedBy: TYCP286CA0156.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|TYVPR01MB10735:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a4d1853-2e0d-490b-f28f-08dbb321658b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +eu+Z0P4PoIoP0gytukzHEP33jxvWY7zkBo+ABDYVwJ/NEkXMiJQpgKWoiLD4ynxn3hxwYZxJZbWSjicI8qXcCeIiS06yDpCHu7eTC4pNsxCfzL5JLI794npGKujSTdpThyJwr5E/xw7kh6DE36smkV96Vl+pwsK4kX9h4Ih9UI8sg54fqIkZgyZLtnXm5/Mk6LzI14ynuVttmy6chENNfgT8heiSCMM7tGwVAOjuGXXYtAJ3rpAJnHM7JWOxk/vD8hGQ+hM60MoA1ZZM0z1oTJbtOnaV6DhWFV+H9RaF+7JcozVFyjvflpoz/5fWDQZafcKt0+k65RWBZoAgfPRJ3KMc6CgPEDjSCjBjC6+7PVVrNAK9mVL2jB6zemXo/0IOBEKiysaMgWcVf9FBVoZgAlKid/0MFYJaLMlOoHB6RZRvD5G90sMhnYzh1tLfqiL/AS+X3TkA8nCfsfl2WVheqhbkcE80clySWAXYFcNjtGxl9qlpEsoBhnOArEgljPxHx5kUCLnqNiarImezHSMBnFifnWnA2zbfOwcL7U0ybPeV+leglm4ZtV2aasIXfN9dzPv63qjaWV13+f6VVHC+Pisv55IZxgi+9S/GK398LCOL9iFaH4OaT9ZztiLvR7D 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)(39860400002)(366004)(136003)(376002)(346002)(396003)(451199024)(1800799009)(186009)(6512007)(966005)(5660300002)(6486002)(6506007)(52116002)(26005)(478600001)(2906002)(2616005)(83380400001)(8676002)(4326008)(8936002)(66946007)(41300700001)(38100700002)(110136005)(66476007)(66556008)(38350700002)(36756003)(316002)(86362001)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0eI1nsTvukK6JrHG+916nwr+BuIzxrr9NRILpfjbEWta4wwcoJBG+2TK+4fg0kjzgS4cTXe77XKazK0OL2RYYdms0AbZ8X2Ole5HRa7Toi3tLWaqVMmmxxhydPJJ6JsJX4v0gqzk6jKtT8feoQs1/OD+Om93xK+WJUI8/pRtYlrmHLJbPtYX7N3h1AOmLXY4MdPIU81J1seykS+++lFzJLd21JVEWada39saoN4/bFFHL9myGX0h0Rr3IOzlhTOOdubqT/O7vJfFHVJKN6Epu2kh9AFSOiCjixGKTUWBYyjRKUhl2yoV2dD32ifQlChVSyeUTYofswN+PwKSJI2JIS3+CKSdzmRPeQ5nYaEsL1xS8UgscN7mYYAhHvZpswck7/MSt9AWb6vQ8P+2VGXGfzl1jckzfx+pOCdjlPfbl0kihpRgz5o3cLXbhfVFfmugCQwBREvDBAOIl+LR4qbzmT+t/ALtEqNoKW73uiSlBl4j3/A+Jrkm+DoxF/J6u9He4Qmhax2n+psMNWiSOPPKbXzhdumQWpeCo/X/iZvdOMteWqHug8lMza+TDW+XF+u3jnwaK2IWqSzsOc5EVQCXsTyb7LkVKchKRkQb7GI5hfzSN9P+QEHBnSBdCR47Yh3pZ1N4rzUdDiBE2PA5vFF4fny9SkvMzxk+jJpFQJotF5K27tNNFTNUnCFh1A/CM37tP4Zt0PvjRKUgyKZn6GQ/lSnGDOZTZiHx4KG0DzcVxTOQoWTy+LQ6o0LZAZoKiQtkExcAdPBeT0Ldgk0HMRXoQal//qybj4Al9yspgxPIySgUyA081FszKuNCaJQ7xkTCV7M3iGepsmAp45NClHzNQaftm9p61ZZPRwE8Ws14M1WkSE1ryU46BBXkj8zf/F/TBaV52SUmpESXyBobuQOIy8RakXtceeWiSsSFidAAtLuVewNb8LLr59/xyeQ0YpJZlyNMDSCMaiUR1VnVdovd7LRF597Pi7L2o8miJHpS0ubJY+B9d+9ZTngCkUR1Zpv8ofp85BqkaWSXSYGVXpO84WNk5pjw9t/X280PSg87cFxn09dSaNBWr3RwFIbHkFT9tpauOiFeMfH4Da5gyfPYLjXeFo2EOPstbPzb9hJCPMlr7I/FIAtBLY3y4aecygeqL7rYLv0/R1u+HCSp5490+PKYuihA9ZXtwe86wVGskjQcRUcqG5omRPvXJXYr6jvTqh4DJyLkPqE2/m1idvPDzhUJX6yc6UlvXFoB67P7rNwX5MWQeFAOQyPiXMPX/Sn0cK1LDk3ePFLURUkEtB0prd2S23ws206x5aAkFfJ2TP8fShUtDxTZiFjoCdU3rZGvkJW4EZyEtzt5N8VENYOZOcgSQFFHW0+bz1qAML1aDQ5dz7f9fmFeVVaqVxmU1iYISZjf2O800GWd4Kh1lVB/wS4MGEHgSX+9sAWmnoaMc+AOeHJ7ReC+/1FGoS4oI+38E9uT/YvEI9T/yLQO8xSY3E/hEE3Pzsr25LLkG/HtEABQtSKUKpAMeOh2klilAUTtxbQvsKJxbuAPDFUUJkf+N8kZ8PyeMf+WN0vDS0Suuuf2xZEDzKhCiVDXyLdMamGzDy3tAVDVUnTxMP9vKdbtx+iQtKPWljWAuOGWSxLlUDM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a4d1853-2e0d-490b-f28f-08dbb321658b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:02.3058 (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: CfJ8AgvtVi7cwbsmqZMU5VXUves7o1dbsVlYuCAEsJc9H+zTHH0TeCntnRrjh3lR0CAHkbyVN0yd9TWKjtacCeJfzAEQ8Ss2yTemB0fgmUf310UGmpt+vTcgEvXCd4Dh X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYVPR01MB10735 Message-ID-Hash: X5J2GHSI6MGSKTEFYVUP72CO4NJLO32N X-Message-ID-Hash: X5J2GHSI6MGSKTEFYVUP72CO4NJLO32N 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 fc94dfb0021fd..d5db10a098653 100644 --- a/include/sound/soc-card.h +++ b/include/sound/soc-card.h @@ -78,8 +78,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 fa2337a3cf4c7..2d0e8801cd485 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -774,37 +774,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)++) /* @@ -894,8 +899,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 { @@ -1102,8 +1110,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; @@ -1129,10 +1137,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) \ @@ -1141,11 +1155,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 11607c5f5d5a8..04f87e998f1dd 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -224,12 +224,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 Mon Sep 11 23:47:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380372 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 A173FCA0EC3 for ; Mon, 11 Sep 2023 23:48:55 +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 80D39AE8; Tue, 12 Sep 2023 01:48:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 80D39AE8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476133; bh=hwsl7Xhg+n6v2oGxap7hYyTor7IYciqTwYTPDunoiXQ=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Proxp0o+1uyzg6OC4Y+KZH5NazrA+Z/sfZx2a35tXnXiDeZjpo/uYJT/JjB5OtoNg bC8Wx+z2x3RGVd1Fd2buQVqvU6yDLyvzfXB1gG/ZmXGcAH8YyjEgcfSQtUUFdTQACo /SOWk/q24kdLWbfZC6OcwCRQ045OohFMw1JMsm2Q= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 82201F8056F; Tue, 12 Sep 2023 01:47:41 +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 390DEF80571; Tue, 12 Sep 2023 01:47:41 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A7478F8056F; Tue, 12 Sep 2023 01:47:37 +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 725E5F80212 for ; Tue, 12 Sep 2023 01:47:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 725E5F80212 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=Q0iD5uXA ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Inma6ySVUMsosduY9Xna4Hejc6pyzCu5j9x9ZQau+IZ+dIi0mBejkn4+GnR8Tt8mjf5n1WhmQF1aaxZQn5nkTSdXa1Ebg5cx+3DZAWi26lOwJxTEc94K1hBP4Eax51K8y4TCr3Gbx7RQCnRLHDvRLSaH8/PAaQT5hI6nnH2xtV8Wu1vJjuchQs7HREXkJ3Gq8iRJqZgSxnrHTlOt4zod45iwGgKmts0PAahk8lH7MdTyO/LRYTbaeEN/q24CwiB0oaiLlTqz2I0G9gNJCSXgPNq9jOo5XZE9igfGH4iSpoC/9AR6sLKhn85Fr3Cg/+w4NPjzbj5A3gZc9NeA+lqvmQ== 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=SqPc/JXnN3Jkey9DxUTIYFRoPVvd+iDdh1dnefoeRMU=; b=iDeeyrKQ6PAkJkxem9PDAoew4DQVOzbMVtpJuNBi+hY0KQCFJLVnylRZ/bf2rARxEXYWNsWqOtbThNgqjhysD8sPhy7DsG6CqyBV4g3f0lA+yaHcrd1uJMry9nyoWgnCtp5YyF6blGD0d5sCYGTNorkprAt5RrJQzbPK2qBexXnX+y4byIvlYQucXGAuJfcbEjyXo0ccUIFQPeSpprnRc6xHagoD8FXcRdiIGr3hlIrigB/yTG3Mj8IWfr0MsG7iF9Hgsec5yRwI2zRMJH2YZHWKIZvHlnMq8FXVfd0Vral+l90q+X7oNVMhKUMzWpfu0o3SSqCVdFLGyGgpjMlicQ== 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=SqPc/JXnN3Jkey9DxUTIYFRoPVvd+iDdh1dnefoeRMU=; b=Q0iD5uXA2qBtFsW4HcQWNYmn9CeQiSjOaPRxhOsOAoPe3PXWsvYFznXJ8WCYwj1omo8QTWLHHhOTO0U2l5j0UL6Pn5xfI9lmKMxn2tbfPVzMEGTz3aMFIAacO3la2oj+pLV9Lco/LEogJtVVolWvP+ajGzyehtoidQf1tjiBk4I= 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 TYVPR01MB10735.jpnprd01.prod.outlook.com (2603:1096:400:298::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:10 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:10 +0000 Message-ID: <87edj4s26a.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 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 Date: Mon, 11 Sep 2023 23:47:09 +0000 X-ClientProxiedBy: TYCP286CA0151.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYVPR01MB10735:EE_ X-MS-Office365-Filtering-Correlation-Id: b56047c1-51fd-4237-ac97-08dbb3216a2c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K4BwRaX91/0L311fm6I3vG8GOfKxgveCepRE6Z726YfzorGs/QuVV5chuuPSDCP0uq7yZl1foBSs4hRBjJ0NaOIV/5Owek6/vrvqIhWpmaIOQ9ZCGtlVbOXmE3j3jbDx7QV32eiNzWo6uYZ0/tpOvvMGlU2ojM/ozaFJUBRDDJLIJb+bEJLyqQM+685l2X//ruDambMHIF6GLRUNxxi33J0aAHcX1/Nc0dKClgXxCVnwxkNvxYbGLFF8XzXkgFQ29WEKbdwO7qtYUv6ZUUnM3OMm3StlReeHiR2BOohslW+pVd5fOq9BRaAFWIiyqMYyzA9SfUKiNbEe+4XYR9UZkpnxXocOl1iPNM4BVNk2Chq3sQN9F1ySIwvhCZGOSKGugUddLzbpiZmfp/Hm5+GQON6xzbqNvUTDUiXBUFnffd5q0pDa9lVmTEgvo/lvPF3v/OOlGwh09QWX2r2497ffglj91U9AVRoYs5YsnFnXiTeMuBpKAMxek2QAB9/qKpqE940yP5Zn8qPJdAeCOIRjCqcZpcCsZ+995UP+T+ad8e9wapaNqAVo4Gvph99SF3kdcvWMAyJhIJ/hgBvm9uNjR2oxUw1egyl3GIH6Dh232GFp9PK+RsaFnIzyOMfMiKgTeakxuCf9s76I1BmPaLBrrg== 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)(39860400002)(366004)(136003)(376002)(346002)(396003)(451199024)(1800799009)(186009)(6512007)(5660300002)(6486002)(6506007)(52116002)(26005)(30864003)(478600001)(2906002)(2616005)(83380400001)(8676002)(4326008)(8936002)(66946007)(41300700001)(38100700002)(110136005)(66476007)(66556008)(38350700002)(36756003)(316002)(86362001)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A0RAtpnilMAmJVCxASZerNHVYGzIsRPbh9ZdEuTkUmFdgR0sXlBNRHaHqE2qW3BL/HRE2KBXEggH/gltfjY1DeOLY7hIwJQ4TGaY+49ng6sNSQTCiQXz7frFi0+uS0it0ILsr7/2RcsVZE64WENk3yf/+TNNlKsPCVJV+YxbeMn4ezFzkOQKXC22yfZ/41hDiJn9rUjjiLzL763PrYEm0Del1BB9RiBEm7X/sr6h6WFh977bNWXV73m1o+eJanmSCNL9Syuyji6dm3hqSbqVzNf2X0gC8zJM7MwY7QEuUXmhrg9oE6il7/WunDONdPK8sbS3a2NPVSUa5EmPn64gLtBdmgqE11odNnX+/ZUxk39dF9VNjzakjjkc+cbfbpe7n8kK4Tdjlp718WVcj6kVD4jirHFEnn8YTqbvYsoUFWWaRsnCENVx8AUaCu/rCaaTKiEQPxNSnt0TJEoXN8VTd4KPnfwph1yzC8QmY96wHtrR8aBebCHKwgFS/TGSXEqzBRNFOE71Phf48JsXovDlqBxnw8qw3suHP1XasVtFjQRQjp04uBuBeqqWC6jDjjh4xJYdCKR3wgdLtpjmKjpSJkxucxS6DtONf82Me3wB7rThSQ+zdWfqspP9QmIAX5V6H4/ngnc3U8mI+F+NrsJh1KJOrXT7ugsmrWIyCPfRlcMqIaevBk+a0llr7AEQSCZlHHvhQuH9HAMt+RVcA1v78EOH4wSmeoqQa/IzR/Wetgd3XZznqG3S1/3gD1GOMiOxy/+xClUcqWR9SxnKGwGCUAmp1rFVQ5PL4t5M+zS+cjIcgJxbKNDvU5Cy3j2nYnkdNvNfvX7A+ZDSWTzlM5bPEFHUsf8O9R2zLA1cjYWhqIlI58xht2PXq/ZybCUGX7rS+FHIvh3tJCkIruGmO1ZmcYo0f4uzA6AaWGzKxWmVdzd10czCINGhRN7/gzWOBiB7Lty6EQHELrtODgnoIKzGFWbBHqvT/9GviVutigyz+IYiu76NSTGZ9Cv7gqdGwPjU91sSjMRWFuUguFBNWTUcPn5C+tgbdbKe5Eehz2ww3OyvHMdwL4QY9Ad+YO/TM3qpE1/O/FU0dLObwr2iVAEh0SXWsfDLf0KBEjH7MMKoFST0cYrhvn/jJ6Fmz5rxuUmBiUqRM+VVykM4rW1S1rRoqDxOtUyhp8wAwN4AuZVIvA8dkm3DZ7TgKGbHkb+pFjWh4FAw+3LDdhQs9rCY/C5tgb/VHFYCsCRWa0wqWvirWd/IJCcPahUR5xS2PydfFLlxEBnwB+PtIlFinB6uqw3Xlbtqdp23tyR2gMj8BFhz94Kx3KpVAeIpmjkwYbj76WOf533bOqPor4l5+Pa6k6Z89Z/N3kVmDwAe4kYwUPa6OLNb4osqbQoRLTZ0jQ78UKpigTjoz5l72cL7MK07nDN7vm6+OvgaKxFCwZuvOXJrjaC6Gi8WNiZ+8MKDmdGfvjDfjun4Uoqj4iZE7YxkKJw0sQ9DToltYOQrc8kplKiuqEVWPVl4awSlm4TnWkOwZePWhYROrwy6+dE473J7r04/OHYnskwPGCstk4eVrkjy5dJgi3qiCvjx0cPRCVMvPHm4vGRUH6crgks9+GwBt2Ve6U70Y5dMRZrhW2v7I5QLppo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b56047c1-51fd-4237-ac97-08dbb3216a2c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:10.1329 (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: 6W4nPJRHRfe9Q0CYj0RF2uiRcR/B3M8svPU64VvKft6UHiLqTX5mLfnnDrVVwsZ1foBvup6W1Hb15bZc02RY8yShO4yXTR2elDgSgeRUXhAV87zWt8DNWt0gUEkqaR79 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYVPR01MB10735 Message-ID-Hash: JIGBBYVWXNO7T6ZSN2PW4DD4ZXLGMDKF X-Message-ID-Hash: JIGBBYVWXNO7T6ZSN2PW4DD4ZXLGMDKF 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 4c8b94c77b8eb..8e2e15dfcb1ef 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 d264e5463f22d..a2f214388b537 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 d1a95bc33c569..0639c6df15e3a 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 5b18a4af022f1..ecbd26dd7dfa1 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 Mon Sep 11 23:47: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: 13380377 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 05C64CA0EC6 for ; Mon, 11 Sep 2023 23:49: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 7506083A; Tue, 12 Sep 2023 01:48:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7506083A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476149; bh=77x4T7jbrePqHgzZDmgx/xADihMevFK+SMxAla3KrEY=; 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=tzOaqBAObeuire8F/+hgKSqdng40JruFFn77NZ2k8wMTO8Ux/5xp1OZRqzBiEr8LU NNzdNu1oN3/LyjjRcFSGnJR4LQuc9FNtHH3jOjgXVWZoSYg/oIG6QkdMG6xTuOoJOU +dL2EnpUmrxcFAVyNj1NWuZK38T1WSKYmrrZVUEY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7A9ABF8058C; Tue, 12 Sep 2023 01:47: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 1797FF8058C; Tue, 12 Sep 2023 01:47:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 58846F8056F; Tue, 12 Sep 2023 01:47:40 +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 8E713F80563 for ; Tue, 12 Sep 2023 01:47:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8E713F80563 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=U8i7ZC9V ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d6nsVuXxqZ4+dDJ9PzjPRigS8tj0mZtLlOHV4BDbE9kiaDmAKvv2MXzFlNzCNbPmihXf4Cnvfd3HdhU0H6sCr7kTGKUuSiGDiv9QdfNOSDOX/b5rX8nRYQkdcST1Lcue6SXSpgt1DyBGVequ1i3o/f9TTPmryW5BUgl6ezl7oKJxkfHePv3WCaLcmtvAR/aGkNz69HvycH+arZxQgUVjVjk3u09gSSEgHXNHRnDTDLUbWc7y6H1pjbXFlJonCcPujwKWKnf+ecir3fudxBmEzjaZxeYV3e7ODDmuk6imI9RTCQWbOv6C9X+Q860gmJr9cqw9U0qUn57FqcHUK/v2KQ== 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=mcHk0xurqEharrJXIYfcCJOL2R1QxYDA/bjKl69Ptf0=; b=G4cNNimorNpCQbTVSrVZdREzL1ehNWvyAzdv2XAveMHJcPC4TksQ05BtgvO7MJEbB+GsEpEcuI0yI7yKBoYAmv6XgjpmPyLiBRy5X+zIIfrvIjfDwrVDT6Elttwijjk8tAAwEk2QU21bsGePTe+97n/TjOUsbEDex+57wdldu0W1hxLwyECf/FAFsJNsf8S7bCUmqOxAfCIQjyOd/TDgcHR8iYix4dnwh8nX29Uy5MmBRJIcyQJylB66pCtZCuo0iPfJM9ccE7IlQlwofXCYWTC0xOpDRDwXB5MFiuq3b3jgDtRttepO8wXG3/F5m7o8GPlFIEiNg1I1UdF7ytPSyQ== 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=mcHk0xurqEharrJXIYfcCJOL2R1QxYDA/bjKl69Ptf0=; b=U8i7ZC9VqajQ0CjYccQ+9/gH7zeBjWMaBnuzeh9KtKb7RJKPRTYF0UL0Ge9yVmSbSSjKMZTgy6x+qA2XbQXdso8UqD7TMhHKBrm89t+0qgOTXDMbiime+AE/o1FuAUECuwBbK0rwV/TDmzVBoA/6Ku07X8LvAE5wVl6aKJQ3eCc= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:22 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:22 +0000 Message-ID: <87cyyos25y.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 03/54] ASoC: sh: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:22 +0000 X-ClientProxiedBy: TYCPR01CA0176.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: f753d632-21c6-42a2-1014-08dbb32171a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fF6xqCLr3feep0jD9tOllTriOSmbpeGob0So5toX2mVr/q5+NvVDME0VciKxoyv87SGtqHIIUDsZp7pvddfft1qRsQC1mHQ5iibFUW4aYz6RIajYwuxDtqm5x3IUSAdmLXhYYq08sZ/6AcBRHXLQ2xk3I+3NoGi8QvuPQVspnEAK8V8znRDcZZTM2YiAbtxxWse54+MbesLKKaKWGqvTBpkcSlQJG9XpZG8hWZmxkivBbasoYnaS4n7Ad6Sq/GMcN/14XpH0lw1CoxV0/u5Isb0XL1mlPlpqEUGc1U5Ad2XK0nfbKNsrcJSQfxfL7lSLPd/jUIbDVcDYm4b6FgUmcdnvRss6YW2+iUkrcnwHcMD7miBf/PH8WaUCfc5yscmkoHQNumScokgvQmpoI2uixSdnENdEU1aG+kqeTylkmujtANdmSK1TprJY88gPmOmo4so5tkXdadL0w1pGchHFAWIWbQN9lyRE2CKWfCXGQkDBjCq9wx0x56gizWW17UzH25q6RVDKBwiCf0U507k5s6oWU5MpSLDImF+mj9Q79oXfuRRs6E2EOBt5klo7sBCg3RTUgyzjabdEKcGcPjMRaoJ0de7dnKeG99BEcFiZtlhFN5ioHbIURpQQJvZf0BN7OYNP2uRYQykZqD2W+GiiIw== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HFyAOdL7oKGp7DIjHsf3LfLJVoNzd56MYcLJMO3G45IILQmJbrAPiLmNBXnqDNT2D1EaA+4PahWADlGh8kJAAUSSleHdTO71zWORSVcG83t+BZ6tsmzpDQwIg+dAUPzocNtNmir0S1d7TTl+OVVeCft/U7SBc5TXrI/MJpsxOvV58mt7cpUUSZOaB6xDvyJAfBYN2eChGF9xV1dTWCNPtGZEdV+2fOMvNFfeRoQ/VtftGc+s8h+3vmihyQHDCjgGuXjadKJ5izDC/eZeUH+T+x/Ouq8fwqn2pHyBy2eeUASgJ/WhHXivjUDrUcHYGqjzDtXOpmmfuoAwkC2bRvvagi701VZflN2INjv2Ok4mPkxIZ8n9bSpJ35Ez3JvBREJ3xWre0pgvIwqQOuqL4CdfuEjHqEp4ZHxyIRyn3xJDW1cddRytja98b/hiSjLz35sLhMTj5c1RWupGN0lqZ0Jp0/pqYC1KHbgsX8af6c01hGOXUolsGK2hDbiqMYybVm+KV75vbzvTxbKqftgaV/diDxBaupKwrLNjST97lbGvVrwrygvYbpIn+E1yMrnj9GVvIwD2biRyHriTzxqx+gkLVWgFbuIFxT5vg0EUI4l8BARKo8ngV14DNfc6g0N0qvP6LcDfS2KroUfxUkdG1e4voFyhA999c/V5Pyf/X8rmBcAVyKQPBxVSkAXxkzWcyofT85PigIiNU3kOdy9ZbvHHo53sjIAb3RagfdE6HtW9+O2ewoZNI45zDb6614OGN6DAgoo1/jCkM/om0S+iVIsT2x4W/sAONPP4EIt+f6z1Ayq/toMK5dYnmxEX0rvcrAFFYRq9LHg32eJJea8B5oEMOKPiugipM9v/vfOPA19MFZtVO/2BvcGWus8jvt8U/oUlYh3AF8XJrc8cJZEtPz39paJRpeZNhVSDGGy9QS0b6eDRbtzQsvBjjzxgcUuVwDygjxMFojLDeWfjorV673XfnQS8WDZR3GgSe8ON+PiRV2GsXUsvhpxGvAa2QSqQ5PmgNVYfiLQBZdYrxMh/JLmD2H2yuhn2gCgaC0ugQZXp1rJmItVivjIdUeDLGn2OlNv7G7l6vgwBicuoaweO0KfqrNWXEhDuD31APLABk/xHJha9ul4BcWIvmAc3LVShRM+6Oab+fwReFIHHBBLkqltMirx/FwaQb+KBx+/1X8HXvKdbXMFBEr5sOW2YC64nfgEFrMRWIy0FgiqncjmXAuIWOyMQWE633OYU1dZbw1sttrtqvgOV+tW8qGBd1cjEE3wUheqnj2dUSK9uAHMxKxF5Co/Rv11skmmTfU6NcqM9l16urkycQhRk2hvZiQ6zA1E636Lilr0F0oTAISvZ8VCVlBviZEwT9BSVMerblFx2TJg1stxLiOMK+rCFWsbAqtLEyIWgX24eyTh7K1UrjRR9H8EOhVHG6QTi/W9cOQEtnjBf7VqmZWl6bD2oazEhi1feTW7SJ4pRpwsxXNPMlx2huAXKvcbSkcSKDeIKZHh7x+MxhxxcwJtVZb15Jxzfa0xelwqfG5SUkw7oepPfHgb7jtDyN7+vemSCvDoOFAHOLZ9nMBUUBp6xW/bFqh0iJ4MYES7FkS/Tl7HPj80lurGUbZr4DaFZ60P0UWnPEYPmZ4Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f753d632-21c6-42a2-1014-08dbb32171a2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:22.6039 (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: owgqlj2uMRqPokAxq46p0oJQ7fSV4YzUus2CEUXVjgoFv91xMER2rJDF8c3QF7GFiXNgIBqW3AZnbeHTWyw9CR+VNzZLlvfgIIsWCQs7MEe6hlKKhcpwdvs2AeEh41tO X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: GO736NI6K7NINYJBFGP5ZFBR7HDGDCDK X-Message-ID-Hash: GO736NI6K7NINYJBFGP5ZFBR7HDGDCDK 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 121e48f984c50..9e26df823b763 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 1051c306292f8..d0931f4c9976d 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 7082c12d3bf23..5a0bc6edac0a0 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 e29c2fee95219..844ee36b03b7e 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 fe79eb90e1e5c..f5f102d878c77 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 Mon Sep 11 23:47:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380378 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 57512CA0EC3 for ; Mon, 11 Sep 2023 23:49:32 +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 B5ECCA4A; Tue, 12 Sep 2023 01:48:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B5ECCA4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476169; bh=DaDaKOkI0S2LOt1iP2n0nZE35w2vUva7t11tKVB2WOA=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=SgNMFO2hbZz3w41w8mOFep70u5fCArKA5YluhLWmJIFUwGaNqZkcLgmf4Akq2eo3q Km6P22wMMbgjjxSo97bd3Cew+1qxoty6mBYGD+BIgurg4Ahv/aJXgezuruTuCXrtTB d1zGq8jk9pijXLStjuMcNNiyWMa5T8m1UEvpw8g8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 245E3F80567; Tue, 12 Sep 2023 01:47:48 +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 7E28BF805AB; Tue, 12 Sep 2023 01:47:48 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A49F8F805AD; Tue, 12 Sep 2023 01:47:44 +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 082AEF80567 for ; Tue, 12 Sep 2023 01:47:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 082AEF80567 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=Ri0/qsCX ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jU4Gn76zvb6GoZx/VeFF4bc0quPSnVmFf39g6xI+tiWVCM1Oj8o4z6qpm15FL00TTHuCzpJfjhuQRHhwBX+DxfQDSP+XSMsS0LPWhOvNPZJtjC8uJwVi5+yj5o9a+/dy8bdASFsOPMFM/XP3vsSPdHMm/4cFRm9uaaK07XqJ2cGEehsUFqN10zZff2XethaLEt3DgyK2CkSHlJo5u6uX3p013ECR16LGEEOfnZUTI2UhlAgkm9qWeAXzl1nIxD0O/47R/pTsaNBp0v7q2JhDp38Keo8GW8db++1715m/abkviLpJKiKXLGuHimzXZzLfV5AWvCoXVQbcmTNEk14Lrw== 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=jqkDkv2zzlQEmAnav/0mCg5nG4DVDsDoolGyDVifosU=; b=PD43cVBrBo9u4C4yN2ywJWhLT+M6+R89J/WYRo99+YY2ELk/K45uMeNQ0fyL/QJqEYrt5ybsDok9iHc//75+JyTvpYqQGNHUlntBU69yw3ICDZLsnpFSaCGajl+Vo75K/cE6ZnAAVY9Bfty77NxjTiHhS5aOsULc7BoeYRYNbTVGiJwE7YMrNcMQwPW7mAmCZV/SOW/xEfQyQXEOfgHN+/LzNMqA0XZTJx3vPonyzJy2FASdmI95WpRnJL/pnh9HGj9ZevhhGY8OkUYm7LVLrAWcktu4gmMyRMeXJdXL9YgHlPdPgPBALn4ecA7ppM9iE4+tTBJerHvNcxxj+TriBA== 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=jqkDkv2zzlQEmAnav/0mCg5nG4DVDsDoolGyDVifosU=; b=Ri0/qsCX5MxyKvv4yLFHV/YDzdUkvhjqSpPQ0GJ2t5+tcr7IuLlzjeZJ/PrJqx07U4Ud0uwT9Y5VcfAuXR94HAFe2hyuzwHw0z2yHZdn1ZdqU//HKHi5yL1DbwIsUdWHeH5oB6ddbkYRxLuaY0xAOyHh6T3QhR9JJCw3L7zNsZk= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:29 +0000 Message-ID: <87bke8s25q.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 04/54] ASoC: ti: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:29 +0000 X-ClientProxiedBy: TYCP301CA0034.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 113dbd80-2f8d-4f13-2025-08dbb32175f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /sR+MAACL6Xxy7qS6l8Y777FMvTMwgn2o0ctt6Bdcqay92hRZgAuFrOHBMNoWUiapy+t963xP4157tCjEYFwsuzo4j5ktYTQG7MsqzF5YUGVl+AgboBadDwzmthpUFXHMonOEWifmCU4Y7HxXjS9El2orYJy3Auh2MRAjo51PciVvJmGJeoxCWKKNDLxjIcquotg0EvlevzK/4NCLMGIERa10CvYmgpEPC9e6wIgHNApvDcyucBbJEb+JR4JGFXUHQkmavjcFys5maONNAaXmBZYEqemF5sIrs0QvkSYfVDAN5hzZ6DKwDUyusl0zep05ADcUajyHdyAgNmCLyl+maAG0YXH0hCqNpu9DhqWz/5+8vz3ikUmVO5DS7QW2EYASdSLHPTinMh3xBCb/UWnz4wONt0efd86aLndH8UZm9hnIeUO848+MfDv/EOgV1jGTqKNLPJngyKiTtLOmsV4zmMFqZtYCLbHAZYS9Gq7GS0Y+o2GJyCFwbdfKlk1Y87bSbalprgUcg8i0D8Ha+GOEloPNF4z6nJ1gX7zmDD6+rgxQWhx+XhG0Cqy6Omxd38Rwm6ck4PJ8Q2vTvUM4muTfEbjHoMfkgloN2JYAt9VSngoHMYPPSgggYguvbYrQehQabhEoqkTERFioJLnecIIbw== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(30864003)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YqcAGXPLxXpg0ar/mY5U9MMfJ1JBNchf8jgVu8ZgMKMGMCLu+s6vABvvKz3gCMMTyFUB7ye2cZw7w4/ArsSoYg0BhBOdqC39aaKonPj0GCbCcuEPAmMGs81Fba3s/XuFDK1XxZY9PLtUeS33byFTvOFSoYLPcz5Csw2otEOF3vIJR4QureqJJNZ+hJPe7/Vld5JyC+hqNhXjJ8Gi7RsmKE0HoLvoBAVMqwh+fZXc4+iNbx0tqoBLpCwHo+VflwpAIjdpS1sebiglVxyvcXD8I9S3Jyn0+XOokqlytySnLmDLEToAjv0e8k4bJ7w5iVULOefe9+rdFr40Hix+w/344E9yoIwahHHNFgXwkoTCGZJxZCCLsuldlQrv8eyQh9zAyLaPziwkIt0GSVdtBQkp0uIjrNzVgof2bBjdNpvasTwHXndw62P05cMDpAlhqqWmMxhTjxtrGM+wmoE4ojwBODytzJsoMQE+zvh2vn/KxtQGoVA4E5+TMyYF0GH/tC0Cre2/plkY5x5sW2YVrwM0L5WV9l21FcVOXzUm1I9Qhl3WdFVau6jH0xYc0KieIJuqwQN3obiYGW0lh4QXVQ77sahO7JjxWabsQsCPkZ25pjEMGwefYabI+tZbqs/FdKqNXvix6FqlWy2gydU3AOLiyjLUzRQDj9MbR853hubCsqUIHjvU+vPRKt1/2LF+H4G7wrDwzCMqA5nec8oytILV94EPCWBpSR5kKvtL+wmtdyZlsKyCOF79bJ0ZH+2RYmpEkMMqFNJqoWXC4aq0NlD4gTmOb7oFdsM+5WzS3WjHmpr5EQ3T87elcByehKcqXr8jxuulMsgPCQiK49QQOBtpYzAfjHc91H98aj2ec5uCh2NH/1qctZ4G0+Jt5BfrRW5X9KhbGPOnxNVUX5dThjbcf3DPfE9gf3DObSjJBiR/+n7ACEIzII9CMbJ8NkKg0KT040pJKEriiBWk2C9CsqlMiNSQOGBiK8DhBfIQA0MTt2c/pl3jKYCV40ukNQJFAaRkJ0gOfGN/V8n4XlLUYyNsF2gojY2qMKyf37kiHwX6GZPUpDxYRVM14S0oJlR/YSAlkdYrs6yKfw52xZnaTaewR2DYM1d3Atx4XdNVTchBAAilYBSjggSNBrRcATn73sq42z/I0tQUtneqaKIlh8iEVZN6JXzHnnZaAWwfnMnXOC8eooiberSEL6gq2W/QSH4C9u+cvGZYgZ6qag186m7A6/DXSnjdkPdceGAxox/g45t3N6khAhv+1cxq4WH858Jax624P3cleypej5IffU/H/5dmG2kG9R/lOecV87/28GA4GH0TzQcY3EmwEFSF5+EpayzzvyA6QAI2DCy7aqux15A7jr6N1/jbNA8p3KqESN4dcAjnwG8luwNBPn1SuB9FWUlMXYOhlktu0YVRhC9XDi4rDAU/b18lHIl/2I8DB484KtcXzAKCCfmbcTDNdFgk0l4DzFh4vHYwDJ3791F7PcfA7uJDrPrPYFXQk3RsKRfh2tTUFZ/TGY1ysiz9R69RIvQNzWuR4GuxYUJShvMkFoLQkQ6mQcLKOXigkkFMz3nFVBkKX8RW4dJHBoa/pbH8uNzLTKLk+eyJFWTmuUXecy4cpJ0QiQx7I6nGGlz0/3c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 113dbd80-2f8d-4f13-2025-08dbb32175f4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:29.8522 (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: WeZopgZ/CyDY1UF2Mb6Xj46hw754rRfsM6kI96AYTwE5jirstFjE36l8W81WT79cedFLlHvuWct1Yj16hbkCND9Prny6wwLU7f8YxsSFPfJ/wsPrgletJh638z3VNI8L X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: V32H4LZJNQZTCFKGFP4Y6KTPVL5OQ2ZV X-Message-ID-Hash: V32H4LZJNQZTCFKGFP4Y6KTPVL5OQ2ZV 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 371943350fdf9..687c1d969285b 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 544cb3da50eb0..ae7fdd761a7a7 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 6a969874c9270..b4b158dc736eb 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 ed217b34f846a..6c72c2a50dece 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 805ffbf890140..fb8727a744362 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 a3663ab065ac2..29bff9e6337b6 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 b047add5d8875..901578896ef32 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 fdabed5133e83..bfe51221f5416 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 d7d9f708f1fde..2b97f2e4f1851 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 950eec44503bc..a3ad1a2df1c70 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 a287e9747c2a1..712e8ae5e8048 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 2790c8915f552..5f718f9ec1e55 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 322c398d209ba..d966c008be4d8 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 Mon Sep 11 23:47:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380379 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 D8629CA0EC3 for ; Mon, 11 Sep 2023 23:49:49 +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 B7857A4B; Tue, 12 Sep 2023 01:48:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B7857A4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476187; bh=dSlExT7vDQO7N+9TSn3PVdya6h7vYi1k1bWocLmsrEQ=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=k4Z2LFWuEI5FfdglFWDklQjViAbC6bwuPoSCxxbusg0pnUkxnf875R3Ky2BngljQI Dg4vzrgbU5qEEHYUpvxGe+lhD3mUzPiR1T16iC03ISEHvZDZPDfep7UEY3wFNt0sbu tg5NJ++aXnyP8ZnjWYEp742O1sj6J3URvd1XSVF4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id AF67FF805BF; Tue, 12 Sep 2023 01:47:54 +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 1B68CF805B3; Tue, 12 Sep 2023 01:47:54 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7684CF805B4; Tue, 12 Sep 2023 01:47:48 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20704.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::704]) (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 C208FF80588 for ; Tue, 12 Sep 2023 01:47:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C208FF80588 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=Ffx/AxfH ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dCu5LdM9K6EW47Zubbz3zxyxzijDVWYs2KPiqluLcDArij9wu1ZTPHmMHoYN2i55Vu4XsjN/bvVOHKtgKUI6iUBtjXg3OUVMob712vbc62K8exhd8uH0nOF+m+iHi2d+QLD2x1hU5gAz92To2mhzz9O+8bksZILkNIb+gvF+H/rDe9k7ljxFM1A1aq9xl9Nsn884UEcIpYTxCYhTzWUx9F9/d1ZEel9gd/hE9pPWm/lz7L67R0mdEcX00JzwuhuLV+aW/GVzycgNDsBpcGU69EGdxbnaxX6EosQy9S64S3scKwdbxyoOkOvF8iW7Wg3XolbZJGGpHG+zMH3ziyYXbA== 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=FuZ5Y+cnldAfXoQf0cMimYmDISE97/uxmFwhQrlRcHQ=; b=VFVALVnZh0UtQUbMVH51EtLr5fB0jpGZ1R2fyDp1u/KTqq/jdfk/jYOIIWIF6B+yBQre0Ho9QnPKcFJPamlwnURgFyYVMijejVSwIKWUzysXWOhRXd3zeA7Gw2KUg7GPBR0ydW7rvO827zoSOj9hz01yWW/GgnE29T5w8E/lM4SKdnpIsYbW9rYc6vca9XInBoUviyBePthTsfR0+J9rBs/LzCXsWm+lgZOhYBPJ4HI626Q2iK5o+d1mRgMX/ZdhCHh4L5XM2lESFNw6gkashqTjlZSRNRh5sdfBWaUNtsSNbkNsMZa8pVxVxrzcT0RdiaZG8nyF7jx633sd2wC6yw== 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=FuZ5Y+cnldAfXoQf0cMimYmDISE97/uxmFwhQrlRcHQ=; b=Ffx/AxfH5JtLrtvFS94eZAfVWfS/J/6cjKXLAJLOeXIkDncRNXQaRGeh0iJrNfbNjZSrgN9Wq5Jklm92R4HIxhHyZJ8eINtOHrO90x9MWOcjiydxwIHLQO5359cSUPm62XjQLhZyg+Ot0bVykw21zlkia4+oYgLDdom49LfDV38= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:39 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:39 +0000 Message-ID: <87a5tss25h.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 05/54] ASoC: arm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:39 +0000 X-ClientProxiedBy: TYCPR01CA0134.jpnprd01.prod.outlook.com (2603:1096:400:26d::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e66fe7d-c7dc-43fc-d52c-08dbb3217b9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eAtFbbhKbjn8i8QecexHOQ0qesKzk/bMl5C4H/p6vetJoxttk+M2qVbeC2ysBEBs29SQybsEApfar4ZDs/RtOXJmohszAfWki3Sjb7YeasN6mLUtOEtv+JUajVnUEoE7hxwY7HkSrecK8RZxYZtra+z5WE4AxAtfibDfjk9Y127ZLTuw/KF++Nak9FM4rT7BVBf2erV8mDld+lemVdSTxiQwySTXGIDk/goHKQXzd7MRd13AcoEDizoe/EBst3rAFopPDNZsbRFIL0+XhvPlxP7ZQgGLde0IIMKdAEAg9+MdYe2rkKhuzQMsA1UhiTRjMFlEOecljmpjJx49mWe2xDjDXmeKz6bvct0xkZpz3D17tXdln8wuo8kp0EqRfGPqL3QnFtSJgZxVZY9r7kSRgs+1oE95id6pbWBMs//F8eSRXzyYfNMpq4cTo3Q/LL8P3dwoJKnmg+jI40e9ZumJEG+yLIcCxk84J+zV0jyKWY4DPl80DsUWIjulIWEms+HA1ZokfOOtYhHdnNpSxa7UeHG2ij2N7RGQwpNgLGX4wh8DciG3QThDBVMt+2F9DvkrHqivxGrrtHks8qWtouFjytQ6r1tlKFy0/fAN+7zSNcivM7aS4JKO1E0Bg3Tt+QgJ2eJCQEPW8tBfQ1Y/nJMvs/+JQExrYW6/uB1DsL6YapQ= 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003)(41080700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zx4bxAgtU1TRzfD69VeTLIHF6o7h6iKD4h6l+Sh2Px4ZALQHiCr67mvNRGuDf89j/vIEloly0y3ySy/uhNrycxlHmngXpBH49PpqQTNeUA7x0kiiM8B8MPHoGdCbsQpn7ArttoFdP9xDyIxAWyy86UDbftd2OX1n/FPt8HDINalzXa7p5wgm2iWg3HtW4YtvqxUmRFf735pHv/z/p1CbG1LUwiLl1zzmgUmvrFUa6NEukONny38wM+Vvryd185TC0SLAm0Dz5IhhbqIQQaTC9gkteX5QRXO84sSTkgq70L14OBKLw/0kBCz72tCwQBh8ze1uWCTTBnIKEOT1g9tkSxa4Nqom8ChFP6WoKcTgAAAveFPibNkmIfkEum4RhdIvLxWc0mr3W7uRP8baF+oDnAdsjlxSRFWKxLEHOuRXzQ0CYdFCSZpz/XsGzzfk2dJgfaIF6wOT600RnnPw8CuF2kYfCluWhoK319gp0EC16KjB0YHidMRbP64WvcVeQyR66DyQjAATh47Wgo0jw89ePrSExQTeG3euY51ZBpbD56VXE1L4OBUQpzrkTU9LkErt8t+FJFBByho6CZWSekdgZ3WpyHM1B6x/jBzesMBgdWPOFaQCjLsm8bs5x5BHNspGusROdK0CprnPgL3ZfjHm6oOBNqXXP86BLafWX0QIk9MawtyFMpL390WYkjehOE6IfaQSdnt7NJgaVTzB8z3lP+HoiID7J8UILbrP8icdDIneiUjZmrABapMDhQ7jbscDegdyiN28pb37PfbB5vMpKS3HJhJDhHpCfRc1vXgaVsrfZvLkPObIvEwaglelb2IxPA94pIlCBd1nfyPtcAflN9jSel4/OcGOy8+Lcrd09AwcNY0TdBJNwq+wrwyYPfCprQPZJRiDqM6kWZZtPeNioXLxIZk32RWtiHBro9/sbM5GSy2+qOZJRv3pmnFiLPOTvmByLLvcQOnF8TW55P9rXW1xTbScs3CZfdfuUiPQ1HhjaHKSTrcpF++iU1tWqcx/vo33XG95Ok2XRkiRS83lDGGCu2S/lk8viJj4n8oD73Itg2KAhksGXvP+q23rK/oJxMUyTOc/VymcWYXfLELLl5+pomuLbXplrxMMw+xvjTTqfBx1gz1irEL5epMEvCgDB6SSR34WYxNODioZU6ywAa+K2yA0YsIlgE0sZPH116QDI0Y82Acw6ybm6SIcZnGygYx9QC4w8zh2FROf+Ev2s0RqzeHHEEsyXw8xnTPXrXjvdu9CKV4Dzvo3FXqmxAwC333nfaZnztehCFR4Yh5M5izqTRIknw6zqpA6XGM0leZ+EzDloGXbdyvI7wJtM/T2PaK6cQRohJuZlx7YVzpjTrFbF2MulWWhUGI8MFa/j1S473VzjJ58qHtj81f4SVfr30QHd6D/1YpSODnO9Plpu4cTcIy/FKjmT6Og2/vppBZpI6f2E4mYPkgWsCQ69afNdKRmZbdL/R8XR3vKpenbRmW9OkqGnMiLP22D+V9gS3x456DnE4R15w2VPk5fFCyyry0ygTHeXcHLDJ1ArP00mtZZU+LHCHN3SEK7xF4HjG06/r6DmPmG7WEyIpOV1l+8+k/T+i+n4XkPBOBP3UU0HDREuhoFQznuY7Xjg7dMEkc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e66fe7d-c7dc-43fc-d52c-08dbb3217b9f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:39.3862 (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: EsJ+e2t4CLylbGIXjYdHUstrStOlwERfvYDf9RPVG03F68HbszJBHYaeUZuJBqpX5j9+ACSkbso1JKKh/59dyC/5DRCtQl71jLGt1XDW1Hu9Olo5tm7NHmEhnAMr68z1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: IOIWEJHHS2FQVZDZMOPO7IX4QJOZ7K7W X-Message-ID-Hash: IOIWEJHHS2FQVZDZMOPO7IX4QJOZ7K7W 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 0a48805e513a5..51d2ff80df165 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 Mon Sep 11 23:47: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: 13380380 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 10C4FCA0EC3 for ; Mon, 11 Sep 2023 23:50:03 +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 75FF06C1; Tue, 12 Sep 2023 01:49:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 75FF06C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476200; bh=VuY7W8BiPkIb1xmM1Z9RSlSVK2CfT7vlqXmVtnZSvWc=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UnMzEda6hPQfYcQBIVEpa/NvbMG7ymrVKMhzD9M6pBLFtFKpjKwXesyUiWBNy7LJ1 tpbv3qDTT2aA+dwNS2rTto747L22tB2ysUGiS9m+xXXUpGlRK1ZLkJvwkFPSzxFysI Ekex0hK0Vyk47YHBgVfNV4SQI0LZeYlMNROHmgOY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A72C2F80579; Tue, 12 Sep 2023 01:48: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 D0B68F805BD; Tue, 12 Sep 2023 01:47:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5C22DF805C5; Tue, 12 Sep 2023 01:47:56 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20704.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::704]) (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 0945AF805AD for ; Tue, 12 Sep 2023 01:47:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0945AF805AD 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=Jp7SdSWd ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AvLUs+G2Ds49yHQak09Cf/ZheHI+gA3+BH1a1H2tCeXwpfGgfxNRfSD5xUu/FrezP1w6CSXOEipX79yd2jurf4MaYjW6VoNfkk0AkBNEzqVBret7HxU7QPfdUmAgc5+aKLa11AFGcdAiXEbZH1WctgtW96CWq7dWnDejhBbnThQfRzHWnRiQtJJDIw9+eqYfxgzBZvcq3Pn4M0wKFV4XbRUMHhsNvnPWSlooXJB5TgROCPy8ZhrddNayNOIURezkwh4ZDIu5n2kCgEl+INBI0rRFYSDgh9qoTUDY3luNQyZM5QTQoBYdr0bbE7UXXcoZRQGLQ3k343T2OhQQt2QT2g== 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=BK9yOsnNYxSMiTtgDy6tw++B3v0jhCdILHhIH3VWIlk=; b=NScspBWBdSZiRD4s6QgvfwXXs11N4GwBQ0GJhUsg6HYvPQLtFQR7juoghYXNaTo/e6MP4JQ3HkUdPYv2dx8kVO1Is3yHQgDRHPHyrU5MHtxMq6pZQ2xBwYDSjlXZ66hR441ghABie4h86NBmbhQSDUtveEp4/+thPN7rvHQzRVjX4YffuFwfqoYkEoajd+3EEvUng9x/ZQoPEtpfd7oEDgjSZoCN2HUL5Q2WB4hx5DCZp9yGdfd1PqtzSpHECTkSPrmN/ny/pkIFbgb/62Ctoxs/PBtrHPlHU54mD4m1uximGBHsdNZTRLEX2xjOyCepyKo5JRNl4wbBYmvhWOUAeg== 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=BK9yOsnNYxSMiTtgDy6tw++B3v0jhCdILHhIH3VWIlk=; b=Jp7SdSWdNoDl7HXwtqwUY9AstuOIT2e16awWsxmF8Xq9NtrthYCpM9W1cU0HpEAjRBA4ykH5t3dh+3NCfnMN1LWarrDLYhxMSgQGSOvpNTusFktjD0iV/6vrcVtwdd1vjqjERZPoNceT3uHvABF302YCKw1/qCLMVfgGpFRlM6A= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:45 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:45 +0000 Message-ID: <878r9cs25b.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 , Mark Brown , Syed Saba Kareem , Takashi Iwai , Venkata Prasad Potturu , Vijendar Mukunda Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 06/54] ASoC: amd: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:45 +0000 X-ClientProxiedBy: TYWP286CA0021.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fe6457d-79e3-4036-b81b-08dbb3217f5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AkELPFwBb30WG8hr+oPoghYqvPYpL9N4E0vhj+ySFjeIYuubjasXuJupvm8AvX3k+iizRy8SMknWleN+EDyEVsExY5VFL3sjTwKWwjR564Fe3oUb/o013Sw/uDMrXN7zO1AFYi3pt8bPdeBsU0KeRI1dRoVfVOpWtezZ0uPo4LH688t5oux8MwdFaIhTqsHwq2NWGPRv1N0te0JmryqCmYsndPp7H7HsuCSRrT+Mx6upS8tGwz8T7AEkwXLvUFCTArTO14/rnd70SwPirF8Bv3UZG5SDE0l4tipralvURCmK9+2/4cDgh4mORys8gKzLRp7jng9Mxf92XlKDN0qdWvrZxoKkT2nIw8iwWgy2XJqG1izQ0pb9kIJlW0ClyqxGStteWVFmngy++Xbs48lvvL/wr6Z3/fXPsifcLWyQqERR4i4M5TXqlHqKtknICmjt7b1JYJVgwWpnMcdVA4NB/Zgrge8LvEa1mYVzxU811M7To2Q3DelKFmEp4N8p+Hev40NvA6tMMwtXLVsDh+avQ1os/i4oravEh8CRgaw8z/sw/ye/ljKhPdpe7nOcIN/Oi7n74QMWW5/iSZ+2Pbmb66uBV8onrKsQ7a/M8ep2V0idGIrkJoozcU3xUj7/JaVE/u3k0rvYwHNrcDTlxK49MA== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(30864003)(2616005)(26005)(7416002)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UlpawhZX/p9aW+I4WjyYTawpTNwykhtn+oSSpoXmSIDsxXE8CczT4HyZxlKBR549SOevyB9aGv8b49CFKr5Ri5UaIVf1yRoa9KHWXpwPYyvhlqKJBUbZgwUkqkHGFAZ+rVCemyONNItn9RiAP1ZU2E+n9y5BxFY1T1f3d4JkBuXfGt6vLzsToId3pkCF2d5PiQdZJb+YCaZ2UBzhEO7bUiCh8cnLxbjvLZi2BjG3QCfjJtz16fhDLAbTvo4jkXsIBxmiwwzoyjIAI59ouq7cgrnybOnMU82Stinj9rPvQC4N64fpZuChR8t37XIZm9rJ0I9Ab408z5+NOxvux2UCSqBKNZcD5kMQXXeWjF1FpiSeI6t2M7TT5gAMRUetCI1wHYpYrZHCLKYwrIdLjwLWgAlz3NKDMNNUSFLZbIqore7siSNQG1g78VYrPjStOWMrDysaBdeIOHPZ8N2KX2ItAetujmEqiNOiGLzk6vgofE7o6E/lelUtUrw6YsGD5AqxaWV8MX55s+KNinwPtqNqKjh5u1UKnXFhnxWleXkaTAxxXcIqRql/DX7Idy1h8rx0UYfsr1g10YePN3ercgCTOv+o/qDHkXFKPyuyMgv9FSTAo4+pGvPxWg0puySfVvj0x4BsewGiG2P3xp0MymJree3agYbOeG12gZBUMoLeBsf5yu+5IkPuyp8PT4db7T8ubpnI+npXNgjUkKSRc7Nm27pzET++3KvWaCqrsqN7wKpiSeVceZgiOWZZd2/ZcVLAsVmkNAGgWyJBl6KUoqPd2Emo7AJczCjZvzFFeaEAAP2U36WS1HGLwym7J0oawk2kHUfN3hjKllO/HQPSdG7xfQONf14qFxYIRpYtQIHbLgc3cppSVS9HASaweF0wAk+kLhh8faKaJUm0NZKwFEwpSCpKnz4N/7F+EwvHiVAS7onzH3lzH0oJgCKSSqJ0utu11d6XEztpPnP8RUT6xsXtJ+i6bulCP2DgXamjhZ4Qa3KsiZjSWzT02WNEnZocYIDBkL9CDs3n+fdL4IRaEvuX9IQEgheVo19Xj6eWEeW5181+B0ArMHLB9wdLOfBnMQstNiDEhEpcHrVCUJhdWJzZ2M474qLD5nQcvwFh/p1zHsn+FXJq2ocPPGFyMi1vajJZwyJ19wyN7pVAJimH85QXVTzTPGXrC/tChLceEddpDXKYz5yiaJbY83HK1TumONj/TzcFZWMzARWHFxXsRMxF1dAiWDTyyikgg6hJzzVd3EJIxzdTIdlaJ85S5RGIJmbOeOwjj23rXJ3osP1+pAv/FENp/uM9GC2FbKM+mXsENlHoXtV+dME2mR5R2lDeU9ga8RFyvViVOSaStkJqEcgh7LCW6WzZdeG1lGSVjuVq6wlK107mbZk8grRWOEPqdA3N1D7y7Q6bR5fSHKjaVjRoWxMozjmiNMtNW3bCz+SD7fx9UflxIR0SYJWNjlGgMbTkebSsQtXdEe5vJzrBvIn42N5kYCRxHm1ZSWB/laXsZ7+PdgagHkBYBznx5UeSmXu5mrK2P9zfdDU7aWBJxv3rbsGdinoU9wKP6orkTJiY2n+tdvgEwRaidwAPFAFx9+r5aiV5ai+8ofaQTAqZfyIxXYiLEm6zMOrhmypR1LAdIf4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fe6457d-79e3-4036-b81b-08dbb3217f5b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:45.6374 (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: OJlFW43oaVA1F4x5DMbvGk/e09gW2ppUFwQFiGh4cOVlo8z3xLGpJ0t0IGZLZmfOfHqv95PxRI0CoYBGIXXhBB8dyiWTRC5m9TeSxsFzk4UEd3Pffy3QWLxQta945UcD X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: CAEHWYYO7WCA4YPP4J63ZOI6KSWYREI3 X-Message-ID-Hash: CAEHWYYO7WCA4YPP4J63ZOI6KSWYREI3 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/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 +-- 13 files changed, 73 insertions(+), 73 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 9e3133bec2b15..84f3d65ba52e3 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 5e56d3a53be78..e079b3218c6f4 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 d41df316da58e..b857e2676fe8c 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 c8ed1e0b1ccd0..72ddad24dbda7 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 ba58165cc6e6f..217b4c89b9754 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 a06af82b80565..4007e0fc173a5 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) { @@ -1536,7 +1536,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) { @@ -1570,7 +1570,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) { @@ -1598,7 +1598,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) { @@ -1633,7 +1633,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) { @@ -1661,7 +1661,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/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 28ad5f5b9a766..d6cdb6d9fdd63 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 6230d1b122251..9b59063798f2e 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 4ba83689482a7..e7f2a05e802cf 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 9538f3ffc5d90..3a50558f67516 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 773e96f1b4dd6..7dbe33f4b8678 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 eda464545866c..de4b478a983d0 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 587dec5bb33d9..491b16e52a72a 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 Mon Sep 11 23:47: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: 13380381 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 143BECA0EC6 for ; Mon, 11 Sep 2023 23:50: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 4496FE0E; Tue, 12 Sep 2023 01:49:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4496FE0E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476209; bh=wkXA8JiqOl3N+CMlj84TkW7VxeXjm946KAlHcmAELi0=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=H1K/D/slNxmxsrUBFL3OEOEq200TM/Df+XTUrswCobsP9BKHT+LJfL3mh1TPiMSuK uUm/8yK43aNLHWimrgtR9e1D8BY0x3EcENpJIvrh2nwpoFVXe7U1GPrtN+G70KxZ8t Pp712gEqD3ZOgL3T+LWa+GQOvVrYEINp01HkHNVo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7A95DF805C5; Tue, 12 Sep 2023 01:48: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 EA758F805CA; Tue, 12 Sep 2023 01:48:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9F46DF80570; Tue, 12 Sep 2023 01:48:00 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 97DB5F805AD for ; Tue, 12 Sep 2023 01:47:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 97DB5F805AD 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=TkufIQsU ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G4snERBxlgxr22BrWdgdHYP+TZiDlVaaS9KMeMYbrBeZ8mpSKTpKywTJlMMQ1bd0/7NkX7DN8W0us7WlIc/sjv1ap0/ccpIKuM7yl5cQsFOHGnS9bJq7M5SHL2aJXzAGmDWHC6laLSmuzWxVKBnIUsyLZaSBDNqKVkD1oRDeqtPndE2b+kUItihM84ZY8yKSnI+a5PhQ8B9gkcybv+VCnMrExx7/OoTiHP/av9rh/HHiJHgtk6qM6Lf1iNKYLVCnfseuyUZmCPI8zJKrv0vOeZFC9hNPsspALfR647arUgaab0NS3U4zRubBeu4cICDTF+TTANRnSYNu/91oETHGIQ== 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=+guEJLLgqdIWRg0RipHDsNWAzbF+tcHp1Qu3U0zi8eU=; b=XFt0paT7h2n5djizCH/mBRv/LWfHEpllCsQiLgPK/GYXKLM9lcdphGNY8UGLz3TovhrOUI1cTj8J53Bdp8PE4nl/hQdBt3zgaYoDBAPqyQQ9yDtrH0G5jf+KSfIqL2NmwWzB3yjS+7Im9Qro9CSBcWGow2UtIbQrMCOevDKqDrRGQj1A779i76iAgve0JDaEWXuelqNYNTgX59MaRzLhfNEr9D3pQxtHOkNY1VMXyYCNVEPsEBR1W5RsDiBWy9EDHG19XAuFmoF7oaPwhFYvjqaE8ixC6PelF1LbSB7Jcvlyhhm/fgs+XmaIohShrMS8efk8N5lXfMwYNIQIjGCnZw== 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=+guEJLLgqdIWRg0RipHDsNWAzbF+tcHp1Qu3U0zi8eU=; b=TkufIQsUgid2KDHYEgc0J2cORQzwtBm2RkundM6y/u/lR6wxy4wB5AY1D7Hql14YaWZSdlJO65ei/jxgx5cKQH6CGqWavQGwIq5VeG7Km+e//ATC/DLz6RtRrEc8cdW6JkUAaS4Hlau5RLQUZ0JJRrW8ajRF3kptASMSmvaaaSM= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:51 +0000 Message-ID: <877cows255.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 07/54] ASoC: bcm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:51 +0000 X-ClientProxiedBy: TYAPR04CA0011.apcprd04.prod.outlook.com (2603:1096:404:15::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 20e10277-891d-4d95-1980-08dbb32182d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nsehUlWiuXwArrknk6l42qGgtLuoyuQpt1QSrFEeK0hW3XxlWdhlR81IIxOAT/elqwg/VDchRNZTkCwCye5kUZSx17Nh2OIvj9RtDYipRQ/LqlUipxwd2RPw20h6GsQ7YhkJZ9tXQqj/T7DP/SE+9fppPwSg7r2ICYeQoJ6aC+fxX1TzhyUvGVpz/El5GMm9sP6y/oW4X5wHB7iWLa2BWmgtWTWMF2CflhI1ArWFCfY4+t/Xh7ghoIKilZE35O892ei9/qViWQ5OQr4woUPnT28/rxiwuxhKloEFy4wu5w1yBV7GDwNONKaHF5btuiqixAoqVYVz0wjBLPMaztJbz1v1CjwU1sb5T7pikRe+J6KVJMbC+uL5J+4lHIW/+q/EsJiJE3lXMSz7ixWhhdPVlwOiX04zLDkl2fsW5sWLjBbxUwE8IQfzXj3hqAi+osWI5GkOJpdIOyHRAMPOkD3IHbOA1WZKcRLXM4mKp5kxVishaEbXMqEOakCXbmLNVycgAOfDSPaxUZXekB01eOvakwcDGJlpEzO0tlXTL9/C3PE0RBjY6qU2OVLZes6hPVgvH3SD1ohX/yqblPgVf5yrcz/9O/3P9zJ8B9FawLBSRp9gDS6YhQd6cywn8MkLgcuS5/bEMVqKl7FunXLZITB1CA== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YyNpX/WKf//vhCv2BCw4F6k4ID9NUObJBVfngTA4ZieCE/aCVrBIAXaUwnJqONJk1vzpN8DaDUKP7hZKgPRdis8KI4cMAzAyw7qAu0MAL/1l1htZLp0JdjxT2Q80vNIKx+XqUC5+T00SBnhe5mzDB45GSEK6BOaWpfFmz3pcurkdFuFb7ACg89q/9ZWl+C3jXxQrVH5R3kBQJvNWuv9QpME5krxKKF5shHs+BUw4eZLXsbs2L7QQwRUCJyBUpmdMjw17HIIHrwLLk7wB5J33iJBx3FbPVo2IgWPeXlfSjl1BPCk4Cj4G2eZAWCznGV2uqImFS+dNM3rZUIxknvuCVMj+pqU8INRabMQKXBZQEGmSEGf3sF6J+E8MNR2/agh6bo+r77PHDQODEBkGTS/fcf5yPL6isqX45SZHjj+W3CLmd7ck1Tdx9JCwQRqnzoQZ3kB/khnp3FPVQIa+knr3nKoS3oZPsSPpw/01UJPlAHOLwjIO0MAG73OREpjZ3Nc4xKrWRuCha5b45Bt5QyDhJ5a4YW2VvXtiikdMKcvuex+ogM75GVDx6hiatdn/EfyeyJghWQ1tchfCafrU69Dj/BsjPLbSvKUZA09ssqxPxHc4mgawemdsRCgojyYCKw6ddzOCLdSrxgtR+rxV4J5ATtm6gBUXopZLHb0cwqIy5NOx2g3T8/Yw1vbWZiK6KdRCTMAvE7VQr83w83iLQ/JJMXkd4/e6wXyVFMNVvXyaJwZHyw590ZuCRyW9il8KlsIBCURRSv5NOHYhtPT1BdoapM6o/hDjrky4J/PP8GuI3OxzN9gKrS1PHi79E4VWgI3TERrX5vneCXSqYfjjRAlafd4yY80YMRlh7rlxip2xTdWcY1AEU5baPRozd1Xm19s00F5n9xMVH6z4OOj2QaPo5RQE7fgh/Bl/4tCK7/HOQVeD3ejrflVl7AXWsqmq+FmU6IFFb94HhDIdwmCaqLAkd5XoIeo/aqZQaeU9d9MK39RZY7r5vX6vpP6Q63/q3LJAIvbb/2l/250MKirIZOYRJeGltaAuNqamo88aESJlsH/khclxJwbO2BEJf0CuMigOKXWvc2MRqc5ICmWGZYpMt9I4ateEfonqItYWKTNSthtIKvnV0p8L0aRt4iPWr16ZnbWqXKHT50M36Z28zqEZxUbOyfWFytV2A/gtIxA+SR53PzZY6pkKleedNZzErrgydaduY+ZoMtYrnUvD1OtEBn08VfNdmF/KwV/cA05Zgv5KwAFuIf2g3A8zPSKQKzTWDo7bwtaQdwhEO9+PorSlhJAWzp51eLYXegoMCtJ3QyOOyCMhpv2KGCn9hetnTjrWceL7VHTTDvF7oUDyx5xStfgr3PvfRncxaWGgr0yt1OLrZ9PD976i8iQYOwbmUEJcU70aE4XOjczT0ko4nr74y13OW+v5AneY9iGrYtp96FLh5J9R/mjHiCptgBaMjoRbcfj9XEBXDMvA/+UPoW5/Jz1WrLGu5yooGVc/w2fbrlyrDz3TLTfF6zigz+tDy85iet9z0bHW6JZUw1tV3o5tCXvHtmJWymSFYKJjDYJRWZ4UJslPb9LVfRJ0UdKP3aPQ/alkIVb7ry83fYZPn/pg9A88DCT6cf5bshAHypm4zlE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20e10277-891d-4d95-1980-08dbb32182d0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:51.4082 (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: /L/xl2wTKhtvdAWotOJSU+ZennQsAh1pP3GKeUfCI6g6bhAucF851LMMu1Yu3lq/mVWp3KbPiGJjq+xl+urVxCI+zOkJxQuhjst1B0O8Os1cQXQ90+1PKvJbPVDpWvxN X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: SPG6V3TUIJSDHQIYNLZDUGWY6RCJFQHF X-Message-ID-Hash: SPG6V3TUIJSDHQIYNLZDUGWY6RCJFQHF 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 2c600b017524f..018f2372e892c 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 8f488f92936b1..2d1e241d83673 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 Mon Sep 11 23:47:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380382 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 2D2FBCA0EC6 for ; Mon, 11 Sep 2023 23:50: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 2A183DEF; Tue, 12 Sep 2023 01:49:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2A183DEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476237; bh=ngGbqft2F/6DW32LLG6xCqbQe5vFXLGEJYGNmoScU8Y=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=GwI4nSfX9HYO7R0Nmme1MF8Ty/g2THK3WImiHwNlQOnU3salGUT0iXHbliIGPW/6g KwLrX51b0RrBid5B1u5hRs9vcOeA59gxJxbrxnOd8oA2Pe4nzB0q2zy3/+YExFxbxN +HNRB8Gx//aIpqZOJXyeK+mDauOigCluvTmbtol4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id F1AE7F805DA; Tue, 12 Sep 2023 01:48:06 +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 53D69F805DA; Tue, 12 Sep 2023 01:48:06 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CBABCF805C5; Tue, 12 Sep 2023 01:48:01 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 079A7F80537 for ; Tue, 12 Sep 2023 01:47:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 079A7F80537 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=ektRJAUK ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nevUOGnlkRfEghTsGvyhiVlMo3i4OpSaROngjb6c3II3YoI96NABtifg7JS59vn2Zx3/2W75o5rZEUKlxhJUPjYOgnMHIT5/H2zqCGzPtexFq5SEX+qVAJW1Vvp64YRX1ajogjmA5kcdFv/eisd7D25sKH6BJS4nQHogjzSDccS4t46YDM7AcVjHhOQwBkEmN5yABorCWjRzaspm2LK9DNtktO/ZIH9OYU6YEz/uQRmMixTO5bWmksfwZzjse4VpkzwdfGXuIGvqHsPfQLrqSdGCkXd229eddrYjOF/4ffUYB7XDxkGyDMTYYCv3fXU7aFCKy0+nA2Y2zGwVvEu1XQ== 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=4EMusKxjbQqR3D7XRw/r4v4X+SKzblia1tx4Zgn7hDA=; b=dru2nIG9vvUG7izW2A+ZB295BThHv0BrZygXF8JhSyJ9YnS9TISbFZYI2yyj1gVmPyIKSRsAyR3wTrsCkixqrp+uK7+P9b+eOTQedqPeIQtctGN1otiI6LdKjEIEMyfvUZyTx/YKYqJyNpOOhrCCc+gNhE3jO4IFYjbIkne1ly7EMvWqvYfxmx+QAPnRSrgWLD9AWbdpwk2uzBwYDMjBib31zjicIiZ//KD+kHEbloRYUpN1FxDMqQuvU/z9Z9A6pKUGYkk/SV4nO8iDzWcwI5oBPP4Zp/6oK7TcXXDiINZHPCPFENOHJKmsKHqXFgrdySKfG4VePM+odIvvn/bXKA== 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=4EMusKxjbQqR3D7XRw/r4v4X+SKzblia1tx4Zgn7hDA=; b=ektRJAUKr2Ihkix/AfC65xwf6V7qp+9N0QVoTy72/m8WNKBt8ahCulFxq20woIARns+z3okNEFmX131DUOjWK266D978CZzzXo03bg6Tb8sI4eW5qJNPuniLhf2kReyC+n8cwI5NW321Q1TrTh/N8/vcWUloVdtaHDn75jkfmqs= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:47:56 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:47:56 +0000 Message-ID: <875y4gs24z.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 08/54] ASoC: dwc: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:47:56 +0000 X-ClientProxiedBy: TYCP301CA0032.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 379f2a05-40c5-4861-4451-08dbb32185ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +UHqoEoox5zFXCnigIYx5V5laANP+rAOxgqU9ATPRjBa8vyRRMXiApIQTI+fwt6AWHUU6bGDApqK1WvZzQrDcAhSaTk0tfNUZrDE+WnNXOb6wQpZvaVWo6+lm8P4Jb9cP/Lq4wxqNOw7xR4bawWOGsZ0sM1QhlNegdhSglkAtXPScKLRU7p9dI42q/7TfC13IKNYVPd8cIfa1P/abZ5fyYK0PO8ThRrzjSVcQVQzpKRt0+iwspqb8ayjYd0XCLfFD96uMe/k+PyWIcp+1OY0q1j71vWCTNkrBAhnWOvCZnOQl7swN2MQEGU1UJhzXt8kHK3rW5i3q894m01RunBAkO6CmPGSMj8Ng6bybkv7QwHHEkHP6vod+W2btPRjEDQ6HENc0oWISDyqndoqu/Ih95vbjtDPcTc5MSEUoKGgd1r0XxjaI9bZXaY4AcrcxTRKzxHdu77vtGaEXBMsvKSBUu113mHPRGFwpYUdH8TxVKaQ/sYsU0cIISA5OTo6vXAjAenAwIxcs955fbxGNZSD8nET0f8X/euR++B3gUhoRkiz+pScYJD0WM1STtt6lb/HamGNjrvnF+mpp0yLXf9HGaF7JNNJp0UU4WpBVKEabLBnXSO7Hd4OuC7j19UTTQAJ4TJ0VkWaTznXjhHToE3prg== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7sUKL6z5Q+df2zfzpX45zX0wTZ6q5cNbxBmKrWWOnP0tMpGIVp9WW5cgjG4tcsGOi8JCcDZMFEO+/WP29TIRmRpirrSAdSilxyd6eXcJlBhj9h44cuBmpzVSdl9Riylm+wFh3Io1WmeCzcyG5cTpDWo5kZjmOWkstnSolsC1o88ttsMssxaV5fzwUiom10j6NmLKFfUSimwL2rVHEwNpJCDoLWPICzsTIt4tuaownhdtZkYPNslkTiJM6rpW7eAfexUbYwZO1l5gFuQLsXu41aRl5xb+C9KZiwX+oYSa9/vbIEQb/1Q54vc2GoP1Imju/RzELeNCcaTzrcahISkR4iSING8Gjxtep/KEssJU3d7PqxXJPa/Ih0f+3qDYKgpUuCjW79fkLDFxslhDF/E9Ao+X2c3sJQXfutC82y0z38lTmHBh3WmvbmHbOv4PUqptGv6iW6kKD5YTHPyhK4zxPnUwIFMSdn0K21d+gM+Iiv2Ifrwx7pwlC4AMBQd6Ug8mEvooRuvfOxcIQk3P07bhuCveGOQntKdL7LJZSDVoNQsJWtX75XI1OaeJDA10oRbNb404y9GVYB9H/FtW+8FEdV+yF3czWuRQsCpjEIZRXnHmBOLEqero7Ep/9VOfaiHCF1LNSlcDyZqj/lguyKRskd4Tbfhe6/K22R65qHjNB0aIHJ/P1ycbBKPl1HXcrqrKzri37s9xgf9CCFkmP6f5jD8AN8ed3eD7uoDIiRKSwDksOvMMYJyoPmwF5CSJtXqxWYo0hT8b+fBq8paJ+qAm7TZpgkNLJbXxwOgs5hbeo9VaW17tcX5RiejANTme2c8MWlhdoRc5JsYmY7xfXUvgNiMNEzzcwTCJnKxy7/i4FfTPUspkYsKVex+gVBnExEmQZw0h+Ijwe16+wumEgkUguBsF3bYKRjXLp7ykBS4gDhKFKyIHQD4y38aDEQOPKm0iBbsdNEYYfZAi6+478MKQ8Aee/kbzW32LDIno9jJLWk3NSKccTHQlkUAa6saMzJdji18MXPGHmX3NSTabKSJ0aanPgg3YUHRP2SJhoVzSrYgxMfv8w5ej8WhNoBAadowjRhQBvqWYT019v0FtesMOqDEBoda8ly8gO63kuZDxNYeg3mmDe/hJe7b/+wwImvWwwN+15cd01blkOGDyHbNeHmcumF/Fzofqk8xcj7h9mMuMAnwBy5BedZTtaVQQ/TcWqZFaid9P9WKmuIxV71rT0jgbkTfWvHZcR/Yb7yicd0viVe5gWwcKPD0yYpEZYaxCIeGOvEanxqXmugIJzGGBh00H89I2D3aj96IL+SHAOKS5dZSWKottNm0Kd3RFUOGf5BCabo8SxfYEL9AP/cRG0sZT9CCm60zTn5hMOHzZJeolwRKUKGFWbjW8o++vJ50r/SrUlC/NKwRwRi6Hq2eWQl9gcf0zwIFWMsVeN+hVpLpybBaIcq/fnhHeowMw0oG05VS2U4TKB9tZcUMVoEHaPIVIYlUe8ykr1Z7l/+vByh3MHoJbxKgxl9C0LLqtQf0Gfk2Y4Caxo28RtcONT80HIIFWQnYPaVsRaZX+MKRKiQpex9dYVtsUrCNR+H5e6GamBDWKzqnMBVYItmC0tKxhnBZB4Q32ekjTGh9pcHUIF0w= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 379f2a05-40c5-4861-4451-08dbb32185ec X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:47:56.6106 (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: S48DzHccO2IURNEHceONjMVYoKJwYf8Qmb/vkPTd4E1ANY2uYPHCPPIFRkVFcjwUH9LdwTLF+4P9oSzviycKJpKTslP9OxZxcMVg4a9xLr0IlybOlWLyoopHsAHomSow X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: H47S63G7M7FH2YHGCJEKGHH67YU22YBR X-Message-ID-Hash: H47S63G7M7FH2YHGCJEKGHH67YU22YBR 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 22c004179214d..2ff619a296554 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 f99262b890082..a418265c030a5 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 Mon Sep 11 23:48:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380383 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 AC9D7CA0EC3 for ; Mon, 11 Sep 2023 23:50: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 E47B0A4E; Tue, 12 Sep 2023 01:50:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E47B0A4E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476252; bh=KSkWG94FViTQDPP2++mHhj/Z1lM55Pm3Hmr4PN2zOXE=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=t73G5myYKvJNTBjr5NSSOad6yl+cjbhLVMBX2yp985QoxqO2K06NttPHjHXFKpqsE 8n70eg9cHcrfuq3DWX+3qut4h/GnqM6yJDQvipfvzhTwQBgOIGuEzstk+9IJenQmMu 8X3eiBDuGSa0THdcaCc1eASu2epLIrdmTvuisd30= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 96DF0F80589; Tue, 12 Sep 2023 01:48: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 F0C28F80589; Tue, 12 Sep 2023 01:48:20 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 04DBEF805D9; Tue, 12 Sep 2023 01:48:18 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E4C73F80571 for ; Tue, 12 Sep 2023 01:48:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E4C73F80571 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=MYuOIDXl ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EeNCsK+/0xm18pq08BDU3PJFAt89tu4xZvxi2gTgILrA1geWooxBJkaXoM6iqoTrKZN26ztcyDONQPf5sk3uyMjZvNJb2OKibICJBcZM3T8wjzX4rlTdeTn84ueRukU7RpXhtQLu4AqzARXbkzHzEjrdWDi8yXtDzS1niOgGCZ+JmaRVF0aniRQ89EuNRqc6PQzrt1vX7EHjuuVjGza+IQrkpAK7cPrUfCW1dCtQB9rrw8IX6+RPM2qOa9cOfQnMcWyE+5xLyzez3XJw7JxLYW3DRMnFt/v8xDQEToRXeSIzQC4y5twntUm/u+aXCX7mQECgtTDV05i+hfJWUmoKgg== 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=TT1vtUxEeCsUnJr2EE1KBa30iWnAjSQE48IrFUhrTB0=; b=OCwVdZXVJQuzsEJKeRH2OYKWjIP/bnNmHSO5cao5BMNB94oiyKIZJaLtXMzRiDfebfwOva9udiiffs6uoVYS/gcR/Kos+j/aARrPUkDYi/orYweWngR5Oy5hTGDNjABtZ7hB62W+GCvwckmyFF3mbXIsB7QlXgwgeEsX+4uqVOElaLMQzKw1JPEAnTAZYwq5lwA/Kpdld0+50w6RDXaBa2GwZh8zyvAvnaSPfn6gAT+cHZPcjR1esk5WueO0knHXPOX7k6YpKDriVGNDvT8eDm1zl6rt3cdgiMnsRO7YK67cTsXa21kuFMKSEFUZZZbsbgSVevwQL7UTpOHPicTW/g== 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=TT1vtUxEeCsUnJr2EE1KBa30iWnAjSQE48IrFUhrTB0=; b=MYuOIDXlz2toE5/TmLhwXvt/gEvrMxX7BmgMIcdO7v50Z3wMcq0G1sa21dFPLsX/PMsPs92haysEc+PWJYKXKH6bgKCw5h7cVaNN8ikCZgIKyuRa3s/+JPoh5V+CVJJ2ibaXYlYnNh3yR6mcLGIjW4bRv/QDMc76kdrZ4A9Tt1k= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:02 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:02 +0000 Message-ID: <874jk0s24t.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 09/54] ASoC: fsl: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:02 +0000 X-ClientProxiedBy: TYCP286CA0110.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 45236db6-ada6-4814-b30c-08dbb3218992 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xADNbX4GkfOHs/d6H/BUaVaTE9nLDRHffMH4kVY784QTGXVHBYKZtoMj6utEhJcF1fk/CFf0NySp5VFU9KPCWJWJr3C4Y1AIza23kUqINan6Qu9cPUToTv06pXfRGV5q+Hh3zplcOj1M1YvjL56u4/WRcNeAIRaxX2Jj/PQ0wopwQ4jPSV1j5gmLXqzIz75pIfGIFWvPAL/Mb8nygyu/iTAN4CKFuIc9SbINrN5uVJJvV1SvHdxo6qWdmE1Vu6Kau+Z/DU2Ex1AkRRIvdLHkP9O4twTGWbOzZemzmE1ETCoXlRy4DPXNeRPCVsGi2cnyLLdp1BsuPxPHfuVyVAPNqErVKfZkd6TxOSZzBRnjDY0TkCHljZvfbh+30dIZV6H0I/ndE1OnfaxmyB7vCbF6OapY7kaTtS74zzXUElwvnm37TizTCD0svWza3np9PQ5glalCKShLLzdVy8t8zmwA8QXd7EpFMwKTscqAVlPVFVxEuTGAjy5DUsr85glEhypDqfvbpHLxeWuW+qIUUYJcu3biYD2zzYXe3J+uze7ipPpGok4j9+xGOgqR/4oWyZIdWcES+J+eCXOXgn5D8fxVg2VnpyPiLD4myPzQrUiRLYf/d/ZSV8vNeadfvxavm837kM5POI7u8D0J7tanI7BVYw== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(30864003)(2616005)(26005)(7416002)(2906002)(66946007)(54906003)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zqQs1IL9zb9mFo8mXIJXSGdZhMnZcOhy8XI2G/MlJaYCQQbpmXOnmRH1/9AW5wRYbpi5WBTfyR4QK6RMtsGNBEu6ilG4vpChObRsSR9XZmVpNAHpia5GoW/bEfLJ0RoDyEHdQWtKEKAOhdkJVLh3EF864BFGqoXuS79C4CwwLmCfG9dlx3LQMwRUukZNLfaot+3HshW079u5sKwwxDOnefRJFQj13RHd7WCurTRLv6mQ3a5INdPrAUeCnmnb/1f2FhOBnzn8tJQqyIkyipmWlGDGwnWe+1Xl1HlKfsv2pie9iXQH1F8d3Hd5NDJ8TExmp2qCEuhAaDUVSBC/ZOFTXWombHBaVZZem9My58Ok9jCdkaH50zDOWdN8ygGc0u3cdjA7rGv5Emd6q/VNZCLr/ord/mLtI2mGaPwp1Au/e769qY0hrUF+Td67WMQhNzdNNy7nohqymu9F1XiYnZPMA+G5ek2BkuiP5gjPPEP1raVCmvQ9Bi4AQygIFF+QpLQUwI0weXf0PbsrtRYwIo6DQmFgaerm56mavMQ1W+29r0P5bz9WUqdblI4y0b1J8isUuFekwEtPuD8cIZ1vsqOXWfzYGr0YYGOPQY/f34PwJvyI+PZY3+7g6DyRXO/JL/i8DOB8z+8hRbn8CNT5ZpMGhejh9zbmWt8RtcEQgHTEN8Cv4mMt4sdXZ6andr8kLFVgrH6eBFX1CeJkfph/8SlOJXpP777Jq9JQu2+SrWlsLCV6J1MRseJh5fvdEMcPNZOV3xcd72+Ak6HoCarwIhYuAC6rWcQq4JDFMe22mDXv5Q20VnGZZW3G41rx/5C2bz6J8l5ja6bwb3BiDVdxLcrjLG/5hTtO6n3IB+V+LZ5eOlf0HPruKltNOolHpMuMzUsfhExw78rYWGyyVxfTOf8fOdwDzuYhyfn3wZCM3wpj8QzLzTg29TMIFwnxh9/6XmwgtnpEohz8gIsgMluJBUA4mJwwdQfp2ucrKTJWptWOcsd8bSaJssfjCAYWsewDnD+4U9Lo4ZyKvsjDi5uC9kzyUEOADvhAlJdPzOaSJIfmRqOGTo1xRXjJO0lqF9VKacUHq28pXFOGVoPDSaiGvg4y1lzmQaQf10yhR9HT3KMfLUEnNHSGIPwYVMqF6Dlm/6mwnm2zI9pB+hbqs6KZ0btbg1zyPb8xhmXK4unVJ20G8vJNKXPQp+MV6D9HP4F7ERhXgUnl8PLYJ1vuHsE232SBVQLZXH1HCGbm1WqcLOdGlDJ1oklLnmU3yacPCJY6DvzyVuLFA4ZlB3/udXlekQ68R2bpmzHNTN6W47frrcapkOck6DD1jvMlOnP0rlC3fNM7c13FQoFsgUstsLLfrsf8knxnKoPn1wvxcuTOA6UfUw4zLx6D5XVKpV+06Txqtgr3v6GwLDfXJWeqk6Petv37jHvxqp/f3gPXwUhSkaH749noFYLJE2YibuDo5WQE5IPUU87+q8lzDE8eju0uUx72wA36xPSo510smvG8qzbjhFyJPt+6ScbVh/0fAhgDTBj4pGXviLMBlXK2aUuHZrddgFnUhplirSm4PzJfqct4Hi4n1M8KlwzcGvyFJxG2zq1Ad7uvKXmIZRZYblpZf27oMHqcxA+1B9OhEq7Yk5mNVm0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45236db6-ada6-4814-b30c-08dbb3218992 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:02.7881 (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: fiKJLJBiSMr5/jkCYKzmQCEhKcH8Hj6Mo4a0+uPJcqjMLvRjcK4bozFOTr7ORrXb1tRJe/bl7cuRtoXpG46/tz8jjlYBzD8VP1sz3JnXNgXmEGscvrgnX4WqozFHFV4P X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: KQU75YLELKD42G2C45E7OOSIE2NC4LYL X-Message-ID-Hash: KQU75YLELKD42G2C45E7OOSIE2NC4LYL 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 e65a85feba78f..63f1f05da9476 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 76b5bfc288fde..5b31c12a56f93 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 05a7d1588d204..f501f47242fb0 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 963f9774c883f..c4bc9395dff7d 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 78d9dfbe65484..d42cc2f55baad 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 079ac04272b85..ab6ec19748072 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 0b58df56f4daa..b2c12e4ed5bf3 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 356a0bc3b126b..f71b3c1340016 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 b6cc7e6c2a320..e454085c6e5cf 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 d63782b8bdef8..0d695e7419259 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -228,8 +228,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; @@ -283,7 +283,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; @@ -316,7 +316,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); /* @@ -461,7 +461,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; @@ -515,7 +515,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; @@ -594,7 +594,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 3c7b95db2eacc..e0c416a2eff81 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 26c22783927b8..3c1e69092d2f1 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 44463f92e5220..1e57939a7e29f 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 9014978100207..866a533fec83a 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 413df413b5eb1..22bde475e9359 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 ea2076ea8afe4..a635e08f14cee 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 0b1418abeb9c3..db09e8366944a 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 4d85b742114c5..2d73502040957 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 Mon Sep 11 23:48: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: 13380384 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 3231BCA0EC6 for ; Mon, 11 Sep 2023 23:51: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 E976AE0F; Tue, 12 Sep 2023 01:50:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E976AE0F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476260; bh=Mg1XqPwszpOF59vuPtvbX65pjFq+HMhxwqsVeBnv+l8=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=b0Q0e47pyJ9aF1f6ce36G2Fx8X3Mro3SAnbPbZHvxK38pbKwNafkAw1sUEpllwF5N QzQHzxT30AOIGIL7YBBIMt9cpkHn7BF9589i8qeCe811GXCokWYiDGENJVpr/c3Z4u 4UiBWHSPAxF+K9HndpNbKwgN/VthU9vD0+j8qpmY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6A62FF805EE; Tue, 12 Sep 2023 01:48:24 +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 CC2D9F80571; Tue, 12 Sep 2023 01:48:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A47DDF8059F; Tue, 12 Sep 2023 01:48:18 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 10723F80587 for ; Tue, 12 Sep 2023 01:48:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 10723F80587 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=YFomxmeK ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bDYPIYXAMBx/e3+tmIq+jlwREmse9sBMTM1jrdSikg6kt5pwZEI3cNAzttmbYj46dDZuBKYJtvpq5xxHRl4GjqaAra+td2jyIAfEYsfnEyHzTzIuNvJA0eXAN2kNQhzP6lgwQZ8iTmBZy5eQr/uT+0Y4koNWBOLaanfV8VMctWZ+Vjav6BOixnpdJfxrsi4vzBb9PK06BcXloV6uZs4lJy0K/9eJbok+lz2a6g+nhv81NM+JyBXmGZOeIj/+8pZVN5MVhyKB2MxR4xS108A0iidPgnG2YMLB43zUfWvbJjN4++g+yjnyizGJK98Rfi6YH3nENJvuE1Sv+Dp0ldkpJA== 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=tJ9xgw+7GoSduwprRAow0+5fwlZ5NLGXCZ4eEoEzrW4=; b=Hz9InIzRS8ueLqb/qRJteWoHXwu3to3NDZSAxRHhne0olbyxOPQegjbgRck+tEEwO57DDsCenWuYbyEyDK/okNWV6cK8Cp/n7YBoVc1WWm18HVLtcLGDACd6+N4D4dw2oE+3xe3VoA5/saIxxuqbTfFpPapiS2VM6rhgaZZ+unD1P7rYWyPwyjTRyy3MuQ4+B0kMiGih7sNAoShMNaHsRfiVU2wZKULNnRkHjvY7CrCrNXL019RvbX/1YuZQWrjhymDZ9W/LdTQjgbuluuComuxnczo2B7yfIx/bCgwjd5aK5LAOLYgru8xKAi+7IXYrSVFBfmKPToA5lwx6ltpVNQ== 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=tJ9xgw+7GoSduwprRAow0+5fwlZ5NLGXCZ4eEoEzrW4=; b=YFomxmeKWrIXSul0nPwtHcUtiV4+lt2AJz3fw8yOLMJlD0MtG4MCVsBP4a6WcLNcr7H6cE21ZsCE7a91vf1ooMsWGqBrivHOS9hTXee2EPB9wflhHsitmLl6XeHxcZc4SIfO2aQoTAevfa8AtKG6vyqvv4laR/zehA47c5BR5PM= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:08 +0000 Message-ID: <8734zks24o.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 10/54] ASoC: img: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:07 +0000 X-ClientProxiedBy: TYCP286CA0110.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 25818d2f-348d-4fc1-a15c-08dbb3218cd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uBNm/XVHlDeu0QgGw4+hLNo61dljEHPbp+cJ5aZnomQ5/33y4X/2Rb7riXTMXiU61mU1pLXfNlcmaiw48PO8FRFeWWfwku0ziHFI4ZiSEvVHh6e9VFDpbiZot/UD6zMXSM4MqhdWpb8WNppXDu8qqFUdo8DVwYD5udMpmopCCbR+noYgW5pJb7+4PHrmVe+kViyQ0bqrOn+ROcvt6bKhrIwoTSeGXejhdrboRJPs+hvoTqeJjAGx1tZQ0VpVbKpPEgTfGudI4O/8LkmMovwoEOGJG2YgZyLJPFAKX8L8O3xmskRW6h4GiRqmmsr5qF+e13lMEHkBZg9M1FJ+fcwHEbj35Z5O9c0trl4B12cxCCweBS45etkIZVfhpnepNHcT6NkDEpkT+OoyT54JXSsd4L92qVVNR9gnwxO2ubQ2d40poI6rxUSBdGZdOp4dIKIe5YypmRN/ZRj4qba7DqOG1Ur8RLuibCiWU9npd7esy1yaAieiyk9dFg593EQKdnz9NQ5P9BRUmeDmTZ7rP7ITBEwhkb5Spjqamsc49krT5Bda+E9j1ziNUIQ6sV+mUhIza+DlVYcLkCuyJom8oV9w9t7XYi2mpzcY6FoAP6topcrGe18NyfXzC9BwIOc91zFYz1v+Z1diAWCycdKOEOQx2A== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +c6/WlA/FKgutRQOD9mtracC9COwgysPCruFGku1Yh6txRyhquTjHPu+SykKAT71rdbo2KrXMTiLiWkoFurr29l5w+lIBufLmZNDCdz6U8XZZqWoWLOb0qWEFPiPmPGkUmqwAStfQHpAJb+zf2oRkf5dDCey83pyleLq1fl12omPCEjQxBkqddEoXXHSS8QQCpP2JP7FDqhbzUWVPsQjbp3D09OUxkn6wjU8RmWM2O9QC8cdPxBbH0WVCrUB/xvxOh4ObyhsZGFsgR5gHMk30UO0Bsz36V22ECDaBQQd27R1JfgjlwA7e8e6ljlI2dlgLJVb9sXamN3ZGK1uDlp4BFiYDNLEgUoMWCzo1arNx7cGSgoUMVRlBvyYDkjuwaVHMpPEl/Qubg6y9sNzoCC0StZw7gvWyufJD7Fyj6TVKxg+ULj3c/YwzdTu1Q1PglmVVSiu2SQWdaLCfHpPfj6GLf424OvkWR7cW+eIvSj0rNPz4KqC5IIkv/K8ELB/FgQIxBCabcxrBaJfLdywdpvNDGM2T6C5HxnTdjqsIfwzmfsMUijp2aL2uClTTvfpDzSNGZSALUfrbeuYq9FMC55pLM9vHApwMROUBjyxpXqs/nGt3gqh24s/hrijqHfgK5KScxDYEGAhPZuo7UbRCX+5hsq9cXUJ+SMmqX9dB4tSENeSoeekclp+jsBt0pmS5J3b8AkjIaH0nINwsQ5OsdOLeeBQ08P6lz4d4PIOmG6IMhReDyxeFWB//AX22nnv740lYhIMyukslEKb5EVo3YDAVbTcGFOZZKcCgxGV7i0HlK8djvQq1ujt2AwSgndJUICq7RDPauMrVA66oIXzG3rBhIMUYIHn806KZ/A2WVEgm6dbGhYPE5vsQmjfOs9+/wMhv+6GwbI/+BC/JNJudPCKG3zL/F12yKNL4gGRJHNRSyVnUJPTEltgcpWueXLpkZ5+v6pekDWn4uumDuACDaFSO25LHkD8Iz7F7Zqp88x2hIKwd5GWJ0iJg1fZ5LB4UlcbCyYDrmJhH/VEuMmfCNp6DdKjkACFftUqEaHq+J6thS9QAsV+eXEUESrZHyvd+rIIxa/juEQkWFYqGq7LqOBdkq2J5E/a4eLOrQZEaBA10AViDuXZlec3pIMPJ+uDaUl7d6jZwtrbS33TO03LRc7vGBLZZQijdpzPGCypy/g6E5DhOKmKZb+lm7tosTpwBRc0pYHex+wQgBim4PV9Eef8O+uoxFs1CTQ442JhohT19H0z4On+VbsAGYjmDbka0pddmD/SP1zA0nKWymUJcXhUaMse/YKFM18IVrRk8BEpIVqoaDsQGXlXmIlyBUdSx4DYpOQa+LOZGU3nQC+pCa9+dddSB5SXniO6KJCD0k/68FPKrBmAOI+VxYV51FVqG3IdkTagg8lb1g2cDlKsBBAqVKyvp+/IQXriW8O7WmyOUZtZ65fb+3yyiNUQc5vvv8QmtxHONNFPF2U5EOS6VrvORYAnkXjGPQ6dvAeWQUhrxbmCgxiCZ+n5GKxspqlJeD3qakWeScNGw6hy6BDD7UnPhF8S+CBgh4ptlXykgpHkjaBVvVXRhQYzrQeh7we9c2f5pZM6J8yDGNjJnTBVE/wgxzHTBCJaYyO9YLU8fIRolmM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25818d2f-348d-4fc1-a15c-08dbb3218cd2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:08.1813 (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: KDQ9LDwrWBrFkh4PcqSdbEbUwlI4yB9QhcX+6SQ7zn3s2XmFhbGL2wqZh/YSksvkq4hBXRZ6G+1JQkVTZGaBoV77vWnkNWWIqCTEzkjwzhNjb2L9eW1tfybcKdPB1l01 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: R5YP45EDGXV2JBVJCTSJKDHZ5CE3GF42 X-Message-ID-Hash: R5YP45EDGXV2JBVJCTSJKDHZ5CE3GF42 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 b6b6339c164bc..dacc29fcf24b3 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 41ea5ba52181e..f442d985ab87e 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 Mon Sep 11 23:48: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: 13380385 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 60D48CA0EC3 for ; Mon, 11 Sep 2023 23:51:24 +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 7AE9DE74; Tue, 12 Sep 2023 01:50:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7AE9DE74 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476282; bh=RFQkHzLpUb3cXWzirIWZH5Dfwe+9odDNtcku8ClG8jU=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=HM3QL51EMyNkoRAdei9GRNIZP15Kf3C6jFbg14bdQdSJwrydbIOK8JPBuafWzWsaJ F1/DYaQGMBXXFyJS/7Hq0avOQomz2/KBnWXK5GjsB0/4m8CS8G/XvWDQxRV6glkC0K Hm+RHyrOdOEut8F5GztceQ+MuSWxApZCvzx3jzsw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 31CFBF805FB; Tue, 12 Sep 2023 01:48: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 BBBA4F805EC; Tue, 12 Sep 2023 01:48:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3875BF80589; Tue, 12 Sep 2023 01:48:19 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72d]) (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 E362CF8057B for ; Tue, 12 Sep 2023 01:48:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E362CF8057B 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=a8CtFWdx ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MeDt293Z2vA895XLBxkv/dYpsMCcfXBrShsf8lr14c6nPhmjwoY+49/Eh6nZOsV9wed9ZEfEe9a8QLouYfn3h3wFWKazNcCD1lUbhhiIrZ4DcCydR6rQDeZoCTNANp/Cx/ekssp8fse15H78xJDEnnogwMlJ26wpndf/DvgQF7EzdgBQG3kx8zEaFxP5ti9EPj8s5Intk5XFrzJuq6ut2wmvD5gPZdFDUlYujIAja0/CBGKOYVLvXi9roB21Wqkf49yCyzQ9Mlh+B4yReLJ4PDG7ot6gWYDNr1P8oFJiVipJVmmw7w1yI62HLCHfmQ/2OfPXL4qsDbAtI0kwrzFx5Q== 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=325vRJxjBfTOnvtMUAjlwZ/DldcvXlDZjAJvfd2/sjg=; b=dh26QxuUTE5CCHuA7/xfvE3qIJSLyxYg1kbbmmyiOX/OvR016jyjr0jxdt1LpShdl2iNU2wp6ZCiFllAOGiZ5OMUcnLnrsqh47DZJQq/0kq6T3JTrCXPRXDXLdxuwBBH3oZ6U9qj8/WaoakwBRa91BzoGH1GbS5gl/0H1vtWqhtOZpNGLq8HpOnZLE0MjAT02SPx2vJqNhiUcsaHNp2ejqVpNpHnunNDcx9WQ8kR9AQ+uZsRbCeIRXYOv6hmBblvgVNf0t/Oq2YgMqBVY3ODtNk4isM3oOevFSJrKOtoCTBNCJ4xBMeHEHUEaA9wOOvUcRG17jqM9/7TJB9PlfW+bQ== 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=325vRJxjBfTOnvtMUAjlwZ/DldcvXlDZjAJvfd2/sjg=; b=a8CtFWdxbykWSWa7Il3QL63zFAZyjXrY+FdoVBbZbEDEkmMsWQwwUxiPiYlfr+tVCVNcetw+2GeDVRi3DJUGU/SlBejZAZC58Ks2DNTic0GYPAftb7M3DJoLabCSYBV7CItwMc8KaxknIfqq5/2I6qdwVU5j7n2JOWYJtFFH3vA= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:13 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:13 +0000 Message-ID: <871qf4s24j.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 11/54] ASoC: mxs: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:13 +0000 X-ClientProxiedBy: TYCPR01CA0186.jpnprd01.prod.outlook.com (2603:1096:400:2b0::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e7bc526-b974-40ca-68f0-08dbb321900b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jRlHiDn6llcXSc0/wfHZWVU/bDqbunNjhMvHu/H99CIM1fUsljQu1P0HkLdNxhbZKAHhV+XRwEG+wT+3j4G2JCOVPvihTV+/rhBtcrw9DY9eewMyS67qy+KVv911HlklPdJQ7U3UnCrBTn8Uyg8WwnCX5psb5Gomg4vvAwCRyeLk1zY5gQo9gOVwcGDwKQtkYu8Hz/9uB/Cz/d6fXlIJnuQX8SqpSqLaroT1Z1MdF3LGk+DkTlx6nLyH5IuCFGBfJtLDX33dv0OMbO8PKbN5TIvfFN+nFycpfrtZ6jlvqRRcw6Ghr8RxWJDBkO1dqPQfgn5vElKUTphav21311pFpuSsIr3z4XlX5zgx1DG1+IafHZRDi19rmjMBkH62PyI9JfmkB0E+BoNU36J5tqi4iG8XidNdlfCCUYDsK7cKkfDFbYRR+7z2r6ulduTDDP3z6iAknPuWRP+l4j68/gYeam824MoBt8qTPVSMiJdshT4NCDyJy5+RD+zczVUQdGnyhsaFE/DVGOKzYt4JaSi1Xf6QlkPTubyCBv1dUMsWvLYJHqGs48Fz9Zmt6VUMpsg8QRiNY69i3NQEq/WKJm4Gk88QTwC9mzM/wqnY4kUGrd4CPY5EFKcjvn4fgTFHHYGqU5Qo5t4x4SaQ2fguGx4xNQ== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AL0X99T0AqX7SrHLVz86qsPC156jh0ogzASCP6SsJIZjVnEhjbDPSPpO35HmG7Sdl/v9FndW4osYmXKtJD3Mw6huLqpJmihyBoVHKT24ndhjvelrADUVb53qTbbbwlHvVkKj0TPN26qvOiZ+AAfGg01xenQCx1v7wgcn44U8maiMtemP/pbgWXE7NPha9kn2VE+NkmooR/280UDApa8YTZI2fYJqkuTPg/EadbDBIPCVDiRUHWnWFfmWXPGFTVcDAEG0a4zS/Ynly58/9ycjE/v6dxSNvhy0QccUPvhgMyaNKPRSMfasfyQZEpZiS1GdwpAz5NhkRBvKHlsKBBJ/DLBsaOE2nWg3cNyUqXhxXvECRztfJxoQ5/5m5oRnV32mY7eu8LHtqAeBiN7cR+82g6I+J6igmja9FdLU8K3TjmYLhgH94VkPqmjgljF43KkBfMhhvjAFdKz4ERx2Wp1AuCSzaZybs54ZSPtBrYdrnhti7kDAZNobqpkmtPDBo23dIqQQlnYGOtzbOwjTIIwUiG3fELAur8RDNzh9719hl4F+TQnFUt5bHduBYcsCvkexN3lPLBfHjQ6vHDKkKR4hr1QITYdoGsJJUm3emHI89TjZl5081qDek89OGDK0WPUnwsmumA1ZIDVCs+sgEC9m8xg9v2Fy8Dn0mvzHZvqseuZzCnLntN1shAk52gfHNpWELL0Kob28210Sf3kqCcpSE8d0ZTPjmZ8ZFNBoWysIFxY4Bzb0/RFaqvSi173nlUD8a58A4rx9psON747i0rst03oyrBvMjF+0yhJdIbIo1IRq9gJWNoFV+3CWHtBkxqiOtG1cgK7ZYwqI4Zt8dR42xYgnk5Llx9k0VaPCAHcAEuRKuTg8j147VfTK7XSvETw7elQShYfPubkiFku3FsC30lFWg0x8Jx6XE9/7E6vs0vbyUjiEDtgvwglLHmzQgExT294pcigjLpWCCVP4d9PaG3VZy8ZXNd8M6RWQ4Qsb/7lvBfXUcFUPsJsj+VsU/r9q8A2qJDWEeOBklSiSniHydqV51DNERG5uR6mDE8nFaaf834qY2HxfEXA8RkHdj2MkugIHGo4D8RxU0rDpLyCmpVywSn4bdLuSb5xMueErbuSBApBrNuHZXArcG5tz1KpKDQ1ND4QfBeI4b9omff4ZFBnB9tiG9WOnNXWPTAaDzBkQ2QCviO3qMmFSJ/D3K7sYSpCX9D/BOgX3b9LjeX+X8pzp6UOFuJIKTCz/Xu7VQBtX1BwH6mN6miyqBXCQ8Mz32yaD3Lu4r9CuMkdQHfS9fw5Nic/vkjdNm6Jf4DR5XV8bRPfK2w8wcldULwzbihp/7NdyvlOhw+NZQ60t4GowxHQ661oWBBxVtAgD5TUC8GHnqhVwnSBLQZla9+fqTTeZcpM+nDudZnG5SsA9BoB2I+JyvW8BBuyYSQhliH0xmMO3INHzr5WSd3jAxxv+LKt+6wlp2QfJ6aszSnMdt4e+ry2MyJ6jzrXyB7y5+g2j4gxNsNhnz+4lltg99wi961WNXSRw5Wwr4h9yj3YICWJ2fuMp+PtDvfXIpXhN1ehlb2KTv6qRvKJTxkkmxXeRNz5IWLjBmulJj4cSRaXrvCSeGjXNT++riBe1QsFuuQa5YJs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e7bc526-b974-40ca-68f0-08dbb321900b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:13.6416 (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: yHxVMsiQf+M2npcDkX5fegdTQFSAjKhpgxP9E/OvLeu964iaRf/TB/QVRPlZmOCqZpCJ/Ih4yvHDTQOyMkWDcjBm25XSKfmNLHhwoTsGVyA/c8ydIKqFsCrZOSmGQaDi X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: E3WIU6ZTFJFZVZIPGCGCE5I4KF2L2IJV X-Message-ID-Hash: E3WIU6ZTFJFZVZIPGCGCE5I4KF2L2IJV 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 457c3a72a4147..01cb5c5e72fe0 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 Mon Sep 11 23:48: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: 13380386 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 4F2A4CA0EC6 for ; Mon, 11 Sep 2023 23:51: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 D47916C1; Tue, 12 Sep 2023 01:50:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D47916C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476295; bh=Mz2AqdxOuEvrZJn7xUYBfFge0cxa1mO6NbwigfE+Cns=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=qMwT62LX2xBV5HY6mrZPsfwuU3C2YIR/k6eysaHinmDrdVkRYLiA6zh2w8EbkvF4Y vdK0XnG4PTHvjJbIDNV/RimmeLEucIkkRUz7Qw69zF+qePM7wml2zR9fMlXOzX4LNx o4ubUubb+pR+NKmxL3C/9USWg/w0vCycGSYWXYHE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2F4FDF80600; Tue, 12 Sep 2023 01:48: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 8989BF805A1; Tue, 12 Sep 2023 01:48:36 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA6ADF805F5; Tue, 12 Sep 2023 01:48:31 +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 9150CF805A1 for ; Tue, 12 Sep 2023 01:48:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9150CF805A1 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=fjZcB1T/ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CeQIwwAjylpy1YSRAWOydJe8X5I/H4mevHpvgkz/mB4DAvGq+TSPZHHvj724tyYraK5kA/mnfyEjz2RS90O7cxhz0kqS5VZwMKyBDTh6ePfDFawtpdIHoBn8L34UUa4zJZnKg8KYqnqdL77p+3Q+kVnML/MlyfsNHjwfG495K6K3FTUCKcx2nNpA9+DaysV0WxW6woogjSuXE+S/uWJYmh6FjVN3p1ABGRbU6FneSuqQJhXpT8KWW7EqoOQ89T7wjbq9wOiv0JtIsrzylThsS5IRK/kJwUZFsu6919TcmYadLcTn5cHnv+bEVyuGFdKiSU4oxL5zvxAeKyIu0LYT1w== 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=MIa1O8Ra/cZgzS+4mcm2IjPk7dIJdBx5578MQUrkgf0=; b=EoBVvtpsirQNNL3a0J/pzFbczqqNiO59rYIVa1SKFW5zYmtF5+ZHeG8qZr4+LghtDt+bvqnNO4U5/HbPtK3gQlQtxS5dculu9cKo+j1uAXzbxd88pVsPJOsyZYtPnmo77YepFsPB4KdkGyy9HjMdB62E19HK/+RChZmNOjuuq4INHorPatGiOblRbF3jvgJCMUzOOAiOxhWwxE1MMsFyN6J3/43fqNSKg0fyW1Ue323NUHTClpX7rEt0XSc3HX1jGqkNffOoxJ/WOPUNZYI9rTHdmhL1xvhJlC+fwkX/wHWzL2fene0gq5syO1p1jh1d0hlj8iYJbukGgXZUylaYkw== 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=MIa1O8Ra/cZgzS+4mcm2IjPk7dIJdBx5578MQUrkgf0=; b=fjZcB1T/uiRJ48AwLqOtiN+iYM/p/LKxs/gjyXGcF7O+d3jRvDUNvTnuCJVz6WUbC9cYpU3VhilgOFiiaX1JZ/NDPHz0ctJwzt4mjxF5ByppCZK90CGYB/wDMZKRRdU7nQ1fJtGdRP8wORr5sStOTl7cotyPRQDda0pWbld/Ue8= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:23 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:22 +0000 Message-ID: <87zg1sqnjt.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 12/54] ASoC: pxa: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:22 +0000 X-ClientProxiedBy: TYCPR01CA0186.jpnprd01.prod.outlook.com (2603:1096:400:2b0::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: d2e04a51-8803-4abc-23d5-08dbb3219579 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vT2VfLzNTMiqQcwJYsXlQQaQgzJcIB9wy2j5a7dSsPU52ZX670ylWRtGhrDtZouz4Ql05if148ZJLS3u+6oseDvJBCy0BemAAvyandt3EUOv+zhc1lMltSq1hrtDJ0rJYP9GPUlCBMnwUlcenDv4IuE4Fmj6/b2gha5U7+MZQkpwFi3ty+4BQjPCojqIja6RIiaxy1/JC4x4t9gkBnNVT8+gQ0lUNVFAG9FFodT8vWU6nTf29ml7/0NsrV1ziKI5hRMt/z8dL48eWrLn7Yi7cF7M1GuXrfsIOdfknP2jW/bPPo4WgnBZYeOIIYOyfGja54yMz7faBSt2u5cvucp7AVPY5dTY9tkhC+GlfmazNlHXkHieJ5YzVN8rNhdN/Lu7seh9dyRHYaFX04NBngm7z7vZCteEq0kd9vx2z7VPASvHkk5gWk2c2eMJEtKlhquZn69GYNCJBpTDVyi0jkGB/PSnSjjXfPMtKgNkcN8z/GfFHlQkhpH75PPtsGb4BPu2HnOGxosB9BObirYDGlk2KyBeKUq7DeJ4geIVQvkTut+hhZZzxoRgETje4cSE6TK1MWUHx2NWDz4szxszTXKwZIqvXTzsXQRJp+AY6RHnk6QJ5KchmvLsRgTPZcz+FwoKz0PeZAAT08hXf0w/f3NsgoIuI0PMrUM9wCpDtONu6/0= 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(7416002)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003)(41080700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BukcPWSllOr3OxPvEINSwvK8vi5mnNRE75Dv5XGZW4w9D2D8LvdWeDv7Xoz2yMsxTVO5Dvzgs+Z1UGUj0De4ewHcAA05Wr5xxvNDdfO5S5On8gwLclwdOXnaefFZMMeHPkkWWr41aRziNNDxWMV+VHoFs2c+xBQnb3PHozBv1ZAMSunnBYztkwShQVqrMDm/+AiQ5OriLAD0q2hHneJQWg1HE6uaFPYW4PZv6KkdSc4NW+LWY4yBZaxiKQzU1WwKCUtBiqL7TWnTEjDJtewu2C28azj2eiCU6jYevWxEZW61raaZb3PboeiQbkLmeGvLtAJdXhqnCYzEvbOFaLa9uESFUU1Nd8EIf1/lo/gK1pjphJIJ1dBt0LRbbtVc9aoTmcFjdE6g37J2r9epxs27HldLIU88rjv+oJ0bhBO2AJXS0ozIQS0/bYGUOtTNyOmY76F50GAgWswYCSVc/Zc3YMQS6qDNcMyqgOhqW4mm5z1AwiEhtf6K6Egqt1RuweR5ouodzrzU4A3FPq8J3yVxCpYnYN2/TjUbMw1iG3VpSihVhcPOdH5GA1Ks8UIydg84DwsgxT6TYWAru3zVa5yB9MNJA/QHhPlwrW5NUh2Wmg1YscsLpu61wKJSW2q2JfW40+LjlsKIYy7q2IZPBPQa7pomiJBOZr9i/tm6UpdRWwspYcilfwIXV4e1TKBlPQq+rFtE8bTuVCpcDYvGEYgfe1MSMM5cv/rTMZbeCbVPFoGG1PsAlaM9QPMaMtfHg1sdyDxk7+T+b9pG6enRNLXLfO8f612MQEGv65qxOqu5fGGwtfDlHr6o7YTPAtXvopg9j6KD8AThwcnmOil9fHweYgN1QNtO0JsxlCQ5JwuUWrTXIjbQ3Ct73g2P+UlmIuH6niphMCrV/JcAu6Y8uOIolklvpqR4N9HGaA/P6LN9yEVgUUUEGIoyk+OJDEaoNa/oXEsJu82+yViZbGwmWSbUTw9mpoOLgCZoArytrSTiKAJhhpEqM/7eYk7wePVazS15o7bIrhDV1OW+fici2EM6BzMS6/XEIsQrmYS0mnlBZreYrLhHmltzyzkY/o/ax7wz/xozAabjN9tnqU0C4E4NEUp2J+i3tNYLSR6xSKDgMFU07z1vtxQc1a4BiEd63X05balvWPHoJGZXM/tbzyAov8NJZJ7r8qmC2d42wurFlMKV+2L4Fx3wwJdq61kDqmPCR32EkQyM5L1nuBdgLWR2IQGi2HmJll/ohVLK45IjxQC8d8SS7eAv1hnQzf0x+6LuBFjVE6zqKmAJHJ2Ru+wIVvJomJH7PIld5P683MphJU+LZET7SwkTDQ0KjwFfymynD7HwN5ZhaivchXwlvjqmpS+/789/t1D8t5ohlNrAyOmXS9ElVIsiS4Ke7GGSrTZhn31AgRFmvvHsmcc+PC63FM4WC6le5dOgQeAR00DTidpfqPMhdrEe+d8n2VFFZstpiuFXlIQlQrqjK7LGR1u/8NiDfzUlCRHPasmTjhhgvlP7vsMPEguls0Y6rtiwTEbipKAxQjZq4hbmK9J2BH1yPMeR5AhlUcVWIjm8gzCqwL5MP4qi4UaBnhsJ+aISQgUBbqPBWwwxLYwE5YCksEp2F09OpNe5mt3HXftHqwudv94= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2e04a51-8803-4abc-23d5-08dbb3219579 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:22.6931 (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: 1/lu/EdhGl6IQyKGn8hd6RL5kcz8/OEHPWs3cIof+1lF1akH58oztvjXFNjjV7wVyemW9xeY6iL5VBy/RDktVHyigJWTEztJYmhdkqXqBcVg08ai9+0gbvqrX7t96n1j X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: 4YBXR65JF54VV3QC6RMRL3GOKZCS4XL3 X-Message-ID-Hash: 4YBXR65JF54VV3QC6RMRL3GOKZCS4XL3 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 437bfccd04f8b..849fbf176a70f 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 70442315f5c59..8caa1aa99bdc1 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 Mon Sep 11 23:48: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: 13380387 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 06AB7CA0EC6 for ; Mon, 11 Sep 2023 23:51: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 0C2A6DF1; Tue, 12 Sep 2023 01:51:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0C2A6DF1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476311; bh=adOXuiv+aiNDhRqt57ZwKXgQ8u8PsVpo6Xx0LtJhTj0=; 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=op79ZdGwfgIl07efqB118bi6KN6cd3li7BilH6wyvVtQ0MMIoqW+hzHkkZhAEl9hy SdcjjyJZERWPGAJHopMvY3hGo7L2i11jtYJlsKgbvzOwzA8H/fFFZ2e/7XPhXC7rua BlCSOhqVk7/qxZeLmeKr6H1dnMg95cYrKbHYtZkI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CB46EF805A0; Tue, 12 Sep 2023 01:48: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 F24D4F80604; Tue, 12 Sep 2023 01:48:38 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 72019F805F5; Tue, 12 Sep 2023 01:48:34 +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 45804F805A1 for ; Tue, 12 Sep 2023 01:48:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 45804F805A1 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=I6Jmr/qu ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gCA9SnG3Zz4p2leM1LFpwTYKOYXdCVBWMhNafI54aw9pEUQsLCPxeYrbo64AA2cWT5YVtghvEh32DvjkGUfrbikGFU0lOEbXxhVe0aUWubDYAAiSxfhpZ7SUfG4KLWS9jDVJfTBPgYSLhg5x/QPu5i9q2gD5k0AsGJrqOasyYE4DmwizzZsNFV4JBxGJHLGSaTz65uOpYorU5ZMB2P0v0auLB2Ionv9FA/l4YgsUDaAi/V9iOgXDpQx13xijkUBfVWyGP1iE3wC7mb3Z4sL49YUDOKE0212nYxDvJy7WW2eqIDDOWFnEnkEhoVs5ocC941CVM9wzeyeY48ZWj5LJ8w== 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=yYE6XvI5GtniFhYdrcy1Vb48EScrcyHPrEvV2pZ/KP0=; b=fAMYSELRQSJ/z1Fco2VgSWvyqG1jghWZmJBkH6WLH+mwT38zpUkPeys9AKbxE237QKwF9502P8aQNBc2jv8mcHGXW2fggdrDUbU45EqYJ3f1WmzFhdZrtDvbRiwI0P4+MYGesR+uZZWro+JwuBd5mTbOZGMKqcT4TbQDCUj6Oh+s2hWLSqOm2BG7HTOvZMgzPoc7hC26X8riEGsmyJ0y5BAXk4I/cYHfefDJd62qnv4uyEN69cO4Y3KPy8gpdakahAVnaKt6nHVmtYpDzW8iUnjo8BXp28ArScS2I28LaWfZCa0mbDSs7k/NFW5pA10YXbK/0EXlLxwdAKNfLsbxhg== 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=yYE6XvI5GtniFhYdrcy1Vb48EScrcyHPrEvV2pZ/KP0=; b=I6Jmr/quMaWw6BRNsOSZPN4ERDx3hAjiR2XFQEfHkadgKvTqWaefiB46G7Upl0foQMp6oydbjezQJIJZqDhuxNbsb8BzsDugSPwcEorKuLMoHA0YSkHLu77Sq1yCfNqa+l4LKLEUhzrtI+UTYg+6D8Yj8BcrL8SQT3cCjdP2lE4= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:28 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:28 +0000 Message-ID: <87y1hcqnjo.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 13/54] ASoC: stm: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:27 +0000 X-ClientProxiedBy: TYCPR01CA0040.jpnprd01.prod.outlook.com (2603:1096:405:1::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 247a98b6-965a-428d-26b2-08dbb32198cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YEsbPcjvsq7usJlYuwGOJl99/+Z7tMt0H6rPNQ+ArybAmbxKemyEeGNH3la5FLJJafDnog64E+8opEk5kEQ9PWgNJdZYUWIqxKqPPdzinnPIl5zAxGpInATCCcPc3xlU9Q9NcSzVTK3hju1c758J9sQ99OEWFJ0So6jEgwMrugflACRQNmabzy+pBXi/Ljl6QzWevXbezGNNJk1n2hfpRpOZRdSQyDB1zWun24GIA06R1fVf5qYatXzdcv3UZ9I1690pZvuD+mb6Xq6Z0R0yfOdJSY1OZuq1sdtZViiO5ThRjrIsnFdY7J4+b7QdcC70eQS15e7jdK5kMuTor4klgIohApL839FPJjqVBNgkd+qPXmBW54sHWu13XquJbx9Q9/pheOq4CIVnPLVqxOowNTe+EVtSaBO/NDBITwMwQdqvF0CzQ4+i1FYqDUVJtGUjOe3g73oGpLeEPMhBsgkbZxP4e3/RBimtiCESxCM04MpUTGLw8CH73iA1zkg8w+nNBKsckLD/LrO4L1x/+1WVLPsgESsa4Prb0pUrriHmJtbq6FXMgcaUQWxwQvceJi1iltkyi8jfxDQzKgWtPf5VKryL5SplVN6mZnvpG3xW45/en2ZgHo8vMFxRTtxBjLtGRcxGqYrdStMa4fX5uOv3WA== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s6auR+ciB8fUN9oWZqtZXYWLvygHKxjqly+xPhF5kv2UtOn5854p/99I3hHGT4DzgOqeq5jCBp3ijCyLy122lAPyc5WWl7wY5DGmEmtU+yt5Ad4kLYiYzYWQKWn6UlMJWP4c8WY43aYRo+HdCHZpkKCvlfXnnnOJ3A9QC3JOYNTcRUiF1FEGmxiSPe2lc3oSQqbvrj3GPjFN4z0hWzeLuaJwkqud10NbXZ4yXKfp3DP810GrI2D1ZidAzwkfRKFYPmz/kiTTe0JWr2JcnU4bwnmirmAx/6+tmCCLgC7ZkEPlGHIgzqyejyexVOV6OZy/N9hcFk4Bi0H2Or/akg6P5fXkN2zYSrfV20ci/1GomO9Y5Deea/5bTqwsjPTJIQT5uzIfqA8IcIs+TZQ96uhilJt67IOsnKEBYeowAgnXwyWoGZc1cYwA98JC23emYsTvGnmJ1B+O8hKruHRv4M8JgAzQWDvb1DpRH5JK1RoEZXL3KZljgo+YVn2A996mgbyT9uPygnQurg+M/yELWUMzzOnwFcSxyx9yTKjbXGkXHsPZYQsewsWDuUXxykuZdreBehHmj0k3OQX+1Hu7oCneGcrNSQ9nQI21Cv8CgJ56zfO/irIk6TuZ2+eSxtWPxWp6VPXbAPY81joiaWjpAP8bW2d0NzMORBuw3GB1hk3X5oKrPheG2itCu6fS5LRm474tsOwFe/7iUPMI2wkT8AuV33Mv6Q20GSPgyN4TbSiPN1uvHsqL6s908QiPUBehBqkO/1aVPBrVNCWBiaqnK8wjmgu0Q2PXKHx9uquqIV2zJm8od57SyHwDq4NSxxsU3nxPjJfGtN+KZ9RXcvABUmt0BiJ3Gqjuiml7iFZ1prvujCVtVRiCCzYsD5oRj5raXORhfxTmzbCpv1ZPF2Twj5XDbqnHXijMwuWrcUTkMlOhexw2k5vDN5Jg0N2rvtX8H5EadWOi4iqRSrfhSSxSMlX7KdcRk+ZFPdXuXOXrRFGFTD5uzTkWGr7KSqHf7MOyfef6hi9xIYO9xSf9N1lpm/uAH6uKDmfb8IzszMRBz9/a/ed5DEkp/XnsYmXsP2uKVDSqU/frJ+mTvQLcNqbQim1B4zkb8y/ZFv6D28pjm2Ptifzcvis4p041GoWyNESYKYIsDwCdF8Y9KdpCrFYreuKBkjuHoMt7OO+59tRAerq/aYg/6eeci3Dqpr0uZ0P2MtYnEyXuIEFid/BzepQSGkPsLi+vPlTv0zIG42PUUStQSMhQ1w2zAfdCYnsldoJ0P6d6Hxq79oYl/AEuxE1zyIx0sSVtH4/pKr/WkwbmfshDQqxjInCCJtEPR5qCcMk+Cqr5RCaaYcnVyNM7kyutC7dSKSks7LokzUolW50xu6IwRxY8NPdo37MkhPTJiIOFJZXoTF493Cg31muiYOVsD1yiYKiPjdk0k3ptgCY+/lEe2cSTWkbq3psNK01EYyOvuuu/m6piRw4u2VnxGk33cZ2EJJUYTqJOqx2N6/kKNEwBBmwQ00jxP+wVkeGDIf3qEbs6mo8d3zrGSBnqNXZ4kVtSzlG5jufHphEo23fMXkHkuPxxowxrGySOIADWWANIX8qXTThR37tut9ICBcHKHw9XZ4rxz6etgQXkNqFhPK8Xtos= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 247a98b6-965a-428d-26b2-08dbb32198cc X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:28.2938 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9FWC27uYw8WcR6ikYw/g7Iy5gbyJMr3znnrBXxWn0bJS51FxBu04veHV6Bb8EbN4nlb7woG1iwho4KsPvJ2VOIrJVGy3l6Dv0j735hTetbVYBN/hiaKOkyDBAhCh5Sjz X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: KDMVF4R2UMH4SRQ7MECEA2ENPE3L2PJ4 X-Message-ID-Hash: KDMVF4R2UMH4SRQ7MECEA2ENPE3L2PJ4 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 a8fff73786413..fb5dd9a68bea8 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 0acc848c1f004..8bcb98d9b64e6 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 Mon Sep 11 23:48: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: 13380388 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 8BBE9CA0EC6 for ; Mon, 11 Sep 2023 23:52: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 2E1A1E7A; Tue, 12 Sep 2023 01:51:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2E1A1E7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476333; bh=d+IUoRymcNcIRUe0F0RMqNLEGUtYBfXCcckKSE2cblE=; 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=gl17ELVRnoCjMXjV9DDLglTPg8GqRln+tKIbKPiUxXzDzgPO1hBG/8aKkTGUp5XVz 4gAAQ9G2rI+wHr6oImyfgiInRWbB5mYUkwSzNWJR7IklGR2Jlv1cQ8po4lDoJeax5A zbWRce7W5+15t5Qr/MVmCS1xYCAkH5J/6OzLkn1Q= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0A6E0F80608; Tue, 12 Sep 2023 01:48: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 8F7BBF80609; Tue, 12 Sep 2023 01:48:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 66378F8060A; Tue, 12 Sep 2023 01:48:40 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20715.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 304CDF80602 for ; Tue, 12 Sep 2023 01:48:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 304CDF80602 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=DpIOwtD5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZdWb/c/e96CUFm7YMvIzo0eUQ1IlhJFtV04LWA7TRPekIb/KHLtJEDBnpJy7ib8kK03ESgwK7ZuVBjCuWSdbkykrr9kpJgt2BTfHxm0w0XCwYyGnLZnMHs12RcnHr6PvjNSjTnOBYJF//4z+MmdElaVJ0rJhgbrf4kkHVzlpTsezm5X3V4WpVT5P65vCPnWoPRxqkjq2eSBA2LatQTUZTyi9AAHP/tIgNA3cOBzetAkqAwSScdmB13OJ6CoZvLfogknrWu0UIOC3cGuclFsf0iC3GPJcKfXhgVuau46BBsnn83ROOctnof5aGPrRMaceEiuKfnyXrTIagJAeB+2bqQ== 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=/zsqiBesuLXi7+iW6HRwRaiu2J77FkEu/AkxvXFst8o=; b=kLB0YOmLX2w5xl0ZicaolXk4qgAylN09o0L6NqA2uMZrrkCXQOCvLMbT7TwjenCs/DQFRqslXkRgfF1WS7gy76BoEOlhX4VXk8pxDY26CeIfoSMDIdvmjzVZO2pGrV5W2CGsck87ycBtsLr4Q8tClCvmJRxL8QP6tqraqFMP/9dF11FHn3xrC34YNHZQQ5BfPwrOm+EGR16qtwgybf0C0sWgMiMnNCa/mN40kdQxUMmT6vvMO3ppVUTd+ArBxzzoLYWxa4aEci7FQoq4Wjwpnd2/ckYrDEi0OMOufrpPk7xf6xXA6QDvQqYiRNTI42qyGTP+IvccEEz4EyM+vzIHiA== 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=/zsqiBesuLXi7+iW6HRwRaiu2J77FkEu/AkxvXFst8o=; b=DpIOwtD5OfPVeM5URoF3n/BujTTWzxkbHrZJ1alheKfzg9O4IjiuclhHh1MAhz3LWksX3Rngx9J2AS0w6CyY0oDoyqdRtyGK9poTRiDVxO0RV2VcAsOjSPT5yG2qjZ+Tf1cGrpPTGDKwzMjFjnVMaoT+71I5aXFggHWTsY4pIrA= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:33 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:33 +0000 Message-ID: <87wmwwqnji.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 14/54] ASoC: au1x: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:33 +0000 X-ClientProxiedBy: TYWP286CA0024.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c0511cc-3316-471a-d6bd-08dbb3219c10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NFZPeUoZX4fHHaNTzpbwWS4EfiwXR+ynqcHqATlQdUaF372SA0S0xIsc/zGGArqhohKEzoQP0adEQqEs3uMqXE8QXXTliUMETSgYSQ0Fsq6AunDR+rsknZ0RNW8s4VS4pIKbRmIk5pQ3EsBQCZLLCwPn1nEyZgLE8+eBySqEW3D+fGX44tK77iHFu/ski0O6LI3JKq3xj0h3m8TFTtILRZQjebqVGU/BByhVyhlUMYevj6JqHjvxRX8JuEtKSptPt0dk0k1oBATqlGkf/wa+xbyqDTYwupvC1BGoM2vttft76WjDR0hGrQIz6HGLv3IE0c65f7/0FhZbTEVCVPwfHJMEG/inSykLx5NzlTthQeYwUyA0y5nKYlXzxuKyxdyigsRV8UqFP6KKOg23fTDZvfsibifJ0gnO6Pgfbz2xqmc00bKjI0jn+KqX2X2AJzJX1Xx59dMideGfkJ7d5whmvW0hgB/NZX9u9tyfMYsqigGBI5GqV6t8ACLl5fCeHWLhYk+gL0xwzshutnxJNc9BMKbyToCR+FILKkXPRdRoF3hjeQt1FKUGUteLSuFH7upZyKokMxI7AEKHrK8F7QU/2kj1hsO45yfG9uG8EHinT+guHjuBAbP6PTB0OLfbcGF8SLb7BQNROYIlR+ouZjkdFo9fHZjT/EEWyGPyqeRTaME= 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(32563001)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zOZyQdYOeK7iJqeSfLPtsxCH/BpXGz0lgh8ZUbv4ygD4ys+fxbSJeAduHlr/C0BfbqgaQWFnNXxjhjFHcuh96GRbr2jdYNREBdBRRFc10x/I55ymFvDqBpzmMwMqC5UrMTKl1tAqEgCDQKgOtr0kK72ZOq2X+YFCVp7urbTio4OTwJ9G9XnaE+ZdrrQyejRpnE0l9BhK5o3LeRhZtdWf5QVeBCFN69xc6fgZTXyvOTgMJG4Rq7o1ANOiwEQB3ITOE1nDLeCSoJkaadL9ZGJA0UuVL9vahz8vTb7DtEQk/upoi/UeHQIa2ijcMbipOTPHugq6pcysBY5Pdr+hdSKGNwyo4kcDwXTi715gb7YMMmvYR2tRXA92NdmYrS9N9u2IzXBh1atSpWHH+5fKIaZShQqtT/Tjw2dBTbKP5u3+2Tra9ZdybmFFir2/SPbhJmaG4Ukjm/9Q29i7qXRSSm/T3NZfvh2QoD7XOJHEoFFFsNh/MQMb0W+CZjizL9F1PFsquo5P9MFA/Pk2NYiQUK2A4WqyoMEIkj/cZeNPkXQUZLcvU+A6/jjJ4qV4+YtmKpW10TGT7wGJc6/erMiZEPZtvXj0uCzK1IO3NF7+bOYiLCkr52k9r4qGtOMwRUCAZy5A2ATWHzWprlLbPHquZ3D9XuDUMl/jUWw5zTaHHconjWdF8Nu+BCb3egpLpbRTIKEk9n3xJlhBxDLGCNf9+tkGdc4xBJKotW4kFhQDR61sen6SJ5p3hV59NAslP4H7x9X6O9RyrDPTT2wgGmTIzvOg7rAEVS1swuMmi2o5ykN/PQZIRpRwEfIuaPOkcEM+ZQSV8dgE16xE3NShT0YpRYJyaLMQ4XJVxfT9fYys75mU79ep2uuVP0bwE1e1nVtwqDm0xYGc+sOKPCSXHIHx1k0ccZlX8VGeadout/d/m2uTAj9Ti9NTfd2YzR14hr9HMQH+tLXUjuw6smb35+6/wHglTnRxwLd7doNiXBCe9p8SJuCf4EW9wsyFpcQueugjt4x7AdnkLOE/vrpyYJX2W2PJgpinbaKa4Tq/yUoUKBuhYbkSpgEz3WeLc8Ap8q6RAkifp3/xuKGPgy62N1xhigQLenWUi5c+c81bHrmfSUXJueI9vcj6qAPRCBZVX+5KMke6ZZ8abkQtdNwAjZLiEid97F8gn2Wcz3IuN+jm+S2c6gXlW54v1hIDqKj6h+u0B3i6Gwt6Ugqkv6oBhCaDtgQ5SfmpPA6MceDda5L0OqyJ72SsOr9pcYBHLXOMqp9oQLvNlubs4EP98nzLbqPFq6uDN/p98WTi935q7CqP6ALNgC1hxC8elPAok/VENGrLZfJZguhkEodp14nYSZQYHHL6pKjBU+VxJFnYCx7LFtLFUkS5/rE07/YhuFru7nCetWqmgfX9uZbMj+xuPvh8YcpiRKdAWBOTW8S1j2hEOh47wAbqmN8DmlHQ4c3BGfZoLGY2ZfMTtJW3tVjh28p//CD4Pdg+Q2KIq8924757yIaVdJNdurjH3SLnYCauPSwUxBkn6fXZ9kPuhgOQDzFLLxP37bUiM5bZOeQ6gE59QCuwVY7/GYSeGLaL+0sHO7Dya8QIzbpllQGSMvYA2fMHjT6pN4vR+qYF+LmgIWs8T2rK1q8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c0511cc-3316-471a-d6bd-08dbb3219c10 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:33.8448 (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: eKd7xK0q62AjEfm0A4LJxKnpY21MhHJXCuARMuqpFjcK6QvkcjwbvocJugg8N+Zdaz2+gaYscbVX698tZaj1RonK3nOmPUPqeUoCH3VJL/hcRJNNfELRgnqfSvKw8Gcy X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: 5PBP6NXFQXAB5RW7MWE6W6DXLXR5A2XR X-Message-ID-Hash: 5PBP6NXFQXAB5RW7MWE6W6DXLXR5A2XR 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 400eaf9f8b140..83a75a38705b4 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 3d67e27fada9e..ea01d6490cec0 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 7f5be90c9ed10..d2fdebd8881bb 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 5d50ebc2bdd56..1727eeb12b64e 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 Mon Sep 11 23:48: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: 13380395 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 EE25BCA0EC3 for ; Mon, 11 Sep 2023 23:54: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 04A3AE0E; Tue, 12 Sep 2023 01:53:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 04A3AE0E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476448; bh=+gWvyT6JEwiOdEealqR6YkaOjOlMxwNQcb7q19HmMvg=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=BiI78rU+ljD05y9sxBi5UD4QfaffWJa9fIeU4KByk7VSW4RJacXi6Ig5NgO9BDYAD mA/MhHB3x1Abr0faAa1qXyHDSqa1+ckwrQ4gVq9li9qKUwVhcITMwZ5PTmCphkqqgU 1PMU1/3LL9XaaGVEGHs9dBbIEwD+plkUUwHnl+20= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 31A6EF80633; Tue, 12 Sep 2023 01:50:54 +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 2E2C2F80638; Tue, 12 Sep 2023 01:50:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 89056F80431; Tue, 12 Sep 2023 01:50:43 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20716.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 58C7CF80431 for ; Tue, 12 Sep 2023 01:48:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 58C7CF80431 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=d3Nw/laS ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YFTVbA9DWVeAz09TmFUt+ZA2L0EykWZVEPSV+Q4faYd8Y90HHPX3QRauW66yKb4YcF1xMLSoKLfH1u1fz1aH/cucl5H/R09Dzses5nOjRmN6T7W854z49C04QHcbj+Gq0IXdEg9hAGWdItQi/cbgUAf7Om425Kno3kPAPoYtJOUb4kYdoqTukHciuKlclo7YaHF55f2uiHVQx4pBftMfsAx0vLmVw+hFa3UMco6cmdbLSP8Dxx45gqQ/Vc1Gr3uN25cctVLPkhL3RLRCUt6Dvvyiu0tsJ8KLSA9lg4JPTN2eSnYpaeChMkiy1dCDUSLGAF6f10Xpz1SxqbIsP6OWhA== 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=F9Ejj/85ywczqeLIiAatVRtR2K9WO2L3RvJ5rF/khK8=; b=Ta9Zx0DRfHOOemIrGEEDEjdIsorhzsOYT0frsmyRpSreS0wX99W8Y2z3orMBNLPsTDgQ/bAAwXDW5cVwlizdxc0gZS3fjvxxJtfbZK+DnisntGVVmeAWyR+xtBG4sj3eQVJ5ELJT/HDPY6hILKkAg4VVRyBVIDwo4wBL/JqVesMBYrfmTkBlkmqLXfNT9F4nM0+Bkh07ePryDDJGcMtVqVzIoRLTUSqtDpuE4oNDr9iKPEicGWL6XV24SNQPmT3RTdb+3lFzqTl55JlvsHLeMSvsAjZctFPz80Zv+mnoBb1qn/OLTXuImiXzseQtduVeoQ37F6s3CFv0RsQjbyD3MQ== 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=F9Ejj/85ywczqeLIiAatVRtR2K9WO2L3RvJ5rF/khK8=; b=d3Nw/laSU5plu3lmjc6m9i2K2Y2/x9Fx4XeMzJeImtSRqPe58HPExxFr9kLWLAXG7FVzP4sEjjsvBmWI1i4vv3ULisQxmFvw2SoqFo5zKoJLLXJztwCX/UodSLgEFfR1eUVsWBRRURbIkb4iJLT9y4IJa85NobdS6PPjmO4hQ4A= 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 TYCPR01MB6192.jpnprd01.prod.outlook.com (2603:1096:400:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:48:40 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:40 +0000 Message-ID: <87v8cgqnjc.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 15/54] ASoC: qcom: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:40 +0000 X-ClientProxiedBy: TYCP286CA0139.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::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_|TYCPR01MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: cec0de33-d979-40be-da96-08dbb321a011 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JGtiNf5mRkw2pOGwNQUUU9m4eDEmXfJiG7VXXq+g5ZlpLm3r/cve0ukuj/vZg2JfgzS2PcU6Bo4oPdCgcfgzubNLminxUP3T56LKZ9v8CV2TcTcDclyznIESfsDsHjQMjxGYKM1o15+DJgneMLdDNk1RDfjPgftgQozecrIjBKno4RaN09L9FMLY8kKytVaVtj1LMnsSw4obXoYPNYPLRhuHjxLynj8kVmORa34GS4o/f6RS456xztxfjiY8e6Ato3SzgkJKi18yUkkibLwPadfAi2W47ZlCXm5SVvbrF3Y02ERSdQvkAebUo1PlCElfIGySP2LhIedaroxuD6AJ063pUM4Wjn6q62lTNoPmERKsQSPLhfGv2ceZ4x2nJ0DsJM/UTIJRvio0hCGGJ1UdQs/M0/CeUVdU3lN5BtqgsgVLcabi4uEG247QDO9mbvAOpKUlcbltf6zxCPHwaSUEEIAMLjd4cIYjZpS1Pm+HgPk8UZsOjt3KBnefvlsX48hwtfn4h4HGSG9uTz7+BvmLoeihQopD6VcGUEj3BVPMQrnreyiz9OsLjlI0WOE2UYGgZEmCHesgX1pce9S0hVTNs50sh82gKfpdlxNxuJJxoZwn8zygojFKEak3kXT/UbzLuYC7cqljrq2wFimwPktIpQ== 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)(346002)(396003)(366004)(376002)(136003)(39860400002)(1800799009)(186009)(451199024)(6506007)(6486002)(52116002)(6512007)(478600001)(83380400001)(30864003)(2616005)(26005)(2906002)(66946007)(66476007)(66556008)(4326008)(5660300002)(316002)(110136005)(41300700001)(8936002)(8676002)(86362001)(36756003)(38100700002)(38350700002)(21314003)(579004);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rIQWvfBObOKyfQJroN0uzKwFZoG5SciKxXDBrRvNatt0bSfWnbsvbE0mEzSRyqkFyNRcN35VCF+9Pm69PQIDFqXRkvBPnX/qKIuymosH24Wbf5V/F6oW1py+PaBEnYD2KxUFi37+xYt6B0wMyCJbITBTLiX3SNExJfGPuJwQi27wYx9kANjp/WET14KWM1bubSkD6etGfc4AwvO5hHqaumxDJtyNhrEOV0UvLPtsOhN80GngwWFAJWNPzGXX95TkrShGgVSd9VaNiK6TLT0mcTF34mXXXcTNU4XKVA4jf4BGGm7okSkXFfW+AwSCLpme4IV+NWzjlpbOWq4Nx7jmdOTFGxz4JMV7w1eW1dNPgwHrlFtwJuPb23Kmj2m+en1I9qqPw7z1GXpzX6KII9LidxmdbKxykbFUecGhHks51mY+TlW2QAESBK1UCw/Xwux2I9b+eOPhF2P8Iu5eE3bY0xRBGl25feSLgKNyZAiu7ZhGXLaNXnK+nT35EkpwyMYUiPXdCuaz9JpFVxZawqSKnjO/u98lK8i0uINOvwPGJaWDg8Ob528Ejx+eZ+e9A3VDizSCQAA2EFCCOyFIWf0F9lBH9SlGT3sWSgmP4BaOWfiPBB26oI1DIpKzSwoAXI3uVxtCZluIdvQ/MvNPUYxX2+641wYjcF+aqixmQoCyKnOKW31rmAivazm+qTPFLmSG+/1wqs6sgX4zJB3Ye/rMW/tN1fhua9s8uleLGsZuRFBldiyHz8MyfgQuP9NYRrg6sxesfKQSy0QTPwFxC3gf6PKlB725qi/Bvug/MzBFw8i2Hmnf9mbCD51Yr66t1qDd58J7WLe1EJqJ5jQaN5LOCM2alLM78bgPCu/njj6q21OvRWpmjHc3lW6+RzYaBj6jlzhGU7nWTfsDrA4pN9FraXgySlI3/WlSMXefCGWTcU6YxZvat0/P1KAnvNhaeaeXbTB6C6k2G/IEmKGL2qTMmHuZqkYQlLqVDTw/pacElD8QP0wtee4IM6PrND6SvybBS1y5mZZPzdgKuBvmS8j8GVi3F8disboiIlNWZJag4npY00H9uq3lyscQ2FJ9XuTIfJRynMHkn30cZi/j0J32tzN5TNbyMEzPkAzg6dzD+O4ipLU6p9m9GA/HduBWs5+kcPvkAERs3LEAQPxydi7q+cTbLU+Z8wMK+KFlZGhvuvRgWc3CJoyyUOFFzHsUmj8SM8bkafliW9XmL5xkKwfXVtcb6jA/YE4RipNhyArZh4btWcENvo+tLI+eTTRmG5LL8zhuLOUGfjasEnreD/gygt2FNojBQ+d85ukh49kuos8XqvPrpa0JeYrhobSFeES+BY/c7TUwbt1/NJKkzlPzG4adLVvSjE8aAMYsFt8JF7AE4tg/4YN2bRF3y9ZASJAhk/Y3mD41RSvviu2yg0KScaoGjXZgksBpQbUjZhx4xmFu9nTrrvxhaWk1MZxUnBJgLjQPM86eJ6sNjARD5tUTLCHeYeIhYObhu3gX6d4dD2eDdtaKXdiLsAb8d3gD1BCdrOF15GZCe6dkpzEoogBCcJyXHXiUdPvQOY9MWay01hUJS7C29+0jlyZ84DxWjCQrwEJqIUOd1Kz+UfulPtNMSNBbdlmy+u1o1BTO5OongAQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cec0de33-d979-40be-da96-08dbb321a011 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:40.5768 (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: CKlSW8l6kXrP6v2fVW648hZ7r3qeoH68dfbMQMk2r6iEzjF1EDP6KWqon42ZTmiKAVwu9C3FoxY/DCwxzywiCt9OHUFjFsDvZ3h0JVIslOvcDbRmX1Mobu3A4xbP6Tq0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6192 Message-ID-Hash: MU4ZA2CEJUWRWDQH3IYFUS4ZLITLWBX6 X-Message-ID-Hash: MU4ZA2CEJUWRWDQH3IYFUS4ZLITLWBX6 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 6de533d45e7d8..ff9f6a1c95df1 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 5d07b38f6d729..cddeb47dbcf21 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 e2d8c41945fad..f2d1e3009cd23 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 31b9f1c22beea..8221e2cbe35c1 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 990d7c33f90f5..73e3d39bd24c3 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 c90db6daabbd8..739856a00017c 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 fe0666e9fd238..5e14cd0a38deb 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 bba07899f8fc1..c583faae3a3e4 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 57c5f35dfcc51..d1fd40e3f7a9d 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 43010e4e22420..c23df4c8f3417 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 14d9fea33d16a..cfb9c8dbd5999 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 29d23fe5dfa2d..25b964dea6c56 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 1a41419c7eb8f..ce89c0a33ef05 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 9626a9ef78c23..6558bf2e14e83 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 80c9cf2f254a7..553165f11d306 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 Mon Sep 11 23:48: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: 13380394 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 93DD9CA0EC3 for ; Mon, 11 Sep 2023 23:54: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 639FCE8A; Tue, 12 Sep 2023 01:53:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 639FCE8A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476440; bh=87SzP20zmipEkoAP5OamnfZ+RLk6+e/Bk8O/ksupX2I=; 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=Xj/BXobqhZF7ejYYRsYRaPEUuXVXja1BrX1N6Afb7kYAPYjxcn7LIeb6aCdqQLMsB JVSDzg2CH53tOJZQkJQ/nyDOzNdI/lRIS/B8IuKkPGy5LWi9fWBWv2FQNcPR0lnMCg MUjsHk+R7ZE+/W1ZOAP7ODH9G1BiITiAriF8sE8c= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E374EF805EC; Tue, 12 Sep 2023 01:50: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 C22B3F805EC; Tue, 12 Sep 2023 01:50:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 089C3F8055A; Tue, 12 Sep 2023 01:50:43 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::710]) (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 93469F8056F for ; Tue, 12 Sep 2023 01:48:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 93469F8056F 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=JEV7oWWr ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QMJxyxe8PNkNivDPRihpmq2JNDfYkMVCx0NRkviT3Psfp0CAtfH9aOXeL5ApYvePNBWiTSOxh30sOArdl3MRzZNdrVqniBkLk9o/C0O668GxCJXIWc9pPg/P9IyXcEVD7zESTrTcpNt3tDhvrWctSkY19tcDEOA2hrn8ABkHGBkc73rFuHjr6v4xPrbH31Q4VyWwdW7ibdUZzfMSTkiHiMneYrDcRQUWdSz715b0kr8mC4fLgDqwZQttYkL3Ltbov3JWcTdD5ir2KNYzU2WwUnFAFShYmOUpwV8WF+Xl9KByQFd3xo5XyWBO68mh6elwYFthMP5VchfsE+7lNXgrNA== 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=Oe7A/nGxBnjrPcnf0+hR5DQLCYwNtC2iPj2z/Ynflrg=; b=nTgFKNPkqr5uB/D1q96kgd3E8+Lo3LhMpidjHphe4oOQIFxgAH4g2ytSPv48UzkB1NwS/U6aVhrVrrtpSftjm/S0OLzAHeLZactmjmdP8tBB/gvJ4wjbsBdbhAcDqGZahEBOCMDpAOsTmrxfy8i7R27mnSBaIBUTs1+2oATSW9kmBoiOAB4RvIpnCwUmRw51NIRnTI/GbgnZ3uXT4RU2TglqExLJ7ZI9jHi0XtBV4afkoQiX0DSa73N+JpxI68rtQeADqqXIMMmdUokQBDnlvjkByrfbNpdYtuX4u1CK9HFau/Uw2qV73vHd/366uvzxvEvIM715kbdXcICSVB+fhA== 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=Oe7A/nGxBnjrPcnf0+hR5DQLCYwNtC2iPj2z/Ynflrg=; b=JEV7oWWrgZu7EvCRzpV4YchXCPZPeQ8UIm+UqOU5eHg0boRviAX/BM59jNnTmMxNNCj8wf7MVHZMpbEZ6lsCUnKG1c+BUsx+vZIcCT7kIZYdA1rYgDsDqW6goqzMuk7gbeQ/gRgJJoZejey2DslJq3yOSXoJRqKlwVkJ5KZCYgs= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:48:47 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:46 +0000 Message-ID: <87tts0qnj5.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 16/54] ASoC: sprd: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:46 +0000 X-ClientProxiedBy: TYAPR01CA0054.jpnprd01.prod.outlook.com (2603:1096:404:2b::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 05f3e7a8-b66a-4180-7f15-08dbb321a3f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /ouwDSCnYwdJLrfx7NeuCMnKWns7XUpvT4TNR2xKzkHmExnu8sSZkZnJSO+FWvKqQ+H+FkYZvSJlqahdhDnLTktT3aCCWxsOp9ioVhRHiQmxROEN4PRLYEm0V4g6Zcstiki/J/VebOGDjbtQqb7xqQ/Zn3b9SK4B+1PY/3sspJAGgNEuI5s2OZS0ib6Qf9JAtp72tHxLI3L4izm0BZ2WacriR9G4GjKVDKQwGs2+0uq/QXrfQcZ7S0m+N21N0pSX9kWAmElkOLq3n3JAJjFTcaMCLP0ABHC5PWxJAOwuI06UguiXNLOtsCuAC6FbIkI88DclLpsKOrQCoAVui1tAbe+lC+kBXHOlnA7VcEGPupzcVKKYTaDgBPjz2v0KjdxkOcPtp0zIzcDSIe1Z6nm7W/Nnn2nkxR5bdhmvA8iLWcXEdGVXg2TI67lb3hOqh2wqwueRIGKGo/MY9PkEUCcXMzXD4V/EHjFDka+SdtFA/LhQK8I5MQ5vJel/bjj+6oFtWi4usKhLlNTC5E3cXwTp+L/RQco9lGiZRuwm0z9V5E0XrDJlRkBS68dNitXnIpOsCBjFg+2ROe06afNRcTTU5S3T9IQQ/ZJ1AxGdjQjJc4lA2lI+Zfqg8o33KhKTA38UR1Vo8tFBoQ8pe36yntIXbg== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LaN5RJk1JQ2s3BWv1XWBMwQlXAdwiBcVSEQ2uL4wlbhcJCW4skg/+jgst1hcPotOlwb6wuGl0XK1MZFn8ZOieZs1UqA9tRFPTJLcri1K4H4u2HnX/kyCrOb+lxzOP1N+HXr1IbJU5Rz6OeiYiAeJ86I9/Ns9I8m2M62t3Le0q1BqcIF5/agmmBL6MBfOXDJf+wqN7x/lsKBY9Q0yfkWrBZ0apsYLzjrHeA3lPhKUVVSWkapOv/Wtu5WAWa7KsD5xvT73y8JgvauXtXIX4XrRAOpfvGPgvgvdA+Ae5JrQApiD1zjNquDD7Ok11SXXwfhOUvyuX9Wc9XPT23DgyMpS8TjPJC0xMSe8CiKT9mbwNtff8B4I0TdcWdaPjWdHfPT9ltl7g8TgUhnM770b59mZsSDFqZ6pIkNUHDia12dMgQ8uJHP+Sdef9iS1e+AfnLVAeMv1F7j+EklDIZzZGE2fx62olKLeDvICF/6LecurpmmcIdB7zwvkJVIKSOq088b9a/gvDqQMhDnUkIWFPZ/l145M7QacEKTzeYQVfE9unaLqR9Xp37SYDJsHZCpgCueJ4dmZNe85EI13xwRErj8DrHp7JStnaT1O5oK7x4fk2leNAFWH2fhYzeqEv6+1zPcikoTZqDqEGrx/zmme4RXgj3XmdEJoUhwTBwn9ENzR2keZQPk/q/MigG7SQwFm/ODjgdfhzpaGa++8nJvchpcfHdb9HmBxj/MqC79AhxPvEAYGDAcR3OGi1eYYOUVmnAL3daC3zS3B7a/bVrDymgz9i0c8/6fht8MRZpaXsiSBGIuCtj9jERzSrpt9u4J8M7yaZ+5ZZry0CsYslGYKieeCrwhgsSUrMW7RXi98lZbT9v1Aygld9X1GJi/3ifq0Yn31iFCuy7c5vwxbdP9imF7mNa2HuIxV1DMwILWX+VMohsPEvGKlp8GKbg4LnmL8Dc/PbUKY8dsF3ar5oXdZmoNi2wiwzAwObQWHDPC+L83MEm8Q17I4ks8tsRQpfAY0YIy92ESPr6plvv7PmJ6zPg8HhDAkDvtjfibX3sz2NEV7uZ/KlQK3wT2C6ZkYGy5/5pqXsEnkiht8nsQwHLegmGZdL32ZrYgeGWosrJ7eAobUf6tsOLQ+9N/gnS3/2VJe/wTJmQ30HCBiL/8g2umEywl7OL5DJDDNusYhQO038BpLHW+qD2OlOqamYHvBsfPwk+YJiMxyhjDAcvCumfb6GgkwfWZ0NUhfQq9TKEjlzm8w1eW6o2PXPp1LSKGk71F2B4jtYb7SU9xOYPZkOnENPPOf5wpF6haAFYSV3i8hDtnugXIGQRA6G5syPLosiVfYXJeZdTGZWyDKqkTcnnM2I8E6dLh6GvGAT/j9lMzyF5dJsK8EBf/eaNsZ+0XSva8/aaM6dsVBNxoOLCwFBQptSp35gIDRyqiUJ6Rg8I/TqAC63LkDhK2X+0VWho6yaKfUx0r94opLn6UUHYuXGyBmyYd/1xoTtg6looiHPeBnLif4OJ1mZK3cw7CAdBBrsCijohhECKfksDmwRclX9wfYAilEEvDipI2MtxJZo39vkxtJROtPQvH21vfpO5RSt6SYVB8pzhc8QXjO2kaw0R5Rsxr01gUIBs3J+hQyPovL9pySxno= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05f3e7a8-b66a-4180-7f15-08dbb321a3f1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:46.9730 (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: QiMMMLxXACANi5ZAEDaIBc6m/awSiy/asPGEd+ujdjU8I43OAobe0BQWCtYH/gqfLxgOyHGeEEubBqKiKUi/ary8rPUNibZLrwTRJnewProGeT60ZeDDiiU8ohuSnXzQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: JWO4IJWJPOZAO3ZPSO2URQLOQX5IQCMI X-Message-ID-Hash: JWO4IJWJPOZAO3ZPSO2URQLOQX5IQCMI 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 6507c03cc80e8..6cfab8844d0f8 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 48d90616b23f2..d6b96cc2f7087 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 Mon Sep 11 23:48: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: 13380393 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 848C8CA0EC6 for ; Mon, 11 Sep 2023 23:53: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 8DF41E82; Tue, 12 Sep 2023 01:52:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8DF41E82 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476419; bh=cm6kZOK94Kqntzhy1Wn0ZKs5OKKccazDZViOmZ/K51E=; 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=S4puQP+2yXSqrBF7vwH2jcICPV8lYbzhWALkDh1ExYkw+8Ec2CgLhqihrIaGQIAGx Y+92Lr1YFdMTM7VZvYMeSXhH8QRkx/rsCryB/Nu8QTTBy1ROrO2NC8IfwKBA1q9nwJ Orqp7I9qjII4ZJDn5CjtwuTRCuXoagxR9s/LsL1E= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 18E54F805E4; Tue, 12 Sep 2023 01:50: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 1769AF805E4; Tue, 12 Sep 2023 01:50:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0533CF805E0; Tue, 12 Sep 2023 01:50:43 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::710]) (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 3A5AEF80578 for ; Tue, 12 Sep 2023 01:48:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3A5AEF80578 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=CAIhyDrk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=obdxKJ0zR/2iRrmX2eq1ALCAfgf90K651TZDlw7tR2uDmw5Eba49o36WQBJiva393TrnaRPgckUYgjOMMbYeorPZgGvLAyF50fvfasiag9zbQQxVYtOxiy3mbthLX5eX3NRmo9rWjKnJZ7ARakafd5SI2G/BvIYbkN4GGPPFhsQuF7PLimAbxN142fdCFMR/wI01g/9P7FT2SDAkHdzlhbZEJ4YTUNQWV6/qh0pkJA5MTeno/ZNJUvQe2ubpWowA2YDHNpZ5AjtpvjBUG26uVMCEVfT7ipC+DEnD7MNAru0Dd6+alZMKCKoBtFVTJuSksLjppkwr45cthxUFLYP6jA== 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=uEmrwCdAvX4BKcNpTjYbu2cqnnR6iBgDAu+mhxqSmFo=; b=HOp5IQKXzowe2ziPlPVHRf5uf7uM5owb6baepY1L42S3eQa5gPMU1bU6+L9RqK49Tn6XzQw9EpsIev0gWRW6bUJ6OKCiJV5oh6vQvo87ZxrPPC8YNOMFmZb2c4WrQ0Q6swiVWDozMpXY0TtewhDN0keD/0YmX0y+e5iYQ0MChWI94Lx8SYISydGvGEOtLUq5qZiJYb/UFdgJRVElHX8WosNvicSOfHd4Y840tDviwiIMYeE6Rd0BIW/hGpNbqXYnH+ATEIB4lKc6dAbJver+GP8+4HQBwlMmqw3u48e2Dsla52A/y/kqGn5BcwZctYqtv6ZiE9o4Exixi4TOSZVGaA== 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=uEmrwCdAvX4BKcNpTjYbu2cqnnR6iBgDAu+mhxqSmFo=; b=CAIhyDrkVHB/LKvOCybi0nv7KthCqgwubST0zdy0zeBNkK7Z87gVrD2t6UzaSDJyXwrakOuex51wSWyK0AeGXKlVR5g1aftkici9E0R/ujmtBx57DYER9DPUzoXvUuo7IlF/diVwPvtm7xZP+W7Gs0Ooy+llYlBXkYCfYq91jic= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:48:52 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:48:52 +0000 Message-ID: <87sf7kqnj0.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, asahi@lists.linux.dev Subject: [PATCH 17/54] ASoC: apple: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:48:52 +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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: bfacacd4-15d8-4de3-8230-08dbb321a725 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GCyMRU3pemVeckJn7Qu8WYmrUtgFsMgtbmmOv55pOMlrPvgCegw9VxbWzohGtkvuYD/NMopltL+YUqUIOtETGtypfgyz5s3xlZEZmvj5bR0HHknqLlINWpqlQ27cYtUTG5YxVplTqtWVPbCXHrFK9NSJh/A+PHDdxe5n8JEo0HOXQIhHuaxMUijdET5pIROWLlL8OQI53dc3tbdYVxYoAiVlD+IlEPrU31EZLG84A7oQinilH7wE+cjjBhKbYtYN/m+IfR5RfNoG9DMY8XLVSOKWIGfxTG1jgJJwIuVIqKW0s/eNKmtFbsW2PeOluQ0l0qL2jQpgf3tMZygK9D10ARWzNA1heaicpzRQ0+BHjwOlkbNsMhJTeFZq5XPmsUxNo09SQSQjqXAyfdNZH0J1rU+Gq34nw+wZ9V9YczkygjnHR9wDfYDzAtDXS+sRt+o4Xx1KKfqRi2WA54fhA3fN//GEtbbldwx+qLLmxwmxfNoivaSmxAMAUQz26MI1bEQfhmmwjD7u0+xBcGK1yRoCTiWxTIuRdyfY3egFK1LNEhJfuMUF/v/1THfVdg6hfv0tVPBePIirtg+1gKJJ2np4JDnMOV0J3eDHVK1aat3gvkv8La0Unk4llZkmQz6GF9V7g5VNDgBOYUunRa8z9QAJHK8+6Zv+679dWn1jtFJtD2U= 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)(346002)(396003)(376002)(136003)(47660400002)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(46800400005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J4xi4IADM5yq0/OJnWFAsghlaveGMZrie+eXQsy3VcvlYTcCb3GG74g3COXpmNR43624187tqS88j8uu0KG+TMUOatQWJzacTrjwH8W9oPBsMNW7Mv1vkH+sZs4CMdTlDrZRZs2egunkWQdpIGw7gVabcuUX1XAulx34gR+VJPzhmLdarRK1KLMIHBDN79fDfJeH+6gT+QzjlAunf1I1iFnGm+9R0UeDTfdWtELGNZJVwcxx3XDr3g5vyWLg7CCesDEBcoNBx5+ENWzcxW/itcmiSjLvUCMe2vdH96f1mYPkoYCpEsSt6tmdPE1vKCAuth5cFj1aGCmpxAzZ05eQV4bAR60f8l7usDV1BvG6xrNrtxPjDhp1B63reNjWatk0hVa4Gxfu86qSFqaa48bj8HOCPadhfeHGlcuPypdqRqwhIFh8sOArbo7dcFGjVUZpIxZ8/qH6xVM7uxfLBRU4nkUVHx+/duVbgKD/NPvA9PeWQ8qthAOsXimoGb9yxVfH3S2qVtww1J8s8OiGJrLZ+7+ai6/UmF7sI5IGDfjAlmHkcKkwxtaZKtDP2M/tnJlN6YSDlbxjnK+cmOFYUOg5U7Npf9jfSPbSUPA5EZ2YHGrzi4qB5O/0aw40ggfNt/VzJg7a7t32GAB/nWI1CSeUQEFpVgsUej+lnzomaZpyrZs2dEw+NvYnMMxpZCaygm7fPwDnWdJ9SfSqzXnUI5Mlnmpj93xNVExCIYDiY5Id7o/BDctDLB8hSZTLt2LUAsfj6q73+XUlZLze+p2jPKQFD5xYwGz8cS4ZSMBSOGN5Ema6RTOtKCEG8UJ4mdHF/XDWPxiQLjFO+ArGrfz5Fgk5PuMrhSXxq5/KPowBf9Lwbohc0i6NdT/3yWrW3CQS2Ib4NB2ORjmv7AzB3b1AiqP61sH3GNppf9NC9XW0VUwgX0qCx5b0AVfFRPAeTInTMiIAEUvHcid3Kw3/Xx4pwZcwgmOx6AHEY15pZTEeGDcnqUwR79Mt8iCt3pKyodF1L0+g56Lojf+tS/ReYsy12Pw5yqxsilaCnRQpmszDgzBpiIvDzMjWLRtUvT8kB6v73HeMlcx8Y3zZPEN4z26y0kwUgUb2NXu/i08iBd6PWjlMyMOxErVqN2AjX3ygtSMfw7LzyPwv2bEpNWExOI/DFey7kqcWn8/5odhptaKbSPAr+ahYJ7tGXiUSJbm9ChDJfaCjrOx3JEHzl65zo2wMjILOcpge0ftWGRlrWgjOr5kqET8lx9zZ3eH+BjLwZdm04MQWWxKROBb6XJxMjyocAF9grvbBwIFORSH4TPgZEdtOnFBSyQRwaoyUlJlXA9o326Mz4ajWO7LdAhqfIvmSlgz60U5oB/SNx9lF0MSHLnuv3Si0DsQZJUvJWQRvZKr/pDbelL/c7aFM2SgAcriI2CZDA6yIK0d67yOf7US92zb60dD6xF8+f1pGhotacnBwfHi7ruUA69UWh971pzk0roLUaBvZNoOVW0szv9BVT/0i05IjsXkehNQ9kxlWQKVjWqUDMMPHYNyQV75z5yqo7PrUIdo+gHvaQaJ1F9JhV1hyla1kESZYK8Rvr7A5v9NWvLvGAUUJ34fhc0gIQWY4ZY8K31iWKxfkpPKM/ttqRFodfW0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfacacd4-15d8-4de3-8230-08dbb321a725 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:48:52.5381 (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: /2CAkQ5fR9MkvwxY2ZlYEIgiDUDG6EfGH0XoaJR+/wGizcPwwi6rMpT2bZvkEj/mM0/gEOMU9Fqz1BzSRQnUEIK/bS0a5eMNTScHXqStbyD3EZ98LWoRuCNRLTm6/eDu X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: JPZ47OADWLCYPLV66P3OP3DSD7WCTBJE X-Message-ID-Hash: JPZ47OADWLCYPLV66P3OP3DSD7WCTBJE 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 ce77934f3eef3..9f64a9e74c541 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 Mon Sep 11 23:49:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380390 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 B0841CA0EC3 for ; Mon, 11 Sep 2023 23:52: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 8BD99AE8; Tue, 12 Sep 2023 01:51:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8BD99AE8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476368; bh=r6Sp8jlTAybJjpnMBBT37Ee0sd6FcntUAvNum5qII9c=; 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=aoP70H5nJhVZZFFyTZIhtZ1JyaqcpOMZOQFYXyVg/egi6cIT003gLAU4x5a/zdf6s /XHknbdi5Jkft6+yhsJxI9fTnKSRTpTT0OPcK8FjXx9ENGdjzp1Fgsx1P3kd8qEMNV HwzyKGGTK/lMLXwi7mgBpP+l+9rthCEy1nzA/FwQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id AF9DAF805C8; Tue, 12 Sep 2023 01:49:58 +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 B64BDF805BF; Tue, 12 Sep 2023 01:49:57 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B6DADF805AD; Tue, 12 Sep 2023 01:49:52 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20729.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::729]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3DCFAF80588 for ; Tue, 12 Sep 2023 01:49:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3DCFAF80588 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=Iw83yTeG ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c5b6ImhD+asWyFSYcwdVXk7vFsKzpMGFXMDuhVuNlDmzPFVm8xrpgpyla/Z9YpgeCC8cWx9n3HYE88Pm6pV4DTjPbu8LdEcNOs2+Rd5zMOzFVHeMpfaaNfNdmYoEgJY1Qqo3ihK9ucHdeHPb6YGkWm8/FhBqRD5CFQ0DXf2HMTjby/ks1QRxxruzXXeEuJAfvHxqirERHA16vvnDEe1tFBjL8PNyT7wI8moRlh1tKiJ8cb+yPrhu3nESQ8ZN1lbhDHQHmYVVHMl2hjn1YyUcEjv3TIQAlOdBcMqHBrtlroVFZ166gZkaADt3fNg421uDjxh27P4mUD6UhmBXe0wCOA== 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=TxfjofD10fuP3QidZAIUA5e7RmT93s5CeQs91uxSgzs=; b=YGl3knx2Q/fry3hTcY9spQXMTZ6coLBONSoAoBmCPRTMffyfzym4EhQZuOx2WohZ2vb1Tq2SBAU8VI2dhEC/bSIfqD5L/GgKwKDLay2FH+zeT3grbdtMd5/SOZEQHTuKBYegH176bCizWbIXjwoHSxNkaBuV0eRnFTNXMWEf459oiAZEwCwxmP74M53De9MQkdLGIrjVJjPCgc3rC3210nqJ+9Agbc6wiRjf0xX8Qf1gkTAL/WmS6aOj/WRQ23ILtv28o7WtdbY27VEq1Suj0RUByUoK9r2vEW+6LHL7hnwyXIZCXDXE/X6VAMNpS/dbK4okgGP8DRjodTw0Z14cEA== 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=TxfjofD10fuP3QidZAIUA5e7RmT93s5CeQs91uxSgzs=; b=Iw83yTeGgTOtQBottpOzvXZtEGZMvfM0HYhxojmrp3vWifAmVNvnUnTzGaQpsThNYXiyp0KGozyU3ApqK704OAjHBTXYDOc43cn6H9GN8DfRuY6G/0vWGtkI72qoTidgznwBRv1KHmwxXU7tGwIDf4qypVwSA0r4daWVhbnkJBM= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:02 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:02 +0000 Message-ID: <87r0n4qniq.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 18/54] ASoC: atmel: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:01 +0000 X-ClientProxiedBy: TYCPR01CA0145.jpnprd01.prod.outlook.com (2603:1096:400:2b7::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: ba32bd0e-e64d-423c-318a-08dbb321ad0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zhNNXboZYE25w4qhjeJIbdxkFw9UlOT8BHUJ9XsJsj599G4KYUVW4PEsfSdjAK57IY9235ExSzBB9B3dv9mY2Z0u8nguYV9NtjvYcDHjP5IffKcJBpolPeVcn7GMS2rx1Asgqkr0xDCJF5BgsvGODTOabi3yNomkZMTQyKASZMOQ83vGqTJeslv4LHPACxRc/xUKf6KWtN+PGJW8RmFgYQEk8zcQFXFcvn9CoqIEBcD03+1e65ZQUm3amdpVkNhm4w6LoOfUPtLbQUj2V31tLRiyYvx3BP8cSb5KfIpcky6N+B/LG5DCrrllyJtqITG3mzeJxiRJpHufwkiq6RMWo+yzjHG765gtlif3wqFOkVriFcNhqiMOCo2E6uxP5M2+sUyjZVOd1evr8JZjZFJ37Zxvbcg/SJZfUz0ru7IhJ6yfiGEQ4EpqOqLepzJayhXS7X2qS42BJIIyjnjPXukoYhh8hljFE2phgEKIhKAx1UQZeGF1qGk9pAwOdoQUHb99gnCtcNmT1pyYn6BGyukHNEDVQ2vajfSoaSPt8Ab6A0UZ6Y1FyGyGTdyjToR4U0N+5a5XIi9KoVZCWoQOURfKSUctBswfW+/vAk7vaqMMuzdYxr06ltrodLuBzT2k7fQ0CaTqfjyoT+kodqSnE3ITiA== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eItmzjLBfiQvtqGY+a1RpeKzbIpLtBXls6wtygEuUYLmb6pfaywpLpOSMqofEpeUCWqCTbD3Ss/ebKhtzlzFeTP9swku/E8w22cIouExoa74x6U4GmqSB/PiWbRU+h2UhC74vNI5jv6sCcn1twPCOc/UujxA7jSvNpIKQe5tlVLWKsb0JCn3JGi++MRWSvph0GxHOz0/mZzrMZhUNUogm82YzYhgjvc44SPWJlPeiSyCOwQFdOXnWAcz1aJq2/qs5vk8fgrHj4/3MJgx74gBB8C9zMfWCMbfO4tQpxAW6v1tV9dlt91OoEJnfM/W2pev/va+E2FvMNww7C0MO+m/YbHx6wU0aTJ44Qiwwgf4CccYA9JsDSI3ik0HD9iLK5xSn981Fc+PrE1gnlJxEgKzpdvzDxOqx8G7HT0wz6F9ArJF9sGU4iutNZZmYsXtrN7foZyZJfOYtFPPWo/kIbfv1/RhY3VOMCRn7xSuZIX2WfhbxHNBafpYqpUtdw7256xaALsjEOhrBMbNbG9ZkMQaXmFxgqUvHPCi1putcIkCH3AiiZpmL9CrSRgn6rxBp86hP2UOc4BqdjnQO5j3bE626r6Jgd+WIUNFqpnFNitbchbuG0Hcl92JlThE0tPkwtBcwZrWfNBPum7JF8MMNTNV5BADMB5E6rUKOZ2zA89RrEWJWCnfnVAlo+UMobSqh+VLJOoQg5XTodbN7UQ8osiAKK+HPRj9kHzbbYBNCmvsG3SlQi+wHLHFVM6/owNYCMS/ThJsdNGsWz5685oFbsFMHu59FWyd+LTBqJfmgnFVLq1GXnKEHqUTXdg3ymVwF0JJ1lmPD4amTgM9Un43jGnGAP0tECOs8X6BtN39UMljJKpu4goh4AvZOoGRr87vIhpzVVlG6ZH9thsEIezEHZegk2XuEopKaJIp/6XX6DH16GVcTnr7SGK+ykTUPdaPjQBthk1DtQt/brcHZHsU5UZutPkCZk/u1bklSQ6wJMCMj11Vb0Sp0QVj7rb+iWXXA7ImQMHZ9EkqaVnNgRxOeLZ55OobOWmHK3cJGvD+fXkrmgpa2Qhq4vWREy371CJ6UvwKl4hUIp0+hwzRuN1TDsoqvW2iuHhwCyNRs/0vfEsA86MbARE7+2GwKEaDRBQiYJ6FvjRg6ywdzzxognT9xgJqnTRdhMeHL9lkActFQVYI/apKbyUucDV5vtnWItgDyxwWML1JYDxsueqVf/QKZe1oGBN2BJ1YPp00/d8DJB/PARTVI/6ecwHpcCxkpzIfAjEbNdIMq2JZp6Q32uAWBXBJl2E0g/6dq2TtxLbVmkW+DlhvY8L6OawqOM7ljzCK8aEb5my122V5CCk5HZe6EaTlxNkFNK8SjYXknyy1ctxCgCio7HV4cUGnhxfa0O2kTd6ivSobgn759J1EcNi2uuSc/4c35jfC+2wMcg6YEY7wX1hxj4X/iJtEnTokGb5cUJl4OFi2dVDga2OEH/7Wefi16TtUbEMuMYGgjWPWf52y+z8HI5AuQgsCzNDj2j5g389NJt6TTJcZdZTLVceCWyntHSH0y9kA6zyvX+KWBClxdu4AG7fPbDuztRgoDoHrPf/kzmn2VnseGEQjBJs4qM1AWkA5A/KkZxVtM5E8vmxRa8Y= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba32bd0e-e64d-423c-318a-08dbb321ad0f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:02.3062 (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: PflgPTUczvLIem23tx7mPypvUdgUARQrOcmHs4fYtyQVPUYZGyuT9VU1hHqbyEBajvulbHnAz9jkIanHuA4s1yiwPZEca+z5sv8ZGSpy7uoWGJQuGZUZCASE5QBoVHF4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: QFR7GCBQHP27TIGEEUJ2YD3MEHY2KNMV X-Message-ID-Hash: QFR7GCBQHP27TIGEEUJ2YD3MEHY2KNMV 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 4c1985711218d..6aed1ee443b44 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 96a8c7dba98ff..7306e04da513b 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 3e7ea2021b46b..7db8df85c54f3 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 0db7815d230c3..fa29dd8ef2089 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 00e98136bec25..01e944fa11483 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 30c87c2c1b0bd..18a8760443ae6 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 0405e9e49140e..d3ec9826d505f 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 cd1d59a90e021..d1c1f370a9cd5 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 Mon Sep 11 23:49: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: 13380389 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 76BDECA0EC6 for ; Mon, 11 Sep 2023 23:52: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 4ACCCA4A; Tue, 12 Sep 2023 01:51:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4ACCCA4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476354; bh=vm80TbGiKSPPCmEYyXiEkKqso4uycAU6ACHTKMBoMvA=; 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=J6p4p41t0PQngJKoaNOE1r++M3+tcHBTbVCSnIAOrDdia1rOBpIDL38AjWOAZsVq0 7r3Dehm4xuj22hTY0OBbBx71vA92fIfjHQSnaGYn0sJHas5a/of2VJjimLqdlh5hvi TVT/D8QVe2crbef6jlN7qLPb7vScVT6BRPIdEowI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 30AB1F805B6; Tue, 12 Sep 2023 01:49:53 +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 361FBF8057E; Tue, 12 Sep 2023 01:49:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DAFB6F80580; Tue, 12 Sep 2023 01:49:49 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20729.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::729]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1690AF8058C for ; Tue, 12 Sep 2023 01:49:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1690AF8058C 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=X6KZcbAc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eqyEIVwZ+15gV+Nmq3AQv8yZgl42hLc2VdY1PtVBzTOV5bVDJVmrOcBKB6gqaLD5zieD0Hid9agC6crhQOlUfajy0CtaUtxluIsGajuAimreViBJo2vR3d8EUMV6x2FxyQN5xsPh5RmMFGhqLUwucBkf0ei8tfnXrsco/3r42W8SuB4EF/x57w0OqsdKhNMrLHDfCAlANQeVr5MOcEh9qPqtmLrKjSL2YoDUr6oIHiGxcC1fvQArcUe3iZsw1RvgRs85InsTvAFqPEnSIidqZVsnznkvhEcb+lSkOGxd0LAN/U/P++re/z5VWzEWcD1pIC6qlwWE+yu4McYDMgMoiw== 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=ThYFV4yWb9xVswX/tma6Q5K1A1gqq7/tFPhEmZdzYgQ=; b=Arnv4mDU4BS+taxw9OHg8tniHWCmXKq17Y8uZCm5bHs86nxFXD4jX8qeUJ7Q1Mcva8HebkFNjYuGkr7uLURoiC0rK95vYs5otxEh+C6IsbiPGR+o2oxUQNWy8EjhAppVgITlP3FxVQQYj/2MJnKuhRWsm95cpZEVaOOR1aDkh/VOU49OkS+TDhQn+Grg3rsp/Bs0gaSetsHJ4SbKS/Axdjh3lk4EauxQYJkvbjikqLvGCkEY5lej/UPO9jmv3RmAZzFoKFRnaGx+wsfJ6mQ8+OuNmG/QhzIwckI2qVBYXNLyI1fLJ+qnwA3HAHllRAfJ9PQIdBE4G8M5NeGbgwNUeQ== 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=ThYFV4yWb9xVswX/tma6Q5K1A1gqq7/tFPhEmZdzYgQ=; b=X6KZcbAcKidSjtfZcJd0h3HqEjPG3miWlEoZsB7jVxiP14bjXfzG6KkLuEHUbM6sBAbBY10wZTsLRiSz6hH4Ut9MxrIDnSqxCJhmY7wRUYuWFIrauN5hgcsec/eFoUSGuIhGI6c+mqZMLrF4KzhUAvQqo1oQpdE5DdmmXPylXN0= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:08 +0000 Message-ID: <87pm2oqnik.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 19/54] ASoC: meson: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:08 +0000 X-ClientProxiedBy: TYAPR03CA0004.apcprd03.prod.outlook.com (2603:1096:404:14::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 5811f284-b542-40ca-8dcf-08dbb321b0c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pL5K2Ot84YfMQzCI2dlOCsLIPaWiX6lnYw8JGwH9Pr2EMyZsDkViz9rlH4dGmJvFswtdFDcMJrJE5CQ5lzlyct1q/iHZKeiC35IQY9hGMknBgJ5Z3M9JyOOdD5HovquasAqbkj42Ej7b2E1AX/tqPlkYziC6HkQvFm+go8NoyvGbi5k9ZgWZ/Hi7+up5LhmrO5S6HV98cS2AFQY69TxGQ7NrMuVQmUftIkDnlj9/Xec6G+kN5Yq+xlKach2Z65CqlmwyP/P+gE/bCjr43kRxMK0cyt2FLcoeegHR0SERxUImX2QuD2z72DBHVudVOauwPVOG9iVyKLT0N9e97Skdd8/vNbb42N666zcdTcKYZhntJVtdvgQMTeILfooZHZYXFC1X7cMsUm62lj9MSibSa7k4BT/qgeq8iq0P9ZJHWK5XAt3NPa/Oj6Hjm8fg/K8nb5mbMD8c7sjgghiTpRyNnCSmRy6mfm1BhLXDlIvyKFJ1w+2czpI06Ul44M1/dG0zwRWY21wIdYH8rYQoonqJHxb5kCEx7+X3xXdrjuVfQ0ijAWao/ZbykqNvB/eIeUyIWJvbHaghKYa9tZEGi4v9NUTsYAzDZ5/Lb69zSMTKQS5NQ20vbPfMUEdTjIkqIlLZGfkQjbr3TngNOeKAJ723pQ== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IKGS70pw1MouoApzD+RfYwdvU+RgJ+BRNEQ5JtI/yHhUZtfesK+RviPpo2OGOt5Tkihmf1JVtjCcMd/MxPVSgLYcjCNKqftINF8rC8OrzHWvLVaTB1X7DlZs1wJvYqrMHXAn5Dir1O8LH7sjLcv2rq4AooZs9j9GhqpwF8v0lOQFyAf5j1uqsx2Va06SgfHUSWe8Q46DHTwqjX3S74892ZP2sj4jOVZBHtPteM2yQRtH9f8YWyCICvwZ1JI34+3sIf4hOkinni53j88vVHCEI7MVfJ/d9FKOlp6h3AX6vlgBQbsKnPFrfocymhikAGVLrkIRFDlC0De2044cxlCCOEqDo8oQLvbEuDFBEMhAt0MPA9id0Czuy/I9Aq7fd42w4I76SNZ+5H51df/Hci67dZw+jyrqKytW6IFWBh8PIPjG0RdRgT7Cl7cns9IG9mMfpqmd51DtWWyE/7Qd/DiMeywMjzPdTnXAdVHqWDotoxfSqzr1yg685Q5QKmGIVw9wRcoOElyr3vgTYmrfZMLMZuspWmxglqPvbUEsJjEuI0XoPdHfxJGJ8cD+2zlM1Gpv/c82nzE3w6AtqD3+M5Lav8PabZWidkHWTTkCUFM9nSbqvTrKD+StxSG2czmMpMlwwZCaXL2qjB1VXRI5g3kooyS5VsGzrZrmQ4NnFE2VX3IU/Uiqu/wsT5HRo59Z2iySFo1ooPAc9inTnvRKnsTOhgHfVNU6WVHKx2k8+0JBrg/cm8OVrNB96vKNBMjx9/Bc3005nWrmW9J6RtQiyKXhb3NMEtM1wMnJfKpUO2MLoK4XDENQzx2IzN9o5jKjlIFzy7L6AJlSeTs+h16pv0xpKFl5cs/NYTOFMimRAVViYtq3lk9C+eJamNv3yk5wQZ7YsEqr7JG0XeAzkPPUqNmi1ktHS4cBtrdXCNfPaE3bCB1HjoTEQxHglz1jXqMcs58eowmc1+9fmpzaHgM7he2TM3iEJS50kl6BSAS6T8DTmS5TpLUjjU36pjgrvVSfFfNMg2FN4LJXWcDrpUO7+pfpJRC679t9WycA5b9mXX0isBKc4Etez4DIf448+UzyKxOowHL8cbnhTU9ynNIlKdu404H+UpRMcFWMIGQ3dwTCtoma93R9hgm7X/TV5/GMnGwRlpPGRMlT21+RqFVdvqkfVu91lb3PWm5JlBWMvDu/7bWbaTcX/0zHadUZsGHO4dWcwR6du0tMEUFjhrirJB6QnRHv3X30JIKQVz9mgg95Afm4FoIL0GJtnTC0c5O3jfz5amBluCDc7ZIXbToNUGJbiU8+g1yN+6CkCQDcukNOVLZbZR/0WXzAPePOqp8oOJ7s4DSlraWzWtX/nzuyDpq44jdheuFZ6KztsXG6vZghlkQPGLEV/WK/YtVD/asABfhGVjw3XHjwb3z4jAWdp67QSb/RwWnJtbYUuRT3C8NW/82B+c18f8bVMgPBRZ7ILnFDy1Ov0akVfn3J8QizePpMUUJpafTCu0qFOGd89SVOaS1wbKHUfWRudNXWdY/7X7h5gU4pQ7UGA9i7jtaW5H2JP73WuQ/VPbhlY3S/HXEjNtgdBWPyDUgX3GtHmhwCaEpO5yePWHJT1vdztLmHUSUKXIUk/udxNwcJpjv00mUf1rE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5811f284-b542-40ca-8dcf-08dbb321b0c1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:08.5084 (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: 149Vg2tfwuZCaBweXhOI5SohudO/lZlfSguWQs1at5+aJJicNXtD5tb9iT4HpSxAXBMZsjCO9BGAi6QCTcuLWnK/sYf7NRv52amJfiaK0fFVzQdsQmjV5wRTynHr5lZ2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: 53KND6UHCXUKI2B6EKCPS4XCCMO6ZJOJ X-Message-ID-Hash: 53KND6UHCXUKI2B6EKCPS4XCCMO6ZJOJ 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 543d41856c120..4041ff8e437fe 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 f10c0c17863eb..18b16274449e4 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 bccfb770b3391..0a92adb67b278 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 a26b620fc177e..01beac1d927ff 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 f7fd9c013e19f..c810992185979 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 e702d408ee966..f8c5643f3cfe2 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 Mon Sep 11 23:49: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: 13380391 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 344B2CA0EC6 for ; Mon, 11 Sep 2023 23:53: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 3F600E72; Tue, 12 Sep 2023 01:52:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3F600E72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476383; bh=eMuDoJ4znfSD0Adj7bFjOJunQybeLgZWVWzlfA1+km8=; 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=Tcx+CVS/4ifqhPXNq0rj91QkjvOpYM/KrnvN8k0LVLXZb8LjhFopwL0iNFur1alB1 eeW/FjjxoVy60EwS2AYtn2jaQrIZBge5KTNtVf4NleFI4smRz30TgYH0Hnbdot/ra0 n5fIKtT/r5fCE7mQ0i1xdff56WViS3w7blSoymIE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D0D45F805D6; Tue, 12 Sep 2023 01:50: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 116E8F805D6; Tue, 12 Sep 2023 01:50:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9D308F805C2; Tue, 12 Sep 2023 01:50:00 +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 9B75FF8057A for ; Tue, 12 Sep 2023 01:49:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9B75FF8057A 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=JROPGKBA ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lpfiBFkCxM49LONzDz+df/tH1k/O1VuQ99nBu1AjEAQyNCaoNqP7eaWRfyMkYmEVnGIMpMfkWWA/uV7D0KCnbw7pdpe6XC1duqmYjUx3HrABy/RCcWvtCiPiwSMxN2AS+bpjrAoHMWXgj/5SU7wxYVpdP3uiKNBDTfY8I0N+OM3vbvR6zA72iNURUX0i3mg9KK40/dkDrKf3YYIg1LpPemVgHpCy/1rCkex3wVgkQET+rPSsxyVmFq234c4aJFKWL/6iUxilfcOxHoT4y4JcncLXRjboDA8DMVlYiMkJ9OByUi0h2jAygsrSBl69EbgL8uEKICplXrPO7f31MNG2Wg== 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=bT7KU+Oat4w+eqQSzb9WVg9sXzv9iK43lQLjZD2EtzA=; b=amGqT/N452ZjHxBxg8QM4cVsf2nnnXxi75WGGzO9TCZ4FQNVH8hh2NjupyhmoZoa4Z4jZntaXSmtYz6b1n3Nr/a/8zK/lnPOKvGuXttiiB2Dayx9nvidi1FoTG9Munt3dkc3bIbBCIUleWiVlhvoG2oQy0sMF5d69abuKluuh7cnXR6sL8e2zF8hxFV6oQBQrYNev/lj0lAONPL4ANsVUCf9lAkN94Rh0r5IuFVWEnRa4DlysoXKao+XgjZkmRpYR/tKPK6LaDQmeNGOEtA6vPlwPP+PcsKDVEmTJ0doZ3cWXaBenTk+J4SJTssM8LBH8OY76hH5MHVt2GGRVhUx2Q== 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=bT7KU+Oat4w+eqQSzb9WVg9sXzv9iK43lQLjZD2EtzA=; b=JROPGKBAcKGHmGKjeM7sa45223KWu4afFQSK93xIMTTb97ZF+W6Bsu+ZL0Zuk4roASedK/S8Ts9+WU3TpVbjH9RMe4+CIxzGr1UaMtjJo9WROc5jjjWBWNRfHah4gNb4eBI3DpbgxvKVgLNmjeRnypmLDy97HgSgRi95ATab+L0= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:13 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:13 +0000 Message-ID: <87o7i8qnie.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 20/54] ASoC: sunxi: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:13 +0000 X-ClientProxiedBy: TYAPR03CA0022.apcprd03.prod.outlook.com (2603:1096:404:14::34) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 68390c31-a177-4860-deca-08dbb321b3e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eUngA/7MsEX6VE8luiUVM/CPjpSHJLZiTZU1bISzS639OHdphchJs/lZoAwklfRyON9yYC99Mp7N372ge7mHkNtxU8ISK8PMJUJCsGkfsvlI8q9W2oRIzMZgCzFbVQuvMSgJKUa9e/TpTGoSeDmWs6zZ94LDsysxRcsHak+B2nPamcQb6uXmmahRaAa1AXOW1qFY2E9lX6wwxWDsWIB0FSjqMtyo3TXRoaU1nunBM9coxeEqFbH825UxJMSPeCL2/fJUpkbyVKT7dBtl91BhckX2Vbxvd7ISqkG49DtaGkAjheGljt006zeo0d06EZ7tW2A1nnK/tIkRJIXYYJ/9UEj30Et0EKp1yrYVGA2t0vx4Z71Byou9uumngXZskI/STapc5bezN15I6DTQMT6gahZTTtrQsnLe99oX0Mtzzrii4JAplnQMu7WjM97KHB7Q/p0Cp6Kh0jMytfgBLajC4yl6EgSpFggEMUrvcaqomrZql/yF4fxFg7E47y5BRXmclcrq1tO9ROPTdh9KFzP0C1upTGKhl0WLzk4723NLHQP8uBPluJtKeJJMwlS0EmMKs2B1yB9rFY8RaZI4kNqpf/TEfc1tM4z+XIFxaobCoaBaVIYF0r/ADL+voGOmXjLMMk9dAB+FU1gRTOZPb00Z5g== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MJ9Qkk4daQgaFZYz2sHmJvO0lI2zXEJGRcsRtidNZiRvODD3Z6xXaG8QmsiRtZCLBzX0DJ73Rol4Ru0TsrLw0Onb159I+p76s0SFrkDqfCHofw8GQSpBcBL+G7KwkxSngR+tDQLjHmXdXaOvvhdH9rnTnWBL5XuNMIVTHRyLCyfy/FMiSuBmGL6U3oqFD18gnMFrAcFc+hmViRPogpDrvJNjobkzPDz2LU4/gBCrVlA3CsnHhK9QWWqdK/sFNiocgOzTlqxVGQNV0EXudOPy3lTpcOKZKgojzPtbAhATejSEJEh5+5u/ZtTql3GdaESOBZEa5RT38IqX3nFPBIMnGTEvAeFIULspN07ANkRI4GD0u7XliTIERRaNVXf6BFD0JvXRxH2uRXDVgQTlLOTM2yPbhKope/Pmz0ZCsdmRSu/goybEm1ia/KwDLD1JeKRZvukJaZshKDRbgYluTBJ0SfCpeKhBzxBP4+vulvgpopqdCegT8H7QB3aAMnDSWpbdf4/JqoIjIw4v6pB9nH+38ka6e8CZ4bjBLCs3FnOONSMy+YdTojS48LwS4+wXDJWXb1pS3Bg+0v7wc7d4QXEJgNGs21DkxHI6Fhg0VeXMm0YCtK7VLbRnrCQv+SbKOYNxYYaBBfknTj3a6MCc4WGLzhwcx58EIT0mLWZE9UasJYu2CQiMHAYj5u20qng4r5fG53FvOZlEXdjLbnMlY3ugInMQFuJTujyKw9epC2u7hMye3csdcj18sGSbHp2KA9XuYqGz6bh3evyZeS160w03YXySsrfEgCp1Z5MY7EyPQ45Nv6tV/Ae+CB77fwuhXJF/lQnBy2Lr9y1pcdcGB2XDvzEqpauu2wDVUgJNuPRGcZ1XKza1hIJF8Dv95BMAoYA7NXe5nLvp2q1EVZJVVQoNO8vr1920hBJ4AL1XmftfaX3oWCzLj+q4BYiX5DShZYrhw4qtowhZbZPI7qNbbzuoMmgb+oU5qSM20oX/SMbIeiicBi12C80NhjrzBKWG4hlX8CGfyXT6CN9a+yMDaVWR3x2jkela9tFOUQu8w7bBLuKQ3ncgPMzf7EoNUiUgYdngrUY2gah3zNlkD1G2mhaJ+lod83RWImgFAHGg3M7op4NLb+XSc4m6wgpchjOJHxLwqkAefnhNjaQHUNoNrnkVwyIcIoF8GHC6h1+M7xAhkBadDhPFdH5KRUuPhWYLElrpKk0BGAoL4FJbvyFXrgBjyjn5N5RBHfWGd98ap/7MKEnX6Udw4Nj+mi3NN+eJEckESY7G6ePIqJ0xm0aDuhO6AnAVDDbmQPU/rFx2maqmCbLmAQwWjGrNLoYdVOYH6x/n+Ke6EiYW90ABsLYzLsYFqwBKFtZ6/HsAVUFRbjh+SeAci1nnkUEQFuSxY1GN9DEv3RMDK+f6GAgeBorWWCRrd1ATHLZCUNDW92OmOh3KLCWRB+VuQ0/f/LMSn+zZDzFry0kiiFxS+NRvLsqCJza732ej2vF+7Su0I9aB+U5gOOhpt01I1IBNnexwXnLyt9x2SGY6Rdzje07VHcZuj8qxQwWIguVRSWhPHVUye9mfwGhq5PRxobdtR1VWjzrhL1UZ7qXKFsKGuY6u0tbCnooGIAVyjEaE3sLQJ2Zp2Zu0RNk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68390c31-a177-4860-deca-08dbb321b3e4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:13.7394 (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: RV6MBSZyu1qyKLh4o3/z/BbEv7wY+qF43H2JsCo1f1bSI9brDqWkR4Ko1UFsFrTOhninz/ajDdNxdY420JabyI0Aw5rT/w//bvmkAetnW9Z4KywU1Xhc7sVgyqW1GELJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: BG2E47MT2IA27JWSRRFSR76R75D6UBFS X-Message-ID-Hash: BG2E47MT2IA27JWSRRFSR76R75D6UBFS 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: Jernej Skrabec --- 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 f0a5fd9011018..ad6336cefaea4 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 b849bb7cf58e2..199cfee41d319 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 2599683a582dc..3f6fdab75b5fc 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 Mon Sep 11 23:49: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: 13380392 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 573EECA0EC3 for ; Mon, 11 Sep 2023 23:53:16 +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 5DD48DEF; Tue, 12 Sep 2023 01:52:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5DD48DEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476394; bh=GEnFpg4uC9pcL2Q0MpQIYp3hoaWeHMg11NxyXR+vkpg=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=N/nmsrLoXE9s/dvmhkf3P/wR5MOffF+SR5wgOHzFCPQTln1G8OHlfVvs2vmYb66AL 1pyU2Wixp1oohUirjgw81EWSa+9Bk0qVTPBnJndgx8m1HKAQe6a2gbTRAXPBJTLClW YP0ZPbxCxcCMnJ3oQ84lgttkW/okkPdLfAAeropg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7D412F805AC; Tue, 12 Sep 2023 01:50: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 0C099F8055B; Tue, 12 Sep 2023 01:50:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D8A72F8057A; Tue, 12 Sep 2023 01:50:06 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 D8A4BF80568 for ; Tue, 12 Sep 2023 01:49:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D8A4BF80568 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=CQAPGoNG ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AW9mkLHrmLOyzai66xURN2wwKjRw+sRyVYIEvjg+mnljCL675SljRtU3RmdD6rpPmpbKy7yoDDptP4sWVOtCcN1Xqnh/IKT+LRE6LhBEDNCFWmPkbL2ygEUfJ3XtKsCL/6SkPHb3rqbqmZBmf69RZ47fKIYtFNDSVuGK5fPusgVxhYCvqHbfYYlOzMwSLBuBoP0v7J9jK4Ena4QF5VBgwTVMG2jLxEwizkOKOMPu5hitH97raSKxYj+ul7zwJIWkt5pvHCT4sX4lS7iHz0VTJaGjO/oUunznvR4OzzdjDau2u4WA345R5OuZ3E0erFUJ2Gh6P8QCetb3vO8Jf+XkQw== 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=LoNjVlqFoTkqohceYca4u3sUipNBomoAP42MXKj2jqA=; b=f9z6eCLXyrVfPuIjXgV0W/yx3CCg7SkO8W+/fP8FGa6LaZzuQEN5FoS4Q/k8tMyTvW8cHcg+nEMBwkAEyABILRj8CliAMWXv4yGiNKWH521ny2HkyD1g/nWC8iVksTZATDmD5yi3/C6MGwVq8FMiJ2NaJTCejwVJnJBI9u1SOHgV2JjyaIXcEEyWmseKvAiEGqc/XtLWPnpCsRMPfdRyZvKzTD0QaZ3ijjVOpSbMY4qwXYl+2XIW84oRYzvFU+XOc1+w4rKL5VoaZC60lnGJ/6as3qB1Iv0N6BZbKwTDKLRugRubj/0R3aWd59VNUFCbu8SRB+KNELc1Xu65GmpUEg== 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=LoNjVlqFoTkqohceYca4u3sUipNBomoAP42MXKj2jqA=; b=CQAPGoNG8AV4qUkdaRNVrD0jxSxFQmKuvxGbUVqV2Y649nJ6dSYNbt24W568mNKqqtEZb72v1W4yZp4ih3xByOiJ2s9qWk2dIrj7e/n/LGSCm+kfvPqnzY5bAXvFeRQU63MoZrH22tB5g0h+juB5KgXZIg6pGbCdFzLs+dS1scI= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:19 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:19 +0000 Message-ID: <87msxsqni9.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 21/54] ASoC: tegra: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:18 +0000 X-ClientProxiedBy: TYBP286CA0031.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: cdc2de50-88ea-4256-91aa-08dbb321b729 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BPcld4QiH+1hpmp2n4giIWIiTvFAk9jI0LSNFr2ddCWeUyG61Nk4a9Huq02FkCYr+mJpkpv+NAF193Bh19dp2UL13wjxB2K1bLIBSjZniTlTu8Aq7MICmXUaDM3O+0td7xgGLjXPQbUpKC8sZBS4lQO4w0q/7bEOsYWhNd5WPgTqcUC5Bhl1tFoyfir2EURsKfBqa9kzHBoFl+Na49/TzHem/OMnobcgDaCwesra/9d35w4BafAZoIW7SvN5kff4lr6Xex17xRrfKsczzaOU/Dm9BZebMJ8DohPymmd6FWstrjtslZhhlR2vQN6UCIVsA2+cVQrh15y9zs9GBONpf8qCn1VsrbWOrOGE/5dBzzegCblD7UQheolxg0nX50YahamdKJelIjEFb/QtMFBwt/Sapx0Xf8EFmIzjKXxtdObURC37wXFqJRnvLtvN7iP2Ot61COgHI+C/Q4ZAW1eRnnMqe9reuINi+Z7WtdUbT4tg+wcqnaqzgnvo44m78EBAikuCq9TOq3ihb9FceR1dKdmGBB6oTFv5HBh68DWC3wmC4fe20JvGMvVQsUSNbgnj3DUWQsH+ZsqO5pgqRQBTiFNtCFxD6Dz8WKR+1IcJu0LXGLGaqPvorWrYqPYUbM/N11l5nZ0Am1CxSmR0R1Y02g== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oSif/fEiCjotjARV+UzDxjhH0+N6DVpWTFSjqWE/6uAntGX5R77dmfnavnPeghmpCLtGZvv8vH70cmDs4+zVPiThfNHrasqrjbF93exDt8tbkj4liKxVwLWYmkjeouvvnTqLdXGDy/jwTqfWGgsD9VxnZPdLWSVw6wHnYZNJLSIY7F4rZs16Unp2DTFbbjgs+RPporstw6DPQXclZ5PEO2nzvAFTjNQXwZXa/ra9/4ctzxBgLxt5mV3LPin1HdUMMWFnCPACYnmhw09Yn3RQMdFB49DuZVVBPrba1ol3B8umBgeDmb5QArgRGrJLujsALwyHpoQwl1v4lUT3sIBElV+XW6PLuDPJmN3l++oIZeeo4Lz3MkWYwTO7QSmY+P4a617tg3KzNz7wcVwkQ6vnX5IuzdT1iHMZWC7XVv0tym03EhJGOsqdU2msz2iDyCf5kuYHYEquFu6FCW2Ckp8jXNWPvx1V51ZvEAFOR41YYOs5SLPYHq5k0RrY4E+qfD5tRR7EgA2ubEM28cg+mU8M2OmRkOd3zGQ+JfN+zHCtfSBLJNEWkqwp4UE88FwyHROuE8NXvwDGGQBYo/y6wibK9nKy9jvBqmUalVgvmDcZQatPRkUf/zvLkA3jNh0x6oGyrq43W9V7pHRnyVtprly/os8611z+7ueTP/zeeMlvjwrxLVzoW00Dn+MbgeiGFum6zmT3SsOWJs35KDt/Tv68oq+W5GWikX7TJgv+MSkBHyE5QMufI8GSKwGLzkvrupugKOi0N6B0tqfp6EH7vpooZUmPKWRiyiaouq5nJm6jyYX3r9Ws/Jid02m1qgIgdPL1KT9LBoh2KdpcPO2m7tBKJFRq1mOEu5QLyiv7DyYsLluIGfgkdJdiO+G2okyV6F5jmUKFPlxgsWjSY12QQRH5/zSlin9H4gjuNBH5XfHSGBiITSe7r3BXma2nlXfeGelR0L/gHlPO9xTFhkoKawu0o1vPhNoBZDMvqoGVvHAAj5U6iv7EEi9/2N4hj57M+da08a47xPthBteFvnTeMmVtlooGKit6uD00rkkb+ZTnSQcVItpZaK2FrHBNHrP+ImW6Q1WsnFjq19iXFIyjlYQzFXBRpcIFGNwR6LF+EiZkXW+WTcUvTURlv01Sz4E5CzKlJ0+5Eg4FnpIBwnu/tofp0JCmeIWQXvEEZnotq8eXpYNAPSyVbtetLRBuh9zNoq9D4yMKuHepLiGlVqyFWH8uwLkHhZkzKkR4Mqu4NZQGJB4dKXGjPCcxWS+khGE6lhZVx4omDY5EyZn6Qp7l4dcdof7fnfG/N5QHsKTF05lkP8oEeyYcc/ny/gDESo3XcxPm2To+8AruSOxDhb+pxOFYmmrLTms1V1VSYdGipsSdCyevb8DASm186Y4fv7ahbAvwooEJ01J4gWP7jzxUEVRfMxWWrI2ro1wv3lSpHg1b4JZnmINOvWhwoM/Ru7wPI+NyNoH5wAn4DzveHoJJqigNN6D9lnpDYxFto9IyqE8mUFNMTuW4AqN7IYGU9RwV13+DayBzF3piCs0BeMbJZhtmWQM0t3PBsOPBOX+/PJ7YVe69CdzTaEbgfwhLEawhTiLLiE4wsRdYSze+MEEH0V5F/hGmZbPMXDzlkYmuyRkuSzU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdc2de50-88ea-4256-91aa-08dbb321b729 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:19.2320 (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: 1ktpgWedZnopuhqnTBG5XnDJPFVXaOVe8E0rnb/bzbJp0EPuV20DkVmtCQPLTb4fXJZfXJb8u8AZENjhewDz1MvqPhj/sGdGrCDY4zzOML6xGHcTq8rR+N5D629R0fVz X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: ZJY2F6HRZK63RK3MHE2NLQEMZ3BDPTA3 X-Message-ID-Hash: ZJY2F6HRZK63RK3MHE2NLQEMZ3BDPTA3 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 f5092b4109268..0e75c6d5c0c59 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 1f2c5018bf5ac..baa9f81f59974 100644 --- a/sound/soc/tegra/tegra_audio_graph_card.c +++ b/sound/soc/tegra/tegra_audio_graph_card.c @@ -33,7 +33,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; }; @@ -48,8 +48,8 @@ struct tegra_audio_cdata { 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); @@ -136,8 +136,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; /* @@ -158,18 +158,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"); @@ -184,7 +184,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) @@ -244,7 +244,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 0b69cebc9a33c..142e8d4eefd57 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 b3cd0a34da637..6116d2e30fcaf 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 Mon Sep 11 23:49: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: 13380399 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 4ADEDCA0EC6 for ; Mon, 11 Sep 2023 23:54:49 +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 787B1BC0; Tue, 12 Sep 2023 01:53:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 787B1BC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476487; bh=TIUJ3MOkCtrYoW05uwe+K4NutZXZKdRYD9yO6SJAB+U=; 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=uvmI28ImvexOiMtTsZ9wPYa8KzWcXduVMkq5UgYah5K46lDL4fE7JnPijS9gtWpv3 /rszS1i/gb3jQ78qn/V7jF+yo10jr063kqv7Y7UR7rx31H3FKVedaVR7vVdGHhJeS4 g1CH+TihlPmXcWD8CGh9DJpqtVRc970HJyAGVIcA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C5931F80655; Tue, 12 Sep 2023 01:51:02 +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 F37E8F80655; Tue, 12 Sep 2023 01:51:01 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 149EDF8057D; Tue, 12 Sep 2023 01:50:55 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20700.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::700]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1E1B1F8057D for ; Tue, 12 Sep 2023 01:49:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1E1B1F8057D 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=QlbygcXT ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mu/8jWE1G/B/kjFynvQHVQ+mmrdLbZHkqGNP7r8GKvs9doQiuWg+W+y/P2IFj3abTcLBSVp2q+cwwHoEa2GPMf4NXeUpF7ARgtq2Xa/gmmUrL/4DL2Xi3JWlNVYha5nQFrFtiY3NoU6ssg496jgb8Zid/HP7rpr5m7gPlMgHHJNYbw4PuJXLNwFTnovMSZ1rTOWSFy2RgFh8MWpELEB1vT+mm/eHGK7ULviBKcOkuvZ5sT4BXBtMKwwA+X8UvI1gO9f5X184deL9+ygfYrJ/emuTqaJjMdFSsiF7BINsJITYBrDxng4U8LLwkQTNsyQK0Q0UuykNhImlX2wsasKSxw== 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=HCbNLHldithQ0xyMTqWrabcJ9X+QbH1CLgPDh9lAoZk=; b=FOcWrKTRlVhrFgNLujsEXnMN3qhCDKRSqy3eEJ4CWyoHVRtvhtqNVgPlQ7dHplIZDkl08eKFfqXL+PT8qh34pHyAujUniwaZTAbo5LqftXtKAZriNo2kyj0zpTyJ6dPj7pVjTuvDMmpi0ZK5mJn3DJtiOnDfG7ZZ7Q1VVvKwC+ZUFoe3DHkj0Tg5+78YDGpXTI+ikVu4y9D0Nq6slgLrMGGp8QZhWZqtqczYmLNGIsEeRWz24/OzWvVjaanSv5SLv7erzJZL/2wAeOH0uKgmp18JLfDBmWIKWQScor8Plv2Dw9CxJtlXsNB9yDsGF7phvnuRbifNIoEinSd5vuF51w== 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=HCbNLHldithQ0xyMTqWrabcJ9X+QbH1CLgPDh9lAoZk=; b=QlbygcXTAsN28RB/CrWW1ujIw97nzPQJ4oWjhZIobKMAkWcGwCT9HRYBfsCyXxb/OnHtC1N5cd2BulS6LYgtZiQri13gOMXnFF0rHmWnlWn0v6sLQsfEtsQjCH78Eg6bccIaT9/NvNzLbiLw3KJG41WZ3kWD5pblLdx6CwySUtk= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:24 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:24 +0000 Message-ID: <87ledcqni4.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 22/54] ASoC: ux500: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:24 +0000 X-ClientProxiedBy: TY2PR06CA0004.apcprd06.prod.outlook.com (2603:1096:404:42::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: d6e97bd9-f1e2-4318-20bd-08dbb321ba48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 82kE/Do0Mf7b86F64EJ8oQ79iZqxKrpNzmd2A9bqKxeqcQmoHRfYtGwUrhDGMxImCfCudC8epRxisbh7y2VQkc1pvIbjp6N9K9IR6bbswDBtJ1nXC6o3aJMm0yVL+dkN3n4vsyYN23+KLrj26oDfOHi2k43VrtdXiDhq/U5I4bqJvjPHAmZ/Ue++qGKPZorijpCUnLPhosmVboJCSUjg+dw58CLxqejG/5nTdhPHOOv9U8W8CfeGmuETrxIw2Jzn+y3jz2GqmYi1ATqHTgx5B/XXNV9TZe0+YoTNzYqwiF/VSWksSuaxMLL4h2GGdawfHiJ6mzuZMgI9f/UUDG3cFltZwJUdsH2DoG9VODTXmvXg6KOaRyoQFRb25c0zlo2I8JzXB17AtrapzNBHo2fqej3vSmaHeck9073GakpoSkz9r/5rdhPhPjSoQyhwcgTX0ulpVtmfmClava7xh/YavSYdJHjefyjmBe1dV9G1y/MdU22NvA1hSCZL8o4Z+hy2X2QqaTxPMr8evHvaFA4k0vXlvtODUQythKFOUPL+wjQDiGy2dDsowRHPre2wSuUFFyOHo/+OFQ0hjnoN7IXKDO/pBvDpdpJslrtyCwY76zWWrOrjCWHGnZniWbdqfwyqoEXRO+SLX08tvULndWkshg== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g7sGYSRSM9zhcUKkn1/xg7sNBzUihPkcAqEh0sPxh9yJ0Qv5jPmx4vH0Re3RqrC5EVZFs9cKncbrztEsnVr2SjD/fXRoIx8D1xcUit1U2W3qG7FjdsauvC7m3L9wUPZLGH2eByM+3hdRqpY/m8tbegmHVNk+AiCiIEk8lL3F/b1jBLG9U1oVLT3DlOb12a84/loZKGboElIAeXUmWYM+jJj4qzJyNPlo/g0FqgAoKhycPl1p3KrT90i9guvf5XzuRIskbSOy4Orp0OXxF60mlShd/di/vExzIWKtCYNeOy41KmXW6FGFUgeh+rKdw3n3ffq4lnoj35YkF3J4DlgBnjg66rXQP1j+M9V5qDVCFm1p5EulVQKWoJWuiBDCIcuaMtLFwkBuQVvxCGwor09Ovw41ZPKEQJRl3kEXUtFg7K4HtFDyu9QPDqStkh3A9tMpY/dQ3vOKtpbzELzGs/ZbRqg71yVs3M0Hba0rW9rxILxf5odyPOD1A/vh49zF+oKbeQMi3qpumXLAJcZkFRK0tNKo5mpjzwgudAbH8l2jxkYV0nfpGhTb9U/1rp/K5aEKu6pGeeYIAvhIK954rawuwPL9hmivf4S3j3+AhfAC3Rq7vlg4ITYMJc9ZhHtvHwwIuR+alk5HQH8x//j7/XQZ+1NgrlsjwAvni3uL/LBcQR6TlEJpaU+FOAousXWwVXy89/adANsIp+U/BPtyGN0KTfTnYqt/jf+gFKCQEbC9UaDak3zqZmDr70X8c7ZUVRblmS0I5lki+7nHKUjdKpVY7cvQjFjwfJ6duOkov12NJuLYtShn4sSeYmSKqTMGSmRMddL49yQNj6Dtz+8Lx/5Aw6u8+VCF2XMBaWDSyzc52btbnSdlMrr0NDzo9cR00+hQCvV/MZ12lyXjqz41VVDchhGQzQmiPooa5TwTT/ISgJLqAn0fctPQnm/Cj0HQjJer1kjkG6KXfwOCmE6X9mHzNBv9JnqEejRGJ5mHnikrqifGXw5IQ1VIGnde06tCe2uSMrdExJqIyY24YH/Hrs+jpuKdPTI/iV2tgc/uoNkN8SeJzeZSENrTNkkRNHC/yjv1tlxsSP/O9RyogQCr1oBgErIW9/g1O6hD5PaKBJTSOmmcFVTi08V07NCJnbSaK00NWPoG08rebhZ4acgOfLStxL5mqRqRMLQOvU4cCc3hUrx9LPTcUy0VA3bZMgNbI2sfhgvnnZ8eb1Ivo+z+5u52OHHXNpL5vie71I3oCaEvx278nIXdGkXOCvijsdFKAd0KXZNeewa/98YtzlJpGim9sKZG5FZ7Lwmpi8SpI1YOE+qNv8fqh/kgWF3nZQrx9maroHUIFh0KAWJpkPHewVFFBbzfVi2SbkiGQANEd7/DNXYzubqJCM5jml7DUayKpJ903bxN0brCe8k8lzmBjMlI3vyvXwlzRGBWIrDwEhJUc+aLUAA4GNMgJsn3+Gazl6Ek6+SoYeWsMq6WXpCxR8ook8xEazEWIkaCbsIA1vqd9j42QpGgANsoKR1zz078Aci5Ue3S7CNTySD5okkXOo2pT2XQs4RJ1uaZIERIN2Os3viz4B5uvd3WJ+ISjDiYMIdou2QXI/DauW4kL2AIR4A3UK1bHaMZJ6D2g20YFLELoIU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6e97bd9-f1e2-4318-20bd-08dbb321ba48 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:24.4646 (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: ig9MTdw2ybyqHwWxU99/sOr1SvPnIF9mFnvbtgUbmQu84JsSjKrd6DMUIB1xymNgqI9dR+l4iG4h2xSSz0jcNLl8BvV4Wpyw42LE01+d8TlLXw0K1tnlE4rUTvIq4sLI X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: 4EODU7WKTIKA33ULDKI4A7HCSX5Q2XPM X-Message-ID-Hash: 4EODU7WKTIKA33ULDKI4A7HCSX5Q2XPM 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 e5e73a2bd9fe4..710b6744e0136 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 53b5649cfddae..b7f38873d2d8a 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 Mon Sep 11 23:49:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380400 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 BBD08CA0EC3 for ; Mon, 11 Sep 2023 23:55: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 9F6A6E97; Tue, 12 Sep 2023 01:54:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9F6A6E97 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476498; bh=eGSZldMvKsm/Yom/NSIBvbAgamEkdRm3Tk7LeMi0VIQ=; 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=FUgZ+M/tm4HjjuNZV6NGLoSskgvOSrOYgFV3zJCeyfnqhDcjuOB8m3VveDLoqERn2 v4n09504VmraYzRbz9MF4+eaigfayXCzmAcpFROpngRvxA8bwsxwFRYOy346PzynmW pYhOEh0DAOWaydlmZvaEnYquuQ9sG1uAexlAGTjs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5B834F80652; Tue, 12 Sep 2023 01:51: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 631D3F80656; Tue, 12 Sep 2023 01:51:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D1169F8063C; Tue, 12 Sep 2023 01:50:56 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20700.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::700]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B29B5F805AE for ; Tue, 12 Sep 2023 01:49:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B29B5F805AE 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=jdxnsSy1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S7/esGFD0uVSHgHdOkzjJXudo9G4osdHd9BKETXR9mt3oNk5l79ymJl91nrV9QobE+m9kG+evG66WpfyBZg6UqqE/8P8VyFVF4QkexvhqwI8Cj5CSGp9hczbX2tn3TFCRWWohck80LLRU6wmgP8Maov1N6EMKtKP9lvl+gKcLiD3xnxgjFpotD7HlEsi+X5TAzkFwnB8vs3wIPkwRh3KFSdJTxj3hJsRLT1WoNeDKOaPUydFgl6HZSluqCeeAjPge8TjHI9f2rzf6uA4F+EDCj/Z9ldoT6iM3Guz3tTKn77w8I0Gay0ksBlxKTW11q8jXjLTpwNULgyRQeffGLBPww== 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=UdxX7tv/3YnbUeudge3Otqv/YReKToKjYwGmjkB4Bvo=; b=cML5PG0mJaIJBFbWMu6EvgvOY78u4b+sM9vJ4gbz9Oclwv9OB+p1K/wmMqhvTvF6OXvQzWBSqoJNiZJcApNTBJZ1uLzc2w6mH+qo/eAwaVgThfkKiKDVkRKZSIEWtVIRSkkYdRYPXLW3ATJr7HF1znrCCEqnwVTEz2EaH39mxPI0PQ4ZFd58ioEs53214lcRMqx7aFOtJ0ZX0Dg1LgVQ6RaHQDblDrlzrDo5FKPyNneZ8TX8RmeKb3Kz3JPBQdJaysA/VTLHeOpEiuN1wrgCHZ/EYIRVHfB+TLaAx/4pXEIN7lKouw2Vg8biSw0vgWQBihvjNn6TNuaF8a33iQgm/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UdxX7tv/3YnbUeudge3Otqv/YReKToKjYwGmjkB4Bvo=; b=jdxnsSy1T/c0Npa6jAC6znct/l3z44X7T6kswdUJEVlz7Ds5G5aoJTsnJEq4suTyBCjxCvn2D2k5g3fXzZy6QDUL2yq56xT65lCFU/sVvnZZN88IKjJSGJzyqrntVxayvSThew2aGpKbz9pM0A2qgwuG/eEyLqTcgL1vAsnUoQY= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:29 +0000 Message-ID: <87jzswqnhy.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 23/54] ASoC: google: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:29 +0000 X-ClientProxiedBy: TYCP286CA0198.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:385::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f6cba49-9a84-464d-afd2-08dbb321bd66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7c2xHMljH8uP1XDSLTXUAE44W7O48CWlTkeEzeNcglvKMQjlZ7eQXMln65GOwDSw1G4Jb2bOPOI5WrFxkgfRyCptW3KAe1NGeXSQuBrVJyp16jbispldcM4o59+PNb8JEu1YR5AZaoT084JApCb7ldLoUfXaM92Vv5TQwxP7w7IsCTgCKV/MOVBQVUKaUQrTJDr0YqCdJhnTqhPBXatl+M72WMQO7lw07cpXUxAYqIyX1a2S26ZRyudAU1Nrm+7AItt2q5Z/W9YZfYIXQ+Rav2Ac7+S6u+rypQ/C6w29CC6eUoOvay4kPx+zPBInF+ooRU24TXPQ9buAwtdNNju6tDFRpv9FFzw/4m51Oqwln4R1946LoIMpwZqjrhSMQaK4eJUyL3ER+cOBX4xX2+zx2jYMfK3Wd4/Yfe3QuMHoD0Lz1t8QmEASm5dBS6fHxZFv9BsVOWEgRAUHaHAPkFPfbJYhQwDYLNpRwL//WYFx/N9aN7/QEKODmrmdbtSVvNht0A1EdFAmFx09ZFC+twRu8AswDg7pM+Z1KKuxMQHWV5P22bkcbxh2cmpPiye8d/uG4sEIgx/MvRS8zfoi8W9uyLGGYHAderrmwaERMIMTq9jXVtTZTj1pr2fmb0DxWzwGm9Fh4qhxNCqkElj6bW0B2A== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: axe2VxlFc83QeuwpA8xA+3AevHQtBtNE3hJEK5Xjf8Sy6dDrK2vlhf1boXw9Do6d6+/bEBN2rLulSreaYYKoWLOu0WpwyJYBtQcoRS7Fubtgb2eZ3/ElrFv2dPvmeCn5m04qkUY5xu/PTjRHVGfbPzlT7bnFloBZ9oLFRVvwwr12PuvCAkl2e1k6FzoaIPHVDwfeMrcqhh5JsxtU5GTuSR2zfZpPbD5rx3+0yaLHHlor/s3Olv9KhR9HoIm+ZSkNR7jeL2xuSeI1TWG0jbXQ2Nw7YQKIgfH6xbZB6ImwXk9nsueBiDMN4LUtr2/J7hbA+aPchRU6o9W4/+AXoBw1WoqjqE7K4Txm3rmnsMwz1esJaretigpgaNhqRCYBTolM27K+F8FJi/N2v0kVmllkNUUl0/i9bjJB303N7ApQrJBzPCOz6IWrTSy6drMmhYHtqswxyAkPFULouthh1AjVeSDHCe4N50rDwUu/nEzvS7f7kMOLUzMsw+RbNzS/jRBiso3h4HdbHWGjLdiCKdCGwTpLdap3l/pTDJMtZ6+ENk9aJUGpMFc/y3YYjRusGwH88WHKQcfD2czC1OaysJuybngDxQuAQHjbI23HUSh1dZCqmNDgVrTp0S89Ag8VVeMtjDXg59fYdDICHhSrUdvyzgeI4CDo9K8Ze7LvfFE5yB8+cQqelh6Y/FVXt0LmFFlz2XeSXHVZnn/8OoWtU7jOGLOdMuGeVrJsp1e9d2vm3ZdLhLJ42Vkfji5CpryG0k3Ej3SlS7jvFLdeIKljGtBcA/VaHCQHrVbAoTpx3P1vsqC0/2Bmdm8ZH9T8aIkuUU+0CJAU9d5zbZwcknx/UP5hiGxYJQ1FQZXl9oSh2tlkVSeZoUDCoNB8xcz/hJZ/EcWGaz2Kdw9UCjTbBFvF2O+5t/R7zrRkP4decWO0IYOCAKGoeyJ0PStPen75zjtoVAyXy5ifoaqwK1hG8wq9dwmVJIQwn6QRvibgR1mpDRF4I0BwMNyAqPpelwPfrYu5kzLLE5pLHfid9VyF1VG2lroeJs2k8Hgz+X1XVoBGZXtn6W/2h1tCkWhO5vTVxIZ6CrN6+sDmfhlghnNlyLRpq+mejZEbp+pmaW66f4u+164/jFuQ9LSIvFmNhTJ6TvlL7cEWadlOPtenKwvUJmAz+uwan5vvQ6ezXTHNjf3IxArS4tGAh79kAICfIL/PS2i/idaJoTQNYbJnCzhHyu2qO6WFES9Cy+S+/7QdX8vEA8HJAjlDVTHOB6iChKg8Ml9XdUIvDLaVf2h9h2C8hIjvr2pfuv8IblPxiyyjGJsWAEX4JBcJrwsM6xHO0HmsI0IMbEf3D47X6phna62nH5ILfJPGlCsMuGV8IDsFJyuWKosE1v226Js4twAQcJ9U3XryqmxCaVB8v6AD2b/1YaI/vVQi2TBxpmyvNqsU/bEQl3NquriHwZCBU5MrjWvEwfRPYBzyup80HBVOBEC+RMKOsFaBY+w5hKXVLWR7R2bwfp/zDrx/NF/EQTW8RTYmntjz7O3i8THpm1HLOHLkAzPPYJ9wNnD1SO2xUgTC4ZGKdF6dEpBf3JM2fSuIePZBMLya4F1O1ULbodDvQr//VBncaSbyAkH7l0A58r7HyYA1gO4NYcs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f6cba49-9a84-464d-afd2-08dbb321bd66 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:29.7164 (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: Jxl0f/mMOd88ABXtDBxZ1Oe7C0yTMUTkzRLxyF03Fuexyi5IPMJiRFCD/Ik9XB/1KIZj8J43llMS7fN4Soze/sB9edpMN6LVhun7s8x5O6Yq/iw9g3NcE5+Qd7HXv7R1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: SEHA24XPPDA4VEF7XJRNE527OB75Z5B3 X-Message-ID-Hash: SEHA24XPPDA4VEF7XJRNE527OB75Z5B3 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 0f65134449066..08e558f24af86 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 Mon Sep 11 23:49: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: 13380398 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 083F7CA0EC6 for ; Mon, 11 Sep 2023 23:54: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 35BADE93; Tue, 12 Sep 2023 01:53:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 35BADE93 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476464; bh=ydh1+3ao2kkL1UtOtFrz+qbz9f3ps96UiQ/cI/e8Jz4=; 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=lDus43ADCwlhzBtNynyMrSOh1MFq/Q/AlU934qH2U438FrKHof1meX88Y36Cri8vl PIfrq4mJ5QLg6LKJntQuhZE/pdGGlPH2t2rmwKcoBVdOla4njoQXLHbt1C5rk8aufe ZQH4QTgUpBytmKLlJUbqIFTgqv8HevDXbHThoiyE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 66326F80641; Tue, 12 Sep 2023 01:51: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 4F35FF8063D; Tue, 12 Sep 2023 01:50:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B4F8FF805AF; Tue, 12 Sep 2023 01:50:54 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 BD3CBF805AF for ; Tue, 12 Sep 2023 01:49:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BD3CBF805AF 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=ijZpYPyI ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SEGxdBsvfkG6HbvCIcueAxajZF9QyGWIeuPV2SCyhJ0nquWYFU8BciHsEcOIs0r2nBFVdKIvTNqq9+XxHiMzBU0qdvZfzO/wXupqIWrKzpcRdcEAr7ABAzs+deQUn7p1Up+4U7rmtYRI+WlGW8lFyYvpUZHSNOCKd44Am12VFYqsVWTlwHTnLIsy2+Xft6V87cCd9ahd9/2qGOhrPFu0zZPt6RZ5npSaM3uaPMNx5JSXKPtelYSpm2ecdHCGD8DHgBRbHfeMGcA8jyl3CL7HQtUUDt3CTKD3UyvG9W9kj28C0DBe+SmLNxejzYV2nyMeCdmbicSAaglBBw7l7IVERA== 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=2mfM+nGFC4Fad/L4fA24xtoIioB0Aca81vTukQBhO34=; b=Jdz/G7dCkXgw7j90VF3seY2JA5rLrwuXuQO1OBa63v5sRbDG5cRwFIu3ix4RmYnqf92D49ZQmgEfvYKthO0o62uRhI8JSLj4mXYHcH87QxRgepbMf/hXOnJ444vwoSOcWaVr5I3lCrph8rMve5w2Q7MpABuvHy053PCFPByzSN3Kd5ZNB66Hu3qfl6p1sdwEKqEA9iGyD9oVcoq5ZruDO87Jawsf2cLQzMe9fOY9CK3q8UBpzNYcHAHJ8ush6nXejxj3CyGDE08H2X8PQyoGzSFwDF0+TmLCNQDtGTxqkt8G/dKwTyst2DXCU267wlnTjm1xDuRO8o6xUPTkauJJJw== 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=2mfM+nGFC4Fad/L4fA24xtoIioB0Aca81vTukQBhO34=; b=ijZpYPyIeJHMyWiS+3NHXKrNlme2JJe9dDg+BgFM10eXTMIgakSXFATBiuebBjfysCV08nSg0nM9XuYeN7MaH5m2WvKE6DZKD2rIXbwhw5ompyyxKQi88zRyephx1VaezcgjERlvdXC7I6+kq+171e8QnVqscQoqZ07aS4wYeag= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:35 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:35 +0000 Message-ID: <87il8gqnht.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 24/54] ASoC: cirrus: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:34 +0000 X-ClientProxiedBy: TYCP286CA0160.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 525f92af-ff5b-425e-29f5-08dbb321c091 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8LNwhtvm7N9nkWIV806+/C7mpZh1h3PtlnUI7sAxF46+MCGfbMdbrtp/2sOsZuQFKk6r4J6lXEHMUF3xBrGFzk1s/ZIhUUH7Hq0cGWAxZ+5htfN5xgMrnzymC4aW9QBMD4jCbeJGDb24/nDY5BMJBsCXlysHkXpoUvBQfRkcusky9GUfrqDDr0OQCuSlY6jfyFzrtv3eS0NTY7dBOfbAnEa0BrI1QEwUe+Yk0AokrfcpzrEK41djZeLIAenn2fojuO97eFm1UVIc/cmm2ixoDtReJXvWpQhDj4hEG8vSF+yVCSOGx8uDG+hg+eD0g7CTg76VujumnHMgvRH5pCMPqW/ZPtWxXJrKwmcSpqvNR5dxl0+r8dcF4RJev4aB1tusNqfGUWtU05cSNQyZ3uhwVoeAVS8wIHBp3b0CjleKKBhvdRNb/tNFjgpcIATmZK3C4THCgptcxAsIqiO7bE+hP2k5oI4QKGPPaPLxMXoLkRoScr6c4ZY21Zo/crZ2i/TEU3jatN6YnAgPKak6lAbhu6kP/+H2kI3VfZc0Ys+aPPHksyGWcMyBy4Up4oirzevMvw2NYl4HKrTpbJvy4/2atTcwPUQBXlSymu37a6wqERMrlUyKI+f2mffow03NdV1blFiEgGV/1WKHUtuE7FM6rg== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4uww1rZRvHVvc4vByn4StxX62UMiymeKDBkF6N1TRlmWC5w7eKD3ZtHdtxmEyQ8k+JkTFzGJ7RnWtLc5ID9dnoiztNbvurT47Oj7gzSx+c5C1PLCI/O1oZ4pKLVZXZJhdrdt/ZC4wQ4JE1sga0lzs8YjedVxM/vBpRV4B3PewqStDegsr8y2lgZBK34Z1BYWJEXKRnbz0CyVHBzq2MRi7GB2HCAfFjvBkOirNTVRxr6rq/DMIpgf/O54YXJJMDo+FUmYSWVDY1uu0X9lAzbcCblXhSWm0vbipDrVWLvMEpylBGoQuEPg9coyf3HDzrqbLpFN4ZDfshzXk8JI1ao1JNm7s2EjqmQ+eJzLfNosrk71tUWJLxVEzXuXfyUo5qObjcsnZSADW5+6zM1F8Y2ldCQUGyyUxnmA5RynBU1X5P+wYFgrm5bwldtcyVsmDTOUEchgx/4fMqEcVKhElub8Oh/zNHClOlXIheT5l7GXyvDzLQhowAuQ3SSwT6x3vmOZ7waWh2QLBCseXww5nHtRjgTVr0k0D2Qg/dlFOOak0DCvzaho9z5T0+Z470z0fYat0Xs7tBon31g7TWvKmmts0WIp6N0Vbnco25FO+TJ+iQudmcJSQ+iF+htJeAJllZGys5nAlsOim/oHzQbpRZsIFSIrZHvDbW5l3UBxhBx/sDDDCM+HmOpIH/6SHxC7h1CDjQWbfZ+ygYwq4lYkV7PnlUq/tylKOpk7hVGimIy1MkXZ6UpnXU4fh94OlDo57OOYzwiKgSyO68WfWjvMGz/FtlKDr6NDP5O6heh1LCa7lMnSFpvvKNN8aP5b+2FmklhFPCHhZ9ekORXmJABHbEI1le2d5ATwGJgOfGN8DwqY1tQ2PAfqG7t7b8O3Ac8m/+8AIqzoDbKSBKCgrbFVtrjY3UEJ0UdSYIACPA2lK0ZkS9IOlSKtQbG5AG2UMMqcSuZW/GLfstA4tGMYHoVh1c7Ckt4W7/1Iqv1xdy/ZVrIgWgDm3gbApCouuGp6j6LUr9gfGfZGcdkysuZf5fVb+iSfU09KmYAVBWWkj0a8AYatngS8/iffp1xF/jR729J49Vvkr4CdlPy7qd5m4q4O4fBoU6+nwZY3TSozlRAOpmXCRws/YPcHP09xH1vXP4If04OcNuDGi//tl40P8DpdLrZ99XabxZmjqHp5FsjQdqSMR+ssjG3YtMN8+TAE2Ey7Yu9G90yP8br4SjVdWD7YnTA49IvVSobcZjZ6XblqzCn6Pl3/pmv3avLLiuQGCtk1EKQNm1jlQrC9s4Ff7OsyvxJDbOyjOsd9tmTd/pDj4iDoKVGHT9uH97pjQFbnTtq6vpAgXVzPj2h0izIX9LrpaxZbEf6NF2Dy4OwPtgHBbapJWAQJ39xPrkz0UCIMj4e7egcx5rl8CGeHOi5QkTwqjcawR/QP0ktHRWXeovTteFzJSrHZvBz4O3TqHojOaw9Z8/E1CbdPM9CZAGNnSqmaIiQJ4vnHD6J231+N0kTuevdvrbDd/U1Bv5wlFQIfE49pWwDARWgq3yzbhM0GOKlBQ5aGaXAQrxfp7R/Wvv15RhcyMOYuEY5VTsFgqAoaNjeZ6IcsT/swUyPZjH2tx3nut9vWg1zWngi5/mRq3JUGf6/7OmQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 525f92af-ff5b-425e-29f5-08dbb321c091 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:35.0142 (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: XoNOAMy/AghmY+1aIKdwsB5mXsCabspr4zqS6KRutwtb4GoA0WzV5ywGvaYR5cXsPeog50fOEaKBfGJoTtHNsPsxYGEp6ZBNWYv5m0yoF+1qEWV30etj384v4YF+wn3j X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: 534OQH5RISVWHCLKNQ64PYCVFGZGXDZE X-Message-ID-Hash: 534OQH5RISVWHCLKNQ64PYCVFGZGXDZE 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 f49caab21a256..6b68172563319 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 Mon Sep 11 23:49: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: 13380402 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 758FDCA0EC6 for ; Mon, 11 Sep 2023 23:55:42 +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 4A954E7D; Tue, 12 Sep 2023 01:54:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4A954E7D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476540; bh=0NW7Jd+jM93QMxuHGTMJNMuiyKuFdvlV0Pr9JGE3zZI=; 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=E5u/XMBrENPHbCC/rxzEDMoaIS48MV3FFZPCZnmDVjleYq+6yf8RzvNKna/wb6A79 YlLOVPFEBf5130r7WU7bRknxh3H1C2yJhSb/rBCJEZ/OSsV1BaHf3DjQlqq0OQjQbi dRxpoaBBU73huPIXPRCvfZ436fM42Q/4C130wNbk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9E413F8068E; Tue, 12 Sep 2023 01:51: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 C1878F805F3; Tue, 12 Sep 2023 01:51:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E3F70F8067B; Tue, 12 Sep 2023 01:51:09 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72f]) (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 E73BEF8047D for ; Tue, 12 Sep 2023 01:49:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E73BEF8047D 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=UBwwdEA9 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GxYTHyrxzLkAFE2WuNTffCWfTaj2Fbsmr6/OEoBHNoCZmv5DJs/OCvfo0EmWUGsImmf4EPQaGzwPb2VcyVybP3YF0CytixvQN5glOmeOOgnX4Uu/RuTx11sddLoDLq6LSiAmvv7rPhPlrB7GYyxbNr3UtxlLcGCNbyx6cuosIqC4HiW/wucjSjwAN2c2Se89OC5lkWbc90FtoA6kMz4RTMyooIRDaKpXogtgmCKafbX1V8viHHRifApW3H2DodsMCjD+6fBdLqimakNcik5aPWmjezt20KOEC0K15eMYj2T1QOlqt1mDu/8E6bqhoWNuKDWbb6b2GcCn/fzStpY9fw== 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=v6/6SA3UzUd8mDge26qHMbZLmU4ZvCG7YtSqHMmSyQo=; b=VWpVD9AqiuZmiUc3IT7qk8A7Y1NQyRfFzE1EscY+e+LXxi1Y6zo25VljJD0DiZFePJNT2Cd62phDDuIJGxLs0h7sSwD7oCT4EbNGHf5W8FeBzIQqPXoSE8dzo5zMNfXl5cgYHEFoaGEyVP9EQIfxPb5xDtJiQi9YehSjXBEAs+yzshS8HqS6X9k3rhD8XClMAa12Stg0AXZ7m31kfYE5FGg9CmdWlmHS2dt4+Gme5VvYIOF4MMeqdJiWe6hVNCA/VTSjuJmb+qPRmAo8upU3cCcaSO/NAJ2m+ZeLeOHYNTxdxf2wgy+T2GqcReUSSnqC/NfleXi1qM/uoWTj8Zt1Iw== 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=v6/6SA3UzUd8mDge26qHMbZLmU4ZvCG7YtSqHMmSyQo=; b=UBwwdEA9oyZ2XA7LuLkbBdHu5cApT/8Pe8juCq4Bzcl1QVkSuS2t56p+/rMoEVcL4XcmChD8rBLwusXgnLCxs7GS4SnUqG7bRxtIZqaL7DpNlwABI2RFIqHiaAS1MNTcu00j5ZaVtkRNOuGD11g5G8nd5iK/lmgOCPdUrhc1Nx8= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:40 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:40 +0000 Message-ID: <87h6o0qnho.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 25/54] ASoC: generic: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:40 +0000 X-ClientProxiedBy: TYCPR01CA0015.jpnprd01.prod.outlook.com (2603:1096:405::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 15a0ea1c-f083-4c03-2a36-08dbb321c3e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PN1Hsb7LJ2gyfplKJvalU+FQdCV65rVUNEgQTHQTIGlI60dYT4OLr0KkQT3sg23QSHNqnte4EhjgCKkPS4ahRhKaXtDCfW9RBs/DNHesYtCi7xKgHHW5M0cVUUHIgh1oKTOsQbu12SxBq9+XSm4r90nrJKAqSmKvy9w4aNCOvUI/i+egZ1BYApKNXqqe+ylZHhYfulF0JILRhyZ5JoM5gH4MR8Kdw0kRyutDYrani07jU9/PYJDGtVJAKkr2pCuf6dE04vENVkaGO08pawZE/pm3ODOZkQMuYCV40fYN7lZwF4qY+1xTgDYTtFQRuJkF5AYD7rmUOOyPdr6e9acltW6gqHoDgTKVMjsjOWZgjbGdawfgxdo23RyiJ+WOnsVyTE2btYGc4wOf9QIMbSgZ7B7bQHkYkHLsaXG9VmyYUqajijfYtDpD+lD2ElxWhCT+ZB6Urc46Vh3u9UCY4BRi+QOKmoy9An88A7PSTPW+ifFU5BKIHKU9K50Mn19YETffoHnWaY6/7PTailxt0kxW/6C7gSwXOsTFzDqNU3L4erde7JkyVt3C5Bt+CfKvloNPr49Jx+xHPVVcm6ZaRTq6bjDjINNjxq/Scb6n+3rZda522QYhHtjgdLPc533WdAUL2wp08Fo5QqoP8qjx/Twf700s6epfYKKmVdbOBSKP+aI= 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(30864003)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(41533002)(21314003)(579004)(559001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QPZwDJYop1fJvuNz2UkCMp+tw4aCLksAwFayl2//BG+QctWlNVn0EgsbhZFy7Md1mG2DWAvhlm5gT2r3GM3/tUHK0AFKUUjCIIWffrwJXwiAzJM0dh18QoacBQEr+lAoQs+NPRMbin1hfG6kvEKXfImRCc7BdtbDPEcjUlmPIVWK1Hx2buZXkKZ34kZ3WtYqxxZW+2aRMy+x/mCc09VtgxI5f3KTV9sqD3pRwWh3OdV9AQjAko76l+qL3yRLqMhmwZpY2SExs/XgNVFwA3nmnDAUov44cccA9PiDkKzFXifmvGccbjn1jJ1PtLQ8osdXmOk3Obwv2cHK9HBnGXtMOVeROZO0VMBcmakh5clrJ7af3BCir4unc+mFLPzQT/fc7u/oRsUdEMZPUVjToWDQUAKGGr9c1RqzNEhD+cYV7mz7eLebQaUJXQKO3rlRShWI5K/bR8T40Itrn+vcga/dq669We/FXM1s9FgOKz45uZ/8ExlKyXiNnkZ+Im7+XJXb+AYGZPYT3x108WaodIBA1U7QKyOsnh6cfzFQYR/S+HUR5MDeFksuQCCUDv1h08XfY+D8OIExMbhyePcQ7XSdnI7r2+jdsJx+A2VcPMSX6GtPjlzDbMUk82zg/up/Yye3lKB8JvIgmJoVHqBemAAG67GmEfmr6Nsmnoz5+piyoJGN4cnt4ZT+AokHZjElnmvNe1knUgNIZNigY3KZQ06e8l9MFSkLCK5+wOLApkkxhs1FjBAQipmMjJXws5QCBnrQRCdn2p4cI0lTz1wbsRQCcmNt8UgZHFrx2q907/ufnOm3EvHI98lIuSw7evDCgSDjstnmYcKKHPLd4U0t0h4jdu7IySF5fZsUPKGzHGb5XBE2bUWOGW0oAOYYAeYqVeMIC3gNIZwG64JAt2WLAzkuY02WyZg2J1K4QKwXUlknZz/dqz6Hi6MT6Eoge/RhDBMaXVvxaag2DbbeQ9u2oElBjq8RZdwhmRYTW8lM5vHm8paQvwa6owTodkIcLwpts8iF7yrYXbXybhFMbHTBXMYqFGULSqGwUUQ+T/fUa6sYYksLu4UOdMaPxalrSQ4xeokf4uBJI3+ITx6I4+OQuInMhFlTroKlTGMJeU4EGNw3+h5OzX3D8HUHIedqS8UOe7rCjVkdv2cGj2uK+RIzLRQWSspKISqyTnNIwHXRA6+eUGPFgRi6ITJze3IvB35eh9j5EYN9zNKJXquzkk9ISwuOt8XafLXZ0eBUZ13MiGSl+yN1jq99uSSvZDjODXSIeYu3fkYbMCYDm3E4Nfs8lcRaMzfQl3H14QHyOfRwWA1zH6HJ5TbVcsctlTNwCnn8kF/oLwixp1oyQAAWIaP7beh92Xy0eEoPCuZeZQmCzodotUCnXNfMKCzwggywZItUnc8TS7wzW+PPsw0T731UeOsb9brH+ut8nFgtCD7ei8FFWqScKGUM3zP8WcKLl1ErzmjqLZ8MD1BIhzk7XN8Y907I+QGjeQ4d6U2lftOf6ANSf07+IgAVMpPZ4yy/DFFbtyR/7zHpb5UtJxYVfYKl6JgX18TUyBurlqOCGAC+5+KDkgaOPdiLpLwOXr7LHCopiFctlqh/7aIPtZKpMGjw1M+oVIf9N7Yiar3ZYZrKStBDFyA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15a0ea1c-f083-4c03-2a36-08dbb321c3e4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:40.6228 (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: +EsZFtowYNsImSMAsFArIAhxSc0n+9kg3pZjcJ6Lfz0To50S7SlXPR8usVQqfEmHMcFuTwJ0G9zE8aq64av5JHFyEH2hrNA5e8xTFJKVl5lwzcLrd1XxuKlWrdacDCYw X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: 7WLLOAYDCNXGRB3Y2AXVPA7NQHRWUYZ7 X-Message-ID-Hash: 7WLLOAYDCNXGRB3Y2AXVPA7NQHRWUYZ7 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 844a2ef15948c..e4a9420bba85f 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 a3142be9323ee..4dc65e249ecbe 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 b1c675c6b6db6..5d856942bcaee 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 ecbd26dd7dfa1..36ce3a4343f95 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 190f11366e84e..a88812ab3ed17 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 e10e5bf284323..8c3eb4424efc7 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 Mon Sep 11 23:49: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: 13380401 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 C4840CA0EC3 for ; Mon, 11 Sep 2023 23:55:22 +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 E2CAB83A; Tue, 12 Sep 2023 01:54:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E2CAB83A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476521; bh=6mTawd148wL+MZUUzaNQA9Q2KErOZsFaPWotmwOfbg8=; 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=ubiyugOi6vrNX2JTRvoYYlQyG6ZGFkQAAJf9EeRQaC8x/vTdJDxblmOwEneC36PY8 9qlNKMB+NRdpUy0nXVcNIhxdvNXdIMym/a3q4lApK4LO3omGBz9xcQiQirpacuqFda UIecN9rwAqIt4cq86Vk47CgiTL1TOQmixDV1ZRD0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1E210F80681; Tue, 12 Sep 2023 01:51: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 58358F8067C; Tue, 12 Sep 2023 01:51:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DFF4CF80677; Tue, 12 Sep 2023 01:51:04 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72f]) (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 9BEB9F80580 for ; Tue, 12 Sep 2023 01:49:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9BEB9F80580 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=f5nnMEKy ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A1auif1ljX07BJrpcMEn4G87JJ954ODS9AojHOe56lZeu6M1QIIPs1eWr/huUimfw/su6MeO5TEbWdC3Hh05YGniJQOqzCHvtFLKgDF2cHo8jHaMOK3UrII4d1fKl1LXt7Ny4FWBi9mYDEqQmqhTTkaSmOcWggTdvBNnxPpQ6ZGIYn7FGiHZ18DGWG6snPKKLckJJhsCQreNSeL2y/fau8gpmX88iuKQd+oRz1ImJqLqGOUpprPQqchEYx6QiXd83F9hMB+YokqEwjcLFvzYKpHiKg7/Gj6EiGxEY8jiahqgQEa6JazWqLatBA5U263+NpSO7HnbPALvRc1pHpwfvw== 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=+WVGUxs3LvrOyxHrXlbWo2JmEIU01yWTmbpuhuB75z4=; b=OpUQQ3r3LzldtQLAZlj5cYB4wsFkbrI50/bywp5nMphfpGtMntsIbqZFmpOyz8MNC0j/idE0YU4LwVj1eNbEnq8Gm763yWVlCdcHt2meSNgJvOrqkwOKxOUryRDyVTiOtZtr64iPjVF01oDKBgVaYHT8mi5l/RsQrVHXvYak1mdTu97HZow0bJ1cIDQTMJss2/S/c0nZYNNfYCXoeaSgCkb2T7njgOsb5sAR9RRc4i2XFsZauPz2NlBjNnDu07FpLc8Afmb/O/MBrirG4YK1TtJJB4XfXK/5frGkjMUY44/L0lwACex80jJhH229avuBZ3A8AAej5PMNByj3ooUNDw== 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=+WVGUxs3LvrOyxHrXlbWo2JmEIU01yWTmbpuhuB75z4=; b=f5nnMEKytFztpUDTeC2zUNkZH43hLAn2ZsTAnXtWQ/LeBxaawk8OSiE1vo9XeLJaSRizLBT3YFypoHxVIV1bjwoUluc6h3o+gQ2bsKq0HUwsWIAj/+sHkGzii9OHZLPv5Rvjcb81dbfjs+hWoNubrtZ0GG+Ka2WPuxltoM8kcP4= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:46 +0000 Message-ID: <87fs3kqnhi.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, linux-actions@lists.infradead.org Subject: [PATCH 26/54] ASoC: samsung: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:45 +0000 X-ClientProxiedBy: TYCPR01CA0077.jpnprd01.prod.outlook.com (2603:1096:405:3::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 190af920-9961-4073-8fae-08dbb321c71a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WHEBxMTxSQkyrU5K36b50NKWUSSpIyXSOUc18I4X28P6r+t5V1c4YeEJ9MjkVGlV+AhIkRnDrzi48IZNXWivR9KxOisvT7HKyKa7ihcCBwlCiBdWpwE6IjXbIOSx2reE4pIHOJWhidlobVmg+Z+ZSRcPZKY2wzGhHZzni7fHXgbFb2yU2iGCp03d3CFLJbgqkfLRkYds+q6lqi2upb1BeibFu7G/vSgmTqTucBy9YewuJUe2qvpvBDbF4Cfcwd9zJAr8LID80MFoZRkiyduUgsxTlkwmza2m1DFdxpwK3kYx88iEQg2POIsg+QesN/8FJIiTa+TrgcpwU7o6tmUKAfGJb1ZCnb2xLQ+85RpkZZGLjxl63f1G4G7F69pjwNeRu5ioZFa8fzwHO+FTERxMr0ccDeIyUrsclYIajBJhNrwE/cSF86YvsGiB7gpY2OGYI3dkAT4UWdcYCteD/0ZRZHxyxNh3WpVZPI+mN0QzoEgsnzyZP5GFd7NAOm7WbuuBFQBc6p3Slux1WA/QcDc0uMG7SQAOVpA/32Spsa8jWLd0v2kb5jm5w/vyRD9E0NLn31Ed/aBPus7lpFZg7nWGks1PRvNyfyFnkQmG8DeWk6SKjWTR4+6Gd3tTxue1pHw0bU/J21F0CK4XKM287GlB3A== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(30864003)(2616005)(26005)(2906002)(7416002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F0BquBKsKMhTjRRCUBfcs3LYVatOrfbL0pwvcQnQR+fCDuhVMTqBeluzlVElJvkZ9US7a9MbRyXyJMpQK00moMkNX6U/gUB4tMVOQhhoIzCv5JtD8y4BQIlj2Ko1Miw5mLYNEXzgQAHfuiEANxRM8qU2mhMNFNgqSSorRphJ16bgab0oO9DYeHBKOsfFJT8zdmkXo78+8IDszVpCY45XUtiAXl9kWR2cYFKSrb5FOOiiH/k+xH83gjNywO4rpEB9SicC4dQj7SibAdfKmhvHi27hg8KdSYa3Td5S1Wpf1LySKOHdFv80X/W46FJBiqNyh/qM79QXsudQ+7qqv0eESbvU5vDXqadMp604SDHuEm46+07uDTjHs5++8g8y+9HIMGM99JLvFqG5bB0y9nkxQi6L391WFq5p9jj7Vfm5Bo8aW7mPSTVqf9I3wgzI8zWRi7D/Tm67vxEQOSj7StvvLRspn9f7UvQj6HHj2vNHAvwNxQJE+D1iYkAKVW1tFi45hJPeAA9hpZyGA3K3+rzYOCLfrtdoohcFy+GgpsLQvsCQwcuX8DQg9D1KB6KafAjA6yzuuJAg+nssSDlFQtnCQCO46BzVs5ReKuqQTScqiNoiMjHLE4K9DQrEeGcsuxZZ0lsYEf8resGERtAB8JUmuomtDZIKx5NsB6/IYZtlA5fC5a5XVjp8MF972VVYCz8cP/UmaR2PPPF15l4A1bLkAZFpBxLHQo/v18lvEOYAWYrEBuexs3RLUvsGwvfvC/NY3FkIDQhGqATo76RPahY6nX0i/3DMHr1noVJuKojl4aANHksaX5Hy+fnn3IHbZLLmzIs/T9n4Q/v27AKNlpHTOtMMjvYh3x2+CFTDY7zm1uk1SnSDykx82tVruBS8ve/ddzMZjZ9Qt/pG1r+vVaSFg+n5C05CNrfpYaW8X4BDXHNzGLNRAwex6CHC0sFYeWZ3u06C8z/RZxmzVAAVAsGlw+YVeSufvn1FgKRCgUEaz7JDDe/jp5l3JRdRlpvp1BwK5q810VgN//AhAsQ/3I63sCYrXTunUnpe/S4TdNbDZZPT5DCpTs+U8Q/9tyHXnQt42WCrcUc13qbD/XSfAdpEteLRCdcrl8RLlLpFPxFbaazgFcxXWrj6uY8il92effcQGv1pTKYGH+JPFNqK5j///XtGTGgJfaC4eLxwbuMuKoT7G+e6V8XUa4iG4zB7/79+yR2cvlD3kU7NWWTK/qz6kAwKYYJZ+W4oUWudU5uYyxESOFCeBftqvYvO5xxQ0yKNc0e7BMlOwvsXfcJ/mBbfCPx9jmJNuWfngR3lR5n6otHbpqMs4NzqIPSM8BrePvNNb6Ew5pxHx4CsX8lugH4jLJrUk9vkn60Y5DvEuWX/udB3Q69zFs+dRFd0pqCH+uRtgIVnjbov9xzwVAQ9ZrQe9xfzsOQEhqRuvEgG/5WItCMKuRnmrKqElMhAQCTXzD4bdHJuq8Vr3/gqe3qfe5n8Bs5XBDH3LlZrrgujP/6r32prOsDOdgIfZZ8ib5QfV72eL/vCxTCWnCPoHX+5acW32RLU4HLYDEvzY2kR9X1vueneLwLuEF1mdfy9hpEE8mhKl6YmmEDJm0y0YIbeUq83bWaAtMA1GBFe8E674fMQBaI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 190af920-9961-4073-8fae-08dbb321c71a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:46.0155 (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: 6D2/PKRyUj5l2k9AeHGL0xELUcB3qfEoYLkrCosBZmXKmdyxUDHV5G8ukCC4PHU8ArNYRM/yseaIR2ejc0bgj1t36vByynGVlk5JHdhXP7Opb6cDguhw6VPxVzaAV8H7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: GF57FUDMTSHXGJWNOWSQRG7D46WMMGBR X-Message-ID-Hash: GF57FUDMTSHXGJWNOWSQRG7D46WMMGBR 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 dd3cd2c9644a0..fa7dd04fe94e2 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 fdff83e72d29a..80a57bff1d029 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 70b63d4faa993..365b1aca4855c 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 3af48c9b5ab7b..0d61055ddc590 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 fafadcef234e4..c5260e101c2a1 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 a79df871ea135..702cb4cc1ce9f 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 2ec7e16ddfa21..bc4214530e950 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 c93cb5a864269..c59273e2da2af 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 d2cdc5c8e05bd..573b2dee7f07c 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 6f3eeb7bc834b..2474eb619882b 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 821ad1eb1b79f..13fb1bd7f4c9b 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 d77dc54cae9c8..5802f92ab8ba6 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 334080e631af0..7de6acb95701e 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 28dc1bbfc8e77..f44e3180e8d3d 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 22e2ad63d64da..43519572dc698 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 5ebf17f3de1e1..2417b91a328f0 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 9287a1d0eef10..2bdd81bf821a5 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 Mon Sep 11 23:49: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: 13380403 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 0EF94CA0EC6 for ; Mon, 11 Sep 2023 23:56: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 42F5EE99; Tue, 12 Sep 2023 01:55:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 42F5EE99 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476558; bh=rlVNM4S1S9KspnG6ekuImLazDZ5YudcCqagD9/g52fI=; 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=B4A+S/vMkY2wA6xBOeZEbdJsYOlnjFeVTmdH2POg0pzHkk50+Q2lV6H3fimLHjiSN cvQzRlz36bpntGoxJ+SHzijwTz8vxP8aQBjPgTHqVCf5PRgpgOqH+rj+SqTiwHnrx/ sQ9pHvr2XDj1uscAocbA56CO7wPZxPJSrVU0mkvY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 39223F805FE; Tue, 12 Sep 2023 01:51:25 +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 00D13F805F7; Tue, 12 Sep 2023 01:51:25 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2F354F80604; Tue, 12 Sep 2023 01:51:20 +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 5EB11F805BB for ; Tue, 12 Sep 2023 01:49:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5EB11F805BB 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=Oanlx031 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lr28muEwtqeRVHHSQEhJKHxwE0RID4JhtKsd4sZ6X333QaWu31in6IRQFGFT01GcFraYvmw0nMGYXbcq66n/+4F6iTv+DuAZpTcFq5dPs1iZLIDbPPbKt4InxD46d4DkuV6QTqL0Ov7/LAQITTBNlcLG61ZvjiQYVN5jvq1GaeJuBto4WfvmpRgTFN0VuDi/CBegOmT159VNXTUClCYUgoc3GPjYFVCP3ccs44QtrN4mnCQNLFm9kHv3VnjfWFGLtGJ1iqL0z7+K2V5ME8XAD9uuFmhbsCWZn8N+4JDqosYxdEKgS7DZO4BvOp429n7WqIP4y03R4Vuf1DHAUn+7tQ== 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=tW+hvFb58zbixciwApBYlqcqkrjTYHR3OTcWnrarnD8=; b=C27V+e1vwH/D49gUyrkBzHp4n8nWSKF0EIv8GoG3HzPT4lfeEx9/cTsc9d8dWnEoLQCA4KCVlP7U4wyM2yI/NDjVS+5esw4RXD/DTRKRsTFNnS60qARGYfCLd18fEJaORAnI2DnBLfiDZWEIAS/EgNOLc1H7+mQtaVd2tQcSIpcSjQO6EtuWL5FveSEs/eu+S63g8vmGnIVMeUPcbP7M/lMwIeyOKRZLPwi53xZGJWPCNGpY8QSZbvy5WTDbKXMdbuBRQ3Jy5kqgC6Z07Wo32KwT0Na30/gcbc8tZfosTnIovlgUZEXiZ1Yrkpg650AqzjvBU2gJ0eeZnMT9ReL4mA== 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=tW+hvFb58zbixciwApBYlqcqkrjTYHR3OTcWnrarnD8=; b=Oanlx031SAVv74HrkxxJZuYP+OhaZueqPftTp0u1TYau4dfnxVx/QtFhsWq2d8LmkvVT9m0ZIx/nr/KCB4BnWySnk7VfbfPa4pR/mHCQ18En3xUgah6zrnhL8pelILxizbc2NtnO8DZE+8+azad/bNrPas0HEsRsvGeEu+zS4YI= 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 OSRPR01MB11567.jpnprd01.prod.outlook.com (2603:1096:604:22d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 23:49:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:51 +0000 Message-ID: <87edj4qnhd.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 27/54] ASoC: extensa: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:51 +0000 X-ClientProxiedBy: TYCP286CA0155.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|OSRPR01MB11567:EE_ X-MS-Office365-Filtering-Correlation-Id: 2eb3597d-22ef-47d8-6b20-08dbb321ca66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: suZFrmCQr+WTtsORaD8MH0CAsch5VUyGNvd3HTpY9DQ3yOYmxxDkuE9K0mtCGqR9RnhdT67nGOBs9CiIKTwDyxRr7LWI83JA5IsYQqqF/FHfyV5dqT922EcQ2uirR+0wgk5Fm91T4y3sTU2HoBs1Qln2+U/Xo66dmZSC+Crm1nGXzGytaP03PmK4IUWYkZGcI3PAvNvx4rkkgprnrt2tRdKDM/3AwgGdTWCM7/AfydTb+U9/lfvgVOYUJ8uo1jMdFVHAq4Ug7Svr354crZAoV5cqO19eofq59FHz5sMOmQrNjhO7SI003wAk+bmdBVU+AVBZF7JXqWQIIDznh/RNLS0O/zbJbS1crYeS06KBeTxCT7ButOnA7raLqneLAk28O2V/Gybt/TiUKMPWNOos4UOPPlLd0nvnAYOWbcjsbw0TVFAbx7E76OXVl1k+Z9EYLgOI409DTW0RmNnQDYczh4xh8sgxcRZYk1XmG3rWNpZtAX1yX3Ov11gvF/9Pc13b3O6+ji/U3RlUNuSoS1Nw/ZILI7IBWv/2UFMbmdkkEK+kO2vyY43fKO3DmCI4JaxFOCp6Ydjhh4b4m2MbJOgBvCXjR36WncDK+5nTTb86INjkfTpLLNal5WI6rf1tPCML80G+3RHmbWL3f6UPwqU2Kg== 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)(346002)(396003)(376002)(136003)(186009)(1800799009)(451199024)(6506007)(52116002)(6486002)(6512007)(478600001)(83380400001)(2616005)(26005)(2906002)(66556008)(66946007)(66476007)(41300700001)(110136005)(5660300002)(8676002)(4326008)(8936002)(86362001)(36756003)(38100700002)(38350700002)(316002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vT0rAUABcw9g6Vhlvm7kTOMWBzO7+G4BAqxuExvT9e/zbChRLPXItp5GY7tSECwJtq07lqjF39eGiHh8I+CF/zMDeoWRwNdpBkmNaxZkjmUDneyMjOtxtMI5WBwTa5216qml1pf+8XQfdCXWp3pZJu4znL1eyveQ4yZhApMxbXsbsQqaE+OjN3m0j4g22Sbv1whQuWwGyYUVlxHPUEXQuj77smBJ3eRkp1JUfOglGm92+qInSRnKoPbbZdhscnC3gMSJKcpiUUuE8HTcSeUl1y5Fn9ZaNTOzx5BrZ6GInpazEuehFeaf68lnqo8QxcwhkY9/udKfE9+DEL7K8yacUqsRhDosAZghqvBUaPtQHPf3vPvHqc1QPj5yNIYx6N/uHsY29KqjpanPfQUtiTbR7OzROrFpP6w4GmR0bAVT2qFRwOaRrD2WEBibrynpve/nXkYvwmnhWxY9DXnaVac353BKu66Qo/nrf/IVr1eN34L+jKw3CSK8JWJmUFLv4vZ7zGrZJaRuynyK9MXQ9G1GpJew3+4zkSrUypCT3BOoGTWgd8PIlEeSOpQAZY9Qy5p8ia8OZaDdJI5wcthDVOdPy/qdGlPDaqGXo/lGbLkJvkWu5PMjorbQk6HQ5ciz6aAkEegxdQGoJdhZ/UmKX6xJQK8L3wK33ojb4l/x7/G2wzMOF2SLtzJZ5/l+7ZEAnM9ZXMTDGduTp4fpgu80nF/a9Q9B3d5kAxcBAcJMcIeIeeNJrQtqcZGn0NIydJMu5it7SvDEfk8X2LGzxBoupLeMabhQxPTDlfKVF+PG2c4DSMdCBoi95NbWozO5vW3724EfZApHlVK6RM67xSj9NlzExSYuJX1hZNyoOj3TKBjsc47RGu9FMx0118cT45oyRNeEtpRzzYVV8Hggy399QSN+v+MpfKylbGWbasbnvU7Z6ni7Vl/T3rjdVzKYxIQfnXiaTcYhWMxhernDm8MxyG9ERXOO56MCGDKwE/GFOAyo3LFM4AW4jaDuArP5SwCeCl6NPTmNmqDbmroc93zeeeid4oFh3/h2Y+EvfMEnIeUPWV4jHzfZLdIPki78lC37r8E1S9b9utD4Lr+GY+f1H/fYvy/v0UOEzX0d2FYU3XVLqh6dAOH5I8+woQdBmBJEBJI/mZIPLiMKPDDQYOy59U1nlNQ4dZoDeaC0FNijm7iQfFVnBBiwZjAUlqbS0LlYBWWTpQUG15Tqosf40PwG4Rqg9P0Vb39KvGs896pg37Xsg/vOjTTckmOpZ7yqukF/TWVsLnwBjbzWuN0Ob4jT7ZXvhT+QyVic00Xj2i1PNNlktOl/9jfN5peRJ+09yuIxGkcGCAkixSIpboJ00Y9Up5P7vRSLgItoNNLuS98tXliM5PG9Gk4u7Zyo4xnqOGmEHYCsQ+G8If/keRTMOh7dPykZY0cQQoJ4DBveeThqSoMJ1NsFTy/sWH/O/sd9UJCmEbwpEOvwFHm7DcOedZAk6J3HAphsRloZipPkKkabBpHcKSuG7MSXaBRxgbanm1lqehaUh+ubMfNLQHHpfsleHJCHTkqRbVaPhypZEkZOaEYPY0XVwQ4ou/Ez5KV1stVygz+8n/TNe9kqOHKvEauby8s4IToB8HKhZT3QfF98BD7noOg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2eb3597d-22ef-47d8-6b20-08dbb321ca66 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:51.5055 (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: 9Kq2Adw4lPqdVMOBRDrMLirXjEl9mWel3xv6c5J+7mO8OngYMdCfpZG6WM2J4T8ei/5LZKo4zWLJsAG8IHNdG1ths70c+a9SMcP7BFUjyQnXxdc8vBV8W1vfcDOGuZRw X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11567 Message-ID-Hash: PUCLFRZ5AX6W72BE7K3QGTEAG5OW24DH X-Message-ID-Hash: PUCLFRZ5AX6W72BE7K3QGTEAG5OW24DH 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 287407714af49..6e2b72d7a65d3 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 Mon Sep 11 23:49:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380405 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 D5B1ECA0EC3 for ; Mon, 11 Sep 2023 23:56: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 4142893A; Tue, 12 Sep 2023 01:55:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4142893A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476595; bh=C7DLzJaF6OjjVwyXxCmGPriWwfmOGW8BDwL4mFESZ9E=; 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=BZtkobvVXfneGZcFFxICWQ4TOzb/ttUlLE44NgkyLc0siXFSofjGhlNqx89IMtI9A gdNpLdv2HqD40kSZ9Vk1h8oGd44vuXc7kdpTw7HcXBV5XrS2RluYznTmPanoVdSBIY xLcXjg9egeD11B/qgxqEPcL4GO4ebZsfmqMWDH5c= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 021EDF805FF; Tue, 12 Sep 2023 01:51: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 04D33F8069E; Tue, 12 Sep 2023 01:51:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 39899F805A8; Tue, 12 Sep 2023 01:51:22 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 626A9F800AA for ; Tue, 12 Sep 2023 01:50:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 626A9F800AA 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=VH4CwDyw ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SPAZu2eRqXfQQwaY6JT45qOrzo5QRg+oGv3Mlso8+ApR0eDOpiXx0LDoxEt2EJrJ/6L+nrGjPvlzP63GL+sLTEptJy+WHsyBPwkW0+WH4XeoiMi7a6ubHI/YcC9Hk2AKS3J8wR6cbVs2pz8nKz4t6b6YB1g3jXFmG52p5zL7MPC9zNXFS24aCWcOCXNwrQwtmLo+3x0/GzKUNoMF9S1LmfsKD4bBfbSJcEYsGkqnM0M5hn3WN0DsNUHjDjv9hVJs/lgz8UY5dz1DiAyNqu9rOUFzrhcm0ksT5W9+l9DW3RE5oJ4JS3iKS8jmv5gDm5iSxMPRFDmAgtx/8B2ujiFx+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=xjcCBgDI5KxbYrusvQpP+x6YtxuuNJyXcAoMW9jiCfE=; b=AD48T8rY9R3IAF67jt/5+jNw5yvBkrpymLark7Os//eLm9AAKL05M0lvhr63y/puv+DQTN22h95dVcqCo+529+zgOG4vK3Zrem1QNZpBXo3BP9pA1OCv41HGHQnk82Whgm+df4izho/riRiIwEd8DKDoYESIMy6xk8GyJcUJPjOupbErpRPKxhaROt1ORbqq55eXhSYhIwyU9tjeE6aBrpHo69LsD5gU9etxDmfdpGDUWAp495OvrEnWbYmgABGVfZlGXazTlRPx71TEqfp2Zwa8dUxIkzIsd1Vz/DVWD3rM0DuBl2sHcysOQ0SWH1FjovRF/57fkGw52One0adUog== 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=xjcCBgDI5KxbYrusvQpP+x6YtxuuNJyXcAoMW9jiCfE=; b=VH4CwDyw3qE1JrM/gAyueQHkC0/XkOitJQi2v4zlsowr7LCVvzbH0gcSuCTeRht4xiE6QcADcN1nbHviE/UT57jF1LBNrbSKjz4Zm18NZ6Iz34uTnSdxJNngnmd0RxCkWMMuRXceAlGJSUn5kqzE/n13T+4UuIuhEKFOctId8YM= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:49:56 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:49:56 +0000 Message-ID: <87cyyoqnh8.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 28/54] ASoC: kirkwood: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:49:56 +0000 X-ClientProxiedBy: TYCP286CA0260.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 53cf226c-246f-4dd5-5d4e-08dbb321cd68 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WEyEd+NpYDNNtGQ1UdIrLX0+iPo7QlNccs8EW+N94VsI1rUanOmXcspdIgj9pAmT+z1iHhRl3w6p/vUridYlg2FMm40fq2dgPQGWNadqnaWdCdQ+zGrnlI/3/cx2OagmvZdsIT3IPiWSySCv9p9xh6vgdvMdQxPRCCqkFBw5YdFQdhVLZbF5cparXDrNisQFIWvJSDxDtAX7Q2nEckwSU1XW+2jTmjc81p078dyAD/97E8Rr/hWLZj6VL49ifgRbxSplrUUKK6yyi1Fo95AAIy24PeCQAGamD47DLl2G59ggf3h0Ak/bUhM4cKX5gQs+Y3d2lX9iTToI7yhivgUhE7r3Ehs89IErvgIz5FYZkISqOklwEFzu3D9PowaI7ekpz8hQvF1azrySutskU2gi8N+azkyAQZrX4z5XgRpvg5tu0udwp3AeviDtBlUoRTfkJik0mvoDgN3f7VwBW+cWXIhzzW77pnxaniTTXp0hgnYY+DGn9RivGh75MQG8VnCBgQ5BhdnbkqkOHv722gLfV7vm9+7WY2grfuS2b6VwzHGpQHHx+Mh7OkZL5uk8B/qLYQgpX072ce8G1oBpqSBgrWCjwOIotli84aoUmvb8vkZZ1v33OFjvHmu+45kbG8NEmShJ81kzj0j6SIuZWLkZrQ== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dM5Kl4LKFe67g8kRiJM4QsroWC2RF1ojp7nxhJNngWvvAaklI+vtdnUjcJpVpnn3DNlX6nf1LT88vUTgHVv09pMuCbmkE6ZadtE8fcGBrqg2h2nUEB+aRi4AtImCIir12XynBDmwO5ICMA8M1SNJ3MiZ4VKfD+hrI8Pm6nz8hUPuYrqLSSaRHji6+kcQOt95aCcaUUlLNrpiyZI4lYg9Z+gxLWjWnSiOYdpU4ruZPR2dhDxvNy/T2ONABMpFF75SuzTf2ZxxoFDKPVX4ObnNTn0bH9KD8ApQ/kM99G8MuXgkFsv83Sp2rH6iFfDX+SF1/T/GYUVq6yu4fzR7J5BWZmFU6E5hyQodUmQOUpVPk5nEf3gk6ENSoIUtotWB+MG5kODjvQOZYYLmPLgnR20+fjprzxTJnVRg/ZhmKVAlXq+bBdfyQmSFW6eH4Jsa7fcpf+5/nCsD1hzR3OrimAleB/ltcKXhC2mAruGAk3B8sK6KYS+o3wUBv/BL2O1x7tZgWmaD4HuuBMEVNfWnmaWaiajRTAdSxlo/X25Jh/sumwhBIcdLHhCLaqR/yuSj//PvJE/Wfn14Do/toTGfyN7yQ2W4Y14yHAVfqzHN2QfkiomoQAwWt6G01/90DFaY7bhF4S1budIyhcs8qoBV4LFD+cZdzMKiHtuVmEp4/pjVLO6sOBUXmnq3l33GtPuSsiMICz81jEHEcIs7OOUnlZ+sfev2VUVmOZI+YdolNRVm8aSBggzfTwA4Vakju8y9CP2ORmz0J9kmLlElM0N+fr4rwNvhgElT4ObVrOvAup8vlHlXGoBzGMHu0O+LV1LD+MoVsYh6biU0+uZspBGdLizUub4XnGOGUGVXdMHFBpdh4NCmosqxTkwyNV91h3tfsBVU4ZNihPYS8kLMdytzyWX/A06Tee7S+cmx5CUy6zN/7KhA9c/tk7fsA5lhOf07e0MrJZHGyQmudSyVkjj5kB3Yf1Z2DJ5jLbMs8UvxXShy9rGqqBzfymJaLog+Z0sIS6At/6XNBMJDN/uZab4hbNbSHWkzdoNx28fcg+C/SWWpi3m+nyXH3DTt0bQJwLAO+CWBapXWl4pgvw/dCf6tmrdjmhLhQHntig7uAULD+lMThE/p5ax3IXhdCE1YjyINfmhZrgwc7bmFBXxywiXwDhv+vWUQgBSratP3K9gCIz6vG8/uG/sa+aKhVXsEeuevPVTAwZ+PX9Xsqr4zqZL+Ud6vKpbEAcBnCly+z2ZJe2/ViSuvMcSkjjUqzH2E0hh1Je3skeozHunlsAhPS7lhYjwL1bU7imyNEWaQMcQhdpHxTOZ/WHrIlraef1+wO0l11nahZ5VroIIIB8hM0YyoJ7eCTrxNtWuTkjZiqP7aJB085ubjx+9pm0/+xu5bS61UH5mqEzaRp5TqDG2bzYlZmGc9ykOsVdIAu4w/QVfMl2P2nIMb59xo+5czBKdleOwlXojJGTT0ogBtjnPBmTq1IcwDjyPXp4okfPqw1gsIZxkMjxytugkdT4WHlEL859xP46hmPs3tjxw9au29W+WF3g4RCS1s6MP9VuflE3MC6xyMOn5U+HPtwcpr1qTcz2LPV6gMf7p4Wke0hgkHrg7yadFLVpSUJv7eWq9wwr2w6cndp/k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53cf226c-246f-4dd5-5d4e-08dbb321cd68 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:49:56.5295 (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: 7WLBX0g2PIqh95bq3J6QsKdfvCYH0vK4KqseBWShni0T3CrgP3d+ycmVPMbWrq/6QhHFu1IJXD9Nleki+wNtviFqHbbnrPoez0LXT3+HcZdN5wqJmlPQ0l4XYi5dieuW X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: 6JZ3NDDGIFZML7C53AESHZ2ECKSBYIP7 X-Message-ID-Hash: 6JZ3NDDGIFZML7C53AESHZ2ECKSBYIP7 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 81326426da33b..79ee7599f06a9 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 640cebd2983e2..dd2f806526c10 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 Mon Sep 11 23:50:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380404 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 3D29FCA0EC3 for ; Mon, 11 Sep 2023 23:56: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 5FE35EA5; Tue, 12 Sep 2023 01:55:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5FE35EA5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476564; bh=xY2Pfr+NFHw/NUDfaqt9qKDL+Wpasw6vimEJ+Vtc6n4=; 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=QlXbBZpojrFguLcDQZKJiEfZLMoV2HL/BJDrvNTBtN5+gc/ERMdELtdHG5LfVYuuh YPxzg5+w8lCCmdQrljv8DFal5tGoJktkog8miuwbwL3US492uWL7VaBlMVjgMRZby5 33xC1Su4/+vsLzDeGzLXNGoSbuRMCxMUz00tANvM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 46C47F80696; Tue, 12 Sep 2023 01:51: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 584A2F805F9; Tue, 12 Sep 2023 01:51:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 13C08F805A8; Tue, 12 Sep 2023 01:51:21 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 20C56F80579 for ; Tue, 12 Sep 2023 01:50:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 20C56F80579 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=kOEKqCXC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L5jxD1BKrZ9/WAaZHFSE1nVg74S5ZXyGdEhLxchlObOmPzRf3aCmNdlwSWtA80u3XOcmGYzAcfymE25e1ogyefvzzqHwtC/YQTJ4/46cjaQy+mtHHphxh8xrzHA6vlFjWsflCXPJKvMHaQOxkLCA+Abd6FYsW+1fg55UiP1GK2URG5Oe0mYutfeU/h1lHGrEmbjFpwlZzIg39OAtoZv1n41RnrD/QBJnm6cqmQ6xlE84LkhN0M/a4z1nrLhyg9cHnciGvyu5iPPhHMsDLgaXRcpsx8HB/etJu/Hr4fO+nwvmIzxSTaRJql7Dr56TQb4dUYu5SyaAsmipwp/7yi5Mmg== 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=sCtDvXbzy4ziKLMu9vLX7kHKn3XUVPPphnL0Z9CMA8Q=; b=c5jYoevI3vZPdYysN8DZ6F+4jNB9QnsAN93t41XFsTTKPQQpY+M7pNugaOt/JlwPHgGRXknRelazr5KlX+HBLT3NDWPh6HykQ0yfFYex3w1GnKmy4PcgKsz6WWZNaqoiFSBd0quIONufFY3MIUEacp49bnb4l2WpH/K1cgvAzrtekXxRp+WLQWGpweuyPBg5wEOG5K6gyc3n9mmfa4vgSaSJbcFdiTqWaEMAj33Fn9ZXhD1CNDRb3yNAtnMvR/8LwDHFqTFs0iEgerV3xPAuqYFzLS8xNGz4Ux2avzEnzyZYEzX6TlD4uhbZYSlBzISUZOK2ftP4zOs4jPgKjFTYLQ== 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=sCtDvXbzy4ziKLMu9vLX7kHKn3XUVPPphnL0Z9CMA8Q=; b=kOEKqCXCHt+DSipLmeXubuslx6dIMPTmaiOh5OItd+vh4dHiHy+ysnT3XFoR2IHEb5jCqyxsZRkhh3w4+1Bg9foKcQg6rMc8bcpgwTyE0hqhT3X8FCRmuOdULyL21nZnqBi7Gq/TudvubxYo8dxCBLCkazuCFZSAEo375akPuJA= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:01 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:01 +0000 Message-ID: <87bke8qnh3.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 29/54] ASoC: loongson: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:01 +0000 X-ClientProxiedBy: TYXPR01CA0064.jpnprd01.prod.outlook.com (2603:1096:403:a::34) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: dad37f04-14c0-4ae6-c883-08dbb321d060 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yUmaqbj6aPuBHYGsBojWzEWm31a7AXTwpy7E+umc+7KGD8abAVnvfUsNVP9eo6784GTE/DYVAF8eT5B/ZHtQcIUtBtSElu0CD9KkxnSqo6Bx4ZFubIvisv4ZFGCJfBZc4aCTaNgb4j9uRQHEMco8NXtgw1zeyIBqEh6bb2HRwtoAbFnsIhUxbTSc+F2Qeu6qFC9cbzKVjyygpXYEpmPpFf+3oWwHQoxcja+jcYj41jfYzeWEupcUO993myhfJRo3TsckSa1Hsf8LycVYJhIUX6bClkU860YQV8LwRnGwLw9WHkYfyXiQVpmQE/5O1PJgvCUHHiiIHfaiQiH9E8LpaO5oqjSQXl+Huds76+W1cuqb9o/qy2ouWkDGyoqMAY8I4w7lVHQkBFTF8wEyJ/XuIqUiuTvP4jOwOWtHTE7vLj4+aBZ8sp0pzRWaxajPRUC5FUuzUbSPU5d+IZ5tc44lKCfpujGgXq2589mkvzLuB6Gy+gip7BZZDSsjpxCWuYYURHZJWCERCbxMRRxo6p7OR+a0Lw1lAv0i3Z1pe8/KyuWYKnbpJ/30wMMrt3yxxNQxjZu1Da01uwnw3sdln4ZQHCiVcVp9QP+FpPKAGTf67k1qjk9Ef0pxtdNlfTEjcK2DNRsd0RakW/GhPpeAKgpB6w== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2drpi/Ahek6caM18Add8CuRV2zQADCL0Mhqw2gjnhRtFdMDZWuqinx8X4H9n9/esq9QoMOyCE5tFxZHB2PdtJviHKn3Bz16dJBc3buuiyWxTldmc4JcpFJ7Tw1PYdACBpqqChAc5XXhOvnWcPSRCJwg4kDFn+huYL+Il3xWnKWGkCZDtwsSK96Cgq/Z66IYchehwg8r1k43tmB+pfC5NcuU0i89d/+a9CYlsZBQ9T4yjlWjjk5ZjlHLUG7CdvVrePjTDRchKmFmO/cz89ycFfh03s5X/wba7l8KRUiaQCmsvWZzfDhzztgBNGtej+O2ArI4kUPFuVz98HiUE68yotg00omHSOixk+gfMk9I+4mOWt3wmcTCAW+fIMQkGfIJd+Ehl9CYRhu0fURiI+WYrwOCjVlC9z03XsiggJe7OTxDVCdhxrPXUKlZOYXzI423Bxst6nQlfoy6JdHzPQTMWv2p+wX4JF2jp8oeulBh43Ji44Z7lOkfgT+vnb7YC1B7ymM4d5rj5C90tyyw7Nee5dNIkuR20wnYLfxzlez95k+HJBnvClKxdO5nfntoUfH3/WnpPmlNp4KkinWIKkjdsj61Y4MHI/XvVWg86T3CEKZ5TcZVdt20/7ULI7BIsobPAqoXK9FE8EIBo+TwFOQLvGzssfUz80J6kAuHjEOIE+AGe7m226U4JPjprtUb58yE53HppMlmCQR43kTfAGbaYe4T1fVeb+fI1W+A9d+ehSFpy0X94pEzdv2ZksTY25AJkMe580/lztcBpPq9RzjHic9xuihIn9KFsYY6jykBDy06Z7X1nkJTetp0S90Wc1Eod/bsJ/xQb2QGS9xkI1T/YXsS6Oe99jrN7EXMJNYGDi6XjfImauFg+ZbxH5tq0dB+x9kyt/WHxFoRsrvKrgo0iNbFrsLjUygOY0m8vrpLXL52yj1qF1vqMu+CPD4bOfXraOixwbZCHK9/BZkdSYfHWRRgZ8SsNykBwBgIMDpidaRJ7DJk8/Zab8doz2TZf9FtV0j8QYuvjUEa2q8jl7QSUljuC5guLKyYWjdkfRJuksRq8kGR1DlghwaOrj1sxKxfzGaVIdnPursnFiJDdUlo/PFbA5kkv5HomfQGhv+ys6hOBqajh4VzRmmpMFy7Sppy7SNUB8+LUSGBM5R0vqvNuL75Gri3ImA19Poze8fNxOM8GdrxP+NLrT+js39Cw0k5bFP00G39gU5nxUJLFGES3943bxOSFNN42H2SIpuRhVqceykuXGxIuMGXHer7sthH0X94ZMFBBCe4W76OfcOYBbwUCo9pg1S3uQxdHnDXPm1/J+f65WtBcixfKJRFz8YMEnqeHiEQaLnGJmGj+M7CeMdhw9XgIYYK0L4U3SAW08SLATPz4QpmPxjLM7XFeJFRCK/PSYG1e0ttbJ6Lp+4YG5bYzkFKm3mBlQxRH/AHhjPJnew/cuFq44tLynIjziEH/cBlQuycPdWBsXV9M5bj/cVvDELWhZ5TteA+aV8rGUaWagfmTQ6HKHvY/tiP83ddJwZq3oqwpAdA0b3HtcfK8+mVSwtGYzLibVBN0CnrWzHz8CYr73XUOSgXU0oAR4FYm/Ic8PpfMSyv1kbfrZoyprl+3OVAe/psD4z9NBDD9EHA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: dad37f04-14c0-4ae6-c883-08dbb321d060 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:01.6569 (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: NNaQWu1ek/Y3x+QweGb1ANHS+GaJhYPngfpHlXswPcHR4eWkHLU3Iof/Gx3NAS5pJL+zm3STMLOz200WjqfjT1J2OPw1tU8a62YQ48vI0h1TpEcAORXxTu3ffiHpuDo/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: 5IP2X6LGT46772BW4KV2UBL5DTSXULZ3 X-Message-ID-Hash: 5IP2X6LGT46772BW4KV2UBL5DTSXULZ3 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 406ee8db1a3c5..e8432d466f60f 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 65b6719e61c56..8090662e8ff24 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 Mon Sep 11 23:50: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: 13380406 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 F07FECA0EC8 for ; Mon, 11 Sep 2023 23:56:48 +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 EEB18EB6; Tue, 12 Sep 2023 01:55:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EEB18EB6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476607; bh=Jo3AP3c0eLTDvH+rTvw0aYhvMIkNw/4WPVqtBUCBKIk=; 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=f47jCX/K3YZ+R3owOF2N1vDBjR7466LWQKqt+9pzbcthqcQ8oPytkzQ7A8JUXpV/5 tEXcLvjhUrnBG1+sHjJzU9HCx6bp8Vpi3gYyaSpM6/r0LmGlT9Z9rMCO2BM5Dir9c/ Q5iBmsoGbAXYc8Ya+nisWBY/goDPIHE1frD/mlSE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E1C5DF805E2; Tue, 12 Sep 2023 01:51: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 B8BC9F8060C; Tue, 12 Sep 2023 01:51:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8DB07F80609; Tue, 12 Sep 2023 01:51:45 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070a.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70a]) (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 3655EF8061D for ; Tue, 12 Sep 2023 01:50:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3655EF8061D 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=d85AOUTA ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ALX5gO5f5Kbo2B/S3WiP7CMLn5/2S/BdKM4E2fOrZxDHlCUk357MEJ4OvhZTeiPkFdZVRWoPvg3QYoussKK7hITVf+ZJKFO6lRi69ybMTjtEGW9HUFhF19pJb+Kxw5z2XEfX2R5uUsZr5RcRU3m/oLcAGi64XKDQUvfZS0C2sv0RS8jCAL5ZTLLPW/ffN9BOwHAJQltda6v5uUbX8YrS3sUBJbal29amelspWLl/hqgI42vM2Uo53/HlKKPILXZApApWxU/2Tw/JBfXCRLvO/4yevSuJ1KKw7WwlRgMVNL31Q3c31LDH8zExhKUiEIJSvsX/89+d7FK8+W9jdHoeCw== 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=q5E4/5k3P+ays91DCjK2PM78xEM7NdViM7zFYBxwURc=; b=j/6n9EiNQVzmaJ7zt94tK2t4YhBMR+ZnhgLVJlyBQxlUxaZvZW5xBhgMx1jtGZcku4kTMVrOh4iDErR+ZH58dQDBWufpvCfqWQryDDi6elHrRv/sIK4Q2OyyCLJwDyeEAv/eIHdqgzzUGc8t6msE03rtT7JGb9mS/Rg8LGUQKmtXpwB/Z1B5oAKQt/k3TugnW2ShLmByi1/ku4+r1VMi1h2ebz0iq/iRU++owdfcudsMVjJNdizmDhta8G1NHh36oUxaQRxvS2lc0I3497KcGmha/7XCORvqb5PObIeqwi9EiDGBzu0XYDpGXBTaqTa3F+tJfpmKL/TvbiPgB7M7WQ== 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=q5E4/5k3P+ays91DCjK2PM78xEM7NdViM7zFYBxwURc=; b=d85AOUTAbxFXJJdyJydFDiEEjuOuncyDiOM/U00+3zIHbb7O0cbH3U86J9H+T5AZ4SifVmYaB2WDYFpamtwCqQkq3dRcCtN99hvKEnNoRty56uAVyfInJV+LjsJBPW6c/OzhHLYuT5tk3SuXsCn5KqA2/QsosHEsOaeIaEo5Dbg= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:07 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:07 +0000 Message-ID: <87a5tsqngx.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?= , 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 30/54] ASoC: mediatek: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:07 +0000 X-ClientProxiedBy: TYCP286CA0244.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:456::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 28eb342f-5ff2-44b3-72cc-08dbb321d402 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Okd7i3c1K6nZ3SzWpHkMp3hsyNgM/uw2WgmiLvO5rFGBcYEAwQfpxkJjEp4R9eap7eDZ5D5ldQFFR4g762fIg20fUEZDNMcs27qLreSRxgVR9i12nXxQFaE3Ie84cf8m0O3GxAmJMndsQ+5L0gWkmD2QttUYZ22qE9seWDHkAE8r5HfVDznIbFrzUIU/l8kvwZ9CdBNH5lo6MIpcvTj5c+tekElKSPdd/k8MTJQFdn3xDv0mTXyo69KiZ0NRcS67sqCt9VooA9eIXnBDTF0JY4IouB1YjeGk00gwDp63m+wV9nR7uD3X6ln1wXSdxAu4KHzI7YZR4e2hXPBlKynaopOYh+Vjcsr3XgKFLea/nS7kZvGPfCEDUH0gVtGPFQ4BhhI7eyQ/HGIpYTd9s5amxGCRjLT5koq5Qa8QGUNSOmMrRUPwj6UnpETVQQV1G13/AZSVRfl8wFo7fBDS/6GAEvEDhu3CvGYNpacw4rZz5wsqXuM/4s8xFit+v5JlB1sHkBq1EXRbgJFs2rKp8/zcroN9euWshSjBTguAtEnObP/SMXWkeTIVBOfi90qeWVo4aaTB/HAlBkYCcsUe/cf9zCvN7ChqGDJKLs5KcIFggQlm56wBRgGo2dLas6thTZ4Ewd9dMYWzGzoH4IXEOjyOEzeg2ZvaewI7X4b+BnK57aw= 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(921005)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(478600001)(30864003)(2616005)(26005)(21314003)(559001)(579004);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OBUf2z3muVVbj2iFq1hc3w8gAJFC55VQTj0p7NiXwXrX/Py2BQujEujVarKx5Qvhy8Oh/35edo0RcNGDcHeIm44o40Dm/zujPqQQizmlR/wTYkqiuT1P9SKkUbbFPUkrliUVHuCKG0NP9Nrz7R5Ew3FHnqp4rFz6I5Dxt5WnrJkquPm05vwdkMD1M5RblQGbBkxXtf7RjtgkLI3HDFj8RWn+vA590bh8+xDVyB4MFYgpXRpCCuw7szDr9sSR2mmDGC0bU/H/IWc/VPd+p1XvU5J5fwOjKZz1aa96GN+aHqh0ZwXgLkdyTvR5ZleReHWAFPige+Cf/Tz6JYCqJQn7h36f68ft47vNxtQbxs03GwjzTPAe2IcU01XNNFkt/zUal2u9ugc6BjuMEiONE0RRxcFrJwReOQvybFwe6ZrLxPOdawH1eGo+xql3aM8KB9RSndPDpo1OVyELUUCdBi2ABWAyg0J/0Mir5/5nGiA6h1AU3/NGwiHZZQdqfbMblpgz7r0Jys209vAz68twP8s/TeVMYGASOceeDhptRBvxdaR9/HNr75UpCNseCMTnYP4j3P0eVV3n9TtnLvqmlud7xHZcDhbFJJDI2CrB9lLrjljWFj9KfwYgHfOP44ILGFym4zHjhcWHyH2WZwGksYft/OfQYScj8ZaRABVU7Z++ZfRsU6CsAAyN1lQ8TiEZ/bvuAl7Iqo77Gfg3q5lLVDmMGBuRaYcOnY5k7qSXKDbLWV8otxHZ1MA4rVm5O+mV3uo00B1Gy39yJTVEUPaVm3TEC4vsxDaZF6bDkJbQ7B8OoVRQanogFpVDJtBy7+FZJLB6oq0KOJRto9N5yV1Oz3HoFi4ndB4Kh2iRqJwyGsYPqm9v9M+Dg8FzR10QGly69n6m+6i1vB4qKz7owy89yt5BdMc4+adsV2yMKkE2EH1GUSnlUkgoULtuxeK6wTeKgahzIlk/M1rR3HDludSf9ykxMgyH8n3MbJa82gFLkMC21mw/LXg5oowWDTOlF1MUEWniKatENuat7D4lHrLIBTIVYeFNrx8RTaEWfqGJgqHpQ1kmxpzT4CehpClnUZ1rzmfmrY7ZR4sOoC7a4RJpY4uSMzUKlCYs8sqMRuiDMBIO249+v6iRW4AePG64qE9gP2eVX9nAAdGfZlbMQNFGUf7g4sMrKZJZ4oIdFWGhmdop5awsBystUOMhFeBMXkkHi7fu5Ki1L6yfNVpRehQlKsIU/I0IksHsO7nwmFQ+JGEEdaGhPtphM8MIFiRRK9ClAJ/30dgD4AwOQGkDUjKX34SXIdkyOu5af+9RtyaNUF5RB0u2WPbc5Clog1iLuJUtQ8ktCe0avocmf5KXCfUzzWWGuZb88DaAc1dnnSUsECAhPdwkx4d02NghEtVLdd0RJkpaqz06JB4UxvcSq/Yta4vdR2y0P/4T9QB9LsUsET7Pm6+iUGWDcNZPAprnWLVUcd5a844lAuoDN+Dc10wM1kcMPCytnUNlV1+WB1QVamH/EnZa9KBz+KmUioMo3GRO2aHvvOtzutosdIAACGO2zTt1VSw7VPZVOnekSteY9OjlQBO9+bPj10YsetcXs8p5dmtXC8FwkPqL+g28lfcsWwVoCJPxYlby1hnBTNXL6p+zZRE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28eb342f-5ff2-44b3-72cc-08dbb321d402 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:07.6828 (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: TAX6mz4WeZmHj74kijq7OGy/XHXi1DBbNi1EZ/S3pHBy0D8vzhmimOx7q6/8chJ7X4GqY7+L+kwsSLm30GlsNHu4tSLfaLSRoon770CtUjT0c8Qf+K6/pTQdttXFLHuB X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: I7X27YE4IFCSCPHTS7FRVL6BSRUXTZID X-Message-ID-Hash: I7X27YE4IFCSCPHTS7FRVL6BSRUXTZID 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 | 20 +++++++------- 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, 123 insertions(+), 123 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-afe-fe-dai.c b/sound/soc/mediatek/common/mtk-afe-fe-dai.c index 395be97f13ae0..3044d9ab3d4d9 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 01501d5747a7c..32edcb6d52198 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 c9d4420e9b4c1..86885117f7f75 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 08ef109744c7c..fc80e2cfb5b9b 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 a184032c15b6b..8a6643bfe830e 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 43038444c43dc..da7267c684b17 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 06269f7e37566..b6291b7c811e5 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 bfb2094758ff2..3c5c22132c927 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 e502cd1670ba1..fe1235d3de645 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 ffb094284bfb1..892387c4dd186 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 18cf84bb25c76..0be737a11701c 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 90422ed2bbcc2..9e432ed9124b9 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 701fbcc0f2c9c..a0b4eeece9b73 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 850f4d949d978..1771c26b04454 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 b86159f70a33a..bfcfc68ac64d9 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 4e66603d4cdbd..fa08eb0654d88 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 aa8e00bba19b2..f795190f92a28 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 9c11016f032c2..6be33892be0a7 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 5e14655c5617e..46d6a55404037 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 9017f48b6272b..bd736c5fa15c0 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -266,7 +266,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 mtk_base_afe *afe; struct mt8188_afe_private *afe_priv; struct mtkaif_param *param; @@ -412,7 +412,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, @@ -459,7 +459,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); } @@ -483,7 +483,7 @@ static int mt8188_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) { struct mt8188_mt6359_priv *priv = 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; int ret = 0; ret = snd_soc_card_jack_new_pins(rtd->card, "HDMI Jack", @@ -508,7 +508,7 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) { struct mt8188_mt6359_priv *priv = 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; int ret = 0; ret = snd_soc_card_jack_new_pins(rtd->card, "DP Jack", SND_JACK_LINEOUT, @@ -556,7 +556,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; @@ -628,7 +628,7 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(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 = &priv->headset_jack; int ret; @@ -674,7 +674,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); } @@ -682,8 +682,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; diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c index d0520e7e1d79a..bdd1e91824d9c 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 5e163e23a2076..fe3562ea83ce9 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 a0f2012211fb3..1e33863c85ca0 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 ceca882ecff7b..9138f38861ffd 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 Mon Sep 11 23:50: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: 13380408 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 7CC3DCA0EC6 for ; Mon, 11 Sep 2023 23:57: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 7DCB3EA4; Tue, 12 Sep 2023 01:56:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7DCB3EA4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476647; bh=lyNUMozV3X75wdPa6c/h1akraJ1wptwb4Yd7Xgf6iK4=; 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=Hm4tLXjOV4tISQJlsj4889Xt2Czfp7Jye3ZDYj7s81/PFmlu7lTt1IZVRJzGUhNwn cL2ucdAP5cle1pQCLhOyslt/LXQTTgUrfqE9xmtCZOES+LxTLy9nEmzzmVtP4Zi/eg wu3+JII5FotyNZ6fKbYLX1GOCkRuskNAoCmS397s= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4714DF806AD; Tue, 12 Sep 2023 01:51: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 9DD57F805C7; Tue, 12 Sep 2023 01:51:58 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 65FE3F805B5; Tue, 12 Sep 2023 01:51:49 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070a.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70a]) (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 C37C3F8057B for ; Tue, 12 Sep 2023 01:50:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C37C3F8057B 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=mHADqHJ7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OzYo+Tt9iHA814KPRrVF7s2pMMaP6fngEa7HXOTg0htsql10TGBQtlBj9S3vCfACtjUTrTQCfxYkedSMe9qnICAkueFgfBOtWhunJQcWqTRfWdtpNSPMipuRj9l3Mu+2nymTMulutNKCTnNEFgSmUvjyqRZtL/cXGSPA1rYQRvJotjy6CHVRbUuQmnPu8H5GpkGRiwthF1MhPy4h71SemyY4tYYDtfC5NTJwMkPlv2bgh/ajzVrURqRjIikwF9g7Q7buSyAHIkE/3bqwrP2sjeHAeME7t9P1Juyowes9qJTUuxgJna7UyIaCcPjZ7Mxj3iHZU4k2vtKIvooa4QicxA== 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=Pq/8uknxbA8g5mEBHdDBYwphkBwUM4HLrzkI+ZA0hIE=; b=a4NEcTx1c258NtFQ4nyVbQE/PoA9JZp9fkL3udFN2wmf40KDkqA5oqRrFnlUis/aotEpmcH1aUWg+L1fjltaNyICR33MU7bq9Kf1uJ5Y5nuo7KakGAQCZ1EnNPYfBGAQdu/pDoT6vgY+XwrCRAa+ivXRixF4GqidT9Id8ZhN2puKv55eh93S7rWUtXGw0QFh2i6iO7zfkKNUp0ClQgw0hIljRvUuLiIzdhRUib6owHNu1JuvLC8wI5NuTZxIKBdl3H28ebMK1KfUlvEL0DYWw7UxFs7NJX48zdXIVynY0QPYec15ul0v8yC4ERim8zYakxx+8Sltx82pX3CnJDQzdA== 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=Pq/8uknxbA8g5mEBHdDBYwphkBwUM4HLrzkI+ZA0hIE=; b=mHADqHJ7amshA+BWqubzFAUvsiuT3gPDbIAnmNMQxRaWBvLHYbZw5HtziEEOPy3sqrA8bmRTMTDQEo8w7WTXX/WddH4aMHuADjFkRkIUaRbbBYfeyRL2CW1vQ5tkFZvvE/mJB3vN3Kbz8tpMgzNgd5zOCe+rMkt4EPo+sMgdOgw= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:13 +0000 Message-ID: <878r9cqngq.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alper Nebi Yasak , Heiko Stuebner , Jaroslav Kysela , Judy Hsiao , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 31/54] ASoC: rockchip: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:13 +0000 X-ClientProxiedBy: TYCPR01CA0092.jpnprd01.prod.outlook.com (2603:1096:405:3::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 3dceeeb8-778c-44fa-f37e-08dbb321d7bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fBBvcBfc+gMxZADTlOEcDJQTyUPyfQOkP11NLL8E7I6oiwsArDppSWarLbRCArg6Tc0hqTQr54RLkS0gl8Diwo3W1+WK2dFlnXo3A5mtBkdrHLLqzJscPNOi84BRNkrlAsw+AFWroCQe4qlhJ3maL60QczxOedOI8oF7gUz1veJ74IMToAJ8olRjbYXgen+XJBv291aavFzSY/WPQHZv/YvG9nhoEDCKZ//mu7Ko9JbcBj9iDQldpzqMBRT/Nh7kP2+OMSaoDTyx8mSwcZxlWskFLc7sGD1NMZlHI2Z8b4vA6Xg+hRFS255wPKzHAT+BN4dO8ckbgGmDx8z9FxPL+V/TcaCoWxfNHshkCbLMtz8VFG0KmzZG08qDdrLyaqPwMoVAMpd3dioGEOEXGHuH4qr2/1Beu5e7CU0nPn9xisdsLR25b4LR0upDBGqsq+SFI42CD5fNIrEgEz6AoRPzXgIYlimt7OmEoW/AG921L1BAwQjZjaEbClrviyd4Frb0fGfPM69pmV3ZLp6TDPedMguTY72ipuugfgaQY0TwUnfk03ZjBfYJrkhIDJtlgIu/Vyexkm/avIgN+YnSpAJRMQlbGiFLOEv288UMOwYy+WQRcgGSGf6JjRpryx8PF2tK10ePiYuzLyg0gYfhfTuSpg== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I5EpYHerJoBV0jtkJiGtLsCKABDYQv/Prb2gKhnQiuhsAD/t9tJPwPTh5ZglPyiTKhZZILpO581Qhwg8HuKW9ZO3ROFiwuZmiZyXyjX5J7SXGUL3pUQTeY4tL5DIGBmj/3X1qLxffQRVwNn7mGlyMGBkBFZPrSzt9CmjZk76b1/E2klVuwX0GNKDNMW3T7H429bF51iDkpaLVIb72WlmZyY8g39Rq5dFSS8naBTXK++SfjN698GBVM9N53sdZxeCW/W6YZ016rAdZSeRUy1BRgcWUL5TbhtURagKMVMP5CJcBOoGOCWh4nEOWWF7jG5IJlkj+8DMbdjgDLNa4rDcJEhf1cCa7nrS0j26+Xn8h6WJRPYFG1Sun3k/kNz7NJskp4y0cxjSzYv/SgSwjXurTsQDdHh5HBpR0wX/oVVxTBHO9DKX96Z7Y8N40P7IFP/DfT666H8iSMu3sdV53xjMpaBSzXVB3IXCrYOP6JrD3TicoC6kb+IUOzy0h+yhB5jb6CWfytemZIFG20+2hEWK17ELh/lksSBR+CE08CwX21Nnv9XhoWJL/GZzTpnLDsU0gWx2b+Grec8nYfiEPxtBj8Ex0jtzi7pHmyhLk6E1zDFv3Dcxrf8jlej7swKlDNUthw0QvGEt9kFboiKY1yYE4orBj2A8WIU/JQXbZuAwgev2Qa4lnTxTvrcfPwXkTIhzv96LZPk0nVQLybqSOoHdbTEiIlRlyCVnDe9fEpDw6Ed4x6aESFCSJSpgpPJ18QBhz+xTBjOI01/FhgR+PeXCdAGNVHmUdRm21n5wdLUncVBwBNjWcuxQH2SLP9k0Mt4ZakgGzIvW1feMgAFaXFJiSiB3jfdSi/lHHF4OjXErRyOJWg+U82P0A5GOosC0aubmOAeDrSMqXLVzdRoipRu9N32Jc4YStFN/44VsnGyi1neG/YqWBzKkKM1Kt6R8dzMgBTsXkOsF78DHZ1Gq03bNe9Srb3ND21HkL08FqsFy5dpvB2OS1b50gAL4W5ennkVW5P90WpNMQ5aOdexpTIbzgjBNAFwmi+JEMRVZo+nZMlqTKTuqLJrd3GVln7qXSWt16PeRvj2kLcrR9rsjr9bsQLbxHrdN1vSDBpJIkDMCMjqR2OSV7iTUYnSvTRNZ8rebZSwkfJxi9vNhH3qV4c28EM1NcGrr0SNdSfgjsQmZklhkQg8iF4FT+ytQXwrePsaug9uIS+Y5KLonkxRoZVlW8NdzyNQS2ggZgOygFYZE41ItCr2J4ev1Bwt5mLmux72szSlbLywPRQ41byVODrQgY+1l6ec5CPOHCH6USDfvNR4bhJVrwlEpayW/5j5RtuhXUrcNNcOEi34J79WWpdofpg1Y9whBmV+NUVTmFf6zaoBcRr2ZvRIMH3pl2A09JJvhsQDP1K+vcLusYWpy+5a5/6SWAQZwd9UD7NnOm7hzV6opH8Yi/Yb2aNHqWc0S8rlfjQ0yZw8ejeQUHjO4FXnxIskVDrQiEmjgXK3SEvz2Aylbo/n2SfNZ0LZfuLzt+rlO0+wAV9nscW+HU5J/uEzqt3L9Bfemjsys2KrqYSiyNFcTwvcoRJD2e86EsR52CD2/2n/J/i2+6wD1Z+swTqlpbh6hP9dSBTOt3eSxCAKbS4Y= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3dceeeb8-778c-44fa-f37e-08dbb321d7bb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:13.9066 (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: KQaHzDIiHNi+iMhoc/BdTQaI782II+lGRQtWyxejYQJXqUpU1u4bTLRnmF4z5VoScFmaUd46I0Br3AhvT3fF0lDrB820pgB9s49ikRK9YBVhouihU96KiHx0d8OG0Zr1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: LFFS7U5ZJFMQCLZMDBGCBOXC4SJ4NEJQ X-Message-ID-Hash: LFFS7U5ZJFMQCLZMDBGCBOXC4SJ4NEJQ 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 0c6bd9a019dbe..5ff499c81d3f2 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 0f704d22d21b0..4c3b8b3635300 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 834fbb5cf8103..74e7d6ee0f28b 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 150ac524a5903..17087b504a37e 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 ef9fdf0386cbd..d5cfef9be1af8 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 Mon Sep 11 23:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380409 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 9990ECA0EC3 for ; Mon, 11 Sep 2023 23:57: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 0BB27EB4; Tue, 12 Sep 2023 01:56:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0BB27EB4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476660; bh=K9HVINj9qtireJtZAYXhIliKuDLo/mia7qPDv0rCizA=; 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=hMXZRO49tnbAb7h1arvU2xeLTgi4NFuOKzb33KXZjkhquYztt5e2aIeWP6/EliSv9 6KWF4GwHfr9wIQHQxoVIjoIghxhUdJWXGNEZGGiQVG7MnUmfP2HbVobN+pmOvohOUh PRklhAq88RoBw/drSQpRPc7VO7s1aqbnvh4JTQLc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C1CB5F806C2; Tue, 12 Sep 2023 01:52: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 73974F806B3; Tue, 12 Sep 2023 01:52:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C552EF805B5; Tue, 12 Sep 2023 01:51:49 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 50B42F805E2 for ; Tue, 12 Sep 2023 01:50:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 50B42F805E2 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=LtG/Mjtg ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H57ekPA8pNr1uKqO7bzvFecUwHyuWlChm2RciKaklCeO8RkkmnY/k+MmgC55iDYHTyp2wc+/a+DNLyyEQ3ZSdZ197l7DWWr1lWrncm81nmkwM+C9EhmxztfsTIFjTl/2/QlQs1gAY96fep96ix56ox0tiBpFwsMfPoxfwko9vn1isNZuOqnUNGKtQ3CQPVinUwDEgB1OfzzzWUhgF4l0Jj0YlUhctk9Cn4UIGrMYXOp20nHctISwLNCbue/YRkDgOm9L58a8M/iPDATf37ZheahF2+K1zFXxu7yyGkimS9a14bc3FfWpU+9AgT14XNqs7lXDpkOh9voLoYx/q8ihqQ== 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=usjQUAfXXm8oNSm9ZiuRMclPM4F7X2CfksDEKIG/w7w=; b=BFVhx+LhHpe04o5nYgQua2EkCyByJ9rRnrrh59++mtb2FSQimG1ovCVc9yIMpbAAl1HkOjq2RdVEbWrTPjQ9Xf2UYCkltBMi90u+I6p64nVbdQHQkwZEC8SP2dGXfnHRZ2YzuoBeBcqufWMnUMsYd4+TlN3oEtlCLR1AjPDAGlir96ZF3DUzNlOqA53Rw8kwqy325/VSqoLGjN5ihoOYyOnbQnRBOLGDPYZK71r2PQ30xScyHS0UlCw05IM1JaRoFrZEvQDMENjW59rid+NbUT6FX5wCaB77nTxuCBGzongf1a0q1JGUlYLXcUptGsjtCSgd+JbQhiw7FulVum7trg== 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=usjQUAfXXm8oNSm9ZiuRMclPM4F7X2CfksDEKIG/w7w=; b=LtG/MjtgMORZhdLjQEx2HDUNX9BbNYfLYwsu1KYQsKwW9bplUbVubeRyquckYE6wAdku9i01TEC+EmuS3k0K5+Ir1TCdrnJwawEUzZIh5+DOqh+UHBcUSGeGzbOu1RpNlJnS9cSzy8cYhep2+ytQjqASPTTTsIEx1iP73UVhiPs= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:19 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:19 +0000 Message-ID: <877cowqngl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Walker Chen Cc: alsa-devel@alsa-project.org Subject: [PATCH 32/54] ASoC: starfive: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:19 +0000 X-ClientProxiedBy: TYCP286CA0133.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 40284446-563a-4a12-1a86-08dbb321db16 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ESn5DKbcaLWZqHOUyRkmlp200JJy8NsMqL+E5B6d3llXuGB0bIitZ0lOF2GbVxxD9c9NsHzjhTex3dfLaPqNHXDP+d94KrgwtXy5cr22NqQLgiCrmt2ss5V+gy3zEfCMEKbuoDb3qGqo8JtYw/44S919kbAiSIvZw0i6cDsXDXvf4oSL93r9rUYy0cw3hBIzSru4e3AUW4XjxQN3IOrni611j8vtes6c4CdbI6feSit4PlXmiMGYibmobVJmBMBtKPvfAJjS+VdkOhXQ3ym6LVh8U2CCQG3t7GHN0yu1GF3mC9NRlZhoPIR7c+wTEDDqKQfRYlTQEdxzrVt8lturHKTPs42ayEfWrn3b7iKpxPdeixgvl8HZXq4b0XQxgjZKt7Sio6kzNlWHEOERwATD4rE6b72Alr93/BKQStZe4YH+PpvGeD6gwOMN/p9yQgm9BNMq7pi3K1sZ1viRywc7xG/PeiWyqyAPXbkyhI6CfcDF5FEo4Q53X9B4xSHRZjS1NuBo/4zkB+anpMSy9+maM90VinaPuplL4M7kRvO2Z/2o9YLVq4srfc+eX+ivWmFHvWLPi+4FX/L/bC6J069RxOU12lP7PqiIYLutcaVSLHpg0K4v6lv8SM6FKTqRypzwpakJD9WUt7Z8QTFkeqNekw== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(4744005)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z6yDQfmrqaEPYBPXMOsLIGC+58GZq0Uxq5gzCkN81JA1xPYFcw8nsO1dvsiEDTmgTdhTCqX+6Iefv2ErjYa4QvjOuYgWhIZal3OW7h+RGfzmBO2ouc8Vh5J128qrKo7SG4VLvbVxYUlxTIEpfdz+hhx/3Y6e7lu8qz+w8ZUwJGWWxEz7a22SLSNrYI4wN3AxJZzvXJhjnhtUnN7/20Y47l/jma/1yV0IIi3IwqfNlhYbB9TjWrG4iKkU25svVMpr3k+IfAAperpiNaWh6is5bAHx1cGy1KGV3VTSjm2fsKSd2/MDOhkodQwUhduN5dQakSEl5RYPYUgyhEP+vYf7vr+O9qWZmANklbpI1p8LNEGXcwDMmkiMrlBd3hkQQi0UE32Jp0wtBLvIbfKbc2q0w3y8OtkKLBoHeBHqu37KV2VMyqtFzxUVnMf1pfHmIBJGlXTF7SBZPDZ6IZaqOVphh+oRpdz8f+zn1RuBTzkfRKA8Oa4nYWN5Q0PhsRexjfu8VrSkLLMaOPqggrKU581yEPJ85kb3mCNyHjuLWizm4xg0voUebs/C+AyZcXoyOMsQTFUVbSdqNybZ/8gxdhtj4o+upTI3PIorcqLrtMQuy23XqYnIkwqbP91hZSNcCHZZ9cax4VerfzgGoH35CUl3sBhXf0pz4xS7H+ICt5oTAhWB0TPB76PkQrchugBWssygHRLB131VWQOOw2aKIk62yHkrzu5dPykxbd8jCiEogHg4GzePwFYc06ZmaILpN6NXXmIpPInqMUNl7x0YA5TDua9Mn2Cx4utPwmc9A9VeIZXJsTbN1E6cxdSmu/RBPgREAoWRdRy0Gst11ss5bF7pth+fesdq5YR2k/dgiAVx3evBNtbledIAh7fwTy/4TbEWm7fi2LRpU/ZRPB2XF7N9hStu0uzErGnaqranaFwNHi4us2u23Gv/j0ovQtvzu7G1T0JNoOhLI0CEZunDbZ0dMguLYfL99cRcaG/9wDovpn/ji0SuVqpgXc2GhKY/7x058XxoAfA6udxkNyAN/EYimZDSKZbY2fsf3quRVmMByxLHcCGAl06gqafXVchDGbQemKRn9WhDWrlir5UsT4zIeyX+ZbmL5giAGshDSITJUkcQxyH6UtHzsJC9huA8PD1LWyl3jW4aWfEzfCWx+PF1fzSRmAIOkVnNYSEYoXo85DqTrCNF86QY5vfl5W5N8LFF0YarCK6wsspL4ih67mKb+GMt3kyfsSynPkzN29fsW5YdFYYgAIGIaTIgHjdlTHP6/9bqvcln21tfQGnFNTwEcWAks8UXj9vsYj0AA9O49aUQ4krrLRXFNDsoPIwgHF4wIZnqandkfWwELfXX8S8nAUT4Lq0JydxUL4L8JgN7aYQrVBE+w1GyPGBLr+5u0r7muDDa1pSuJdvw8nc96lyoF8vI4m4f+66NNyTJEugEOQOYwcAhq+z+iJkE8qwx1tgtlpLhNxNYwGtYRphi5kUnlxzB6Gbik5fwLonZfGMEMxCUdYVIoVjw9tnr7Y7VaWZKcP22H8ZRjPfKdFssUxqNB8JbhbLFQmz4/KGz3KrKkgLYXWmfN76kv4U53rWx0a3l/fNmZf2dNBX2IEE7GguQjdOeWI/Q0q4SLAba+KuROb8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40284446-563a-4a12-1a86-08dbb321db16 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:19.5381 (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: HqP2VTV9wcq11X+COi+gEH1Danpcq2+t+XQTeTF8Swy+yP+dpvJhvX9GzLTtQTrxQtF66xNR4G9GpmeW6xN50TIC5QuygHQ07/QuhfpiCIzf+9o1TTEbTwqGDZaPnGtc X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: JJS4O335QA6MHUZJUUEEBDVL4JSIDO7H X-Message-ID-Hash: JJS4O335QA6MHUZJUUEEBDVL4JSIDO7H 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_tdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/starfive/jh7110_tdm.c b/sound/soc/starfive/jh7110_tdm.c index 8c117794b0289..1e0ff67207471 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 Mon Sep 11 23:50: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: 13380407 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 42D17CA0EC6 for ; Mon, 11 Sep 2023 23:57: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 688ABE96; Tue, 12 Sep 2023 01:56:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 688ABE96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476628; bh=vpYGWMPmDXektfXUd+TtQU19HDkC/mWxFBqHVoonrDg=; 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=Of5yAvZCC7PhIJrcgmcJXlnCiLJt/+xgSHxyuBuJTUbX8w2AQ7XWVv5VW15RCp5ca njG46zydAg5tbUEOGMQYb9m680TaX0RA0IgyigQ3a/KWPVQmFCRUXx2pFt4vro7ibz MPtGXK2L8ZCnHY/1HbMOzg4Wd28YhCn8H+Kwhsv4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C5E01F806A4; Tue, 12 Sep 2023 01:51: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 51F95F8061C; Tue, 12 Sep 2023 01:51:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D59A8F80600; Tue, 12 Sep 2023 01:51:48 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 E9A69F80537 for ; Tue, 12 Sep 2023 01:50:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E9A69F80537 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=c3NUa/e3 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CHGLlm1/OKSkMu1KmnfyqqusXgPJ9PQKh24o7Fj46wHqc+K4gz5mBTSt+8B/3F3apVKR58LkIsdbFUVZjmRaXgVqYG54rfjF6tLssBN42uFDNelorxP7ckn6ZUTTMbGNxHbLDs1B+FsI9klVncynAjWm+A7qkcgPcWzNfiqoS2r6nbZvQNJPtNjUWa4jI5tYskZF7Rjo0Ylb+ZBg1ujOOHH7rG7Gv79te7Nv4MWRvDy4qQZKDyh8wEdO1fTU4ucd0qv0SpVZpzOW20Ev4lzWx7AzG1Ty5luOh2To5NGRGe2ZVnVSLbTNgSJ+ESxItulk1pF7oiXIejFrpt+4eWMR4A== 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=2oDwcKSoajgXqqugldaYPJb5TkLJKNBwotZUwYrpbZs=; b=CMxSruc9u9VAvgyE52OG8U0XOY1A4cCEZW20muqI/r7//4zijPKtFJoGVYm9wJ6A3AN52k4Mk6/1iqST51tReq+MztSh5hlIRcZdms36zduK6v2xN1MZUcziurPCHCrv0DOe/OFMFc9bs4lIA49b4i0FQGmDxHNTVWCmbpaTA/X36Z0yqcxGuMeJRfbXkp27Aq57GKnNz3q/xM3c3quglKeaSuyGDIYyD0F+P0gCdXfuqEHNenIdyy4wayA1qvRzQbyoFteCZFiYFbDGhvhGVTLQFYDPneZE7z3LFmhXaSlg6YF3ZNqkAOWMsJr9boFoGTEbZZcLFcIEdo07Xtl84A== 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=2oDwcKSoajgXqqugldaYPJb5TkLJKNBwotZUwYrpbZs=; b=c3NUa/e38HSlJ4IkaCzIsDAlLh/bofY6w/4uyTsszGTrEaFddr4DQwTKdefymB37EdOmkY7Rwfi/0n4aOdxBJWN40d4caW1tiUXuyZY+gCpzNi+SiItD27uYhMJSxiMHeGURPlUo2d581IyliLeqIdRmEfGacvhrhWnuQDDsSf0= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:24 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:24 +0000 Message-ID: <875y4gqngf.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 33/54] ASoC: uniphier: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:24 +0000 X-ClientProxiedBy: TYCP286CA0158.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 87226d49-ad27-4c75-6e00-08dbb321de39 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xAg4QTpfNlmx8CL2ZVEwnOPUnQvnaQ7rb3xefNsR0QWmdBtAZ1EOaX8YPNES9S+DdLbIp2jjezl2vl0/QiDq+wgSH6Ix14NnTyhtzv20pajnYBJuzyBO+LesNKirqr4fsg0niHJEiW/UMiq1UXekd/ZBGWOR+flcILFSUZj/wUQTCVHVlMZyumsyrRzReWRijfqHmUJLjjGiV9+un4gJF/Syf1/d1LVijYtPZXMuD9j56voN05aWgm5ouYmIXBDFklaed/QX2I+oCc1/pXHPYoCmbPDhTZ9nVmFeg8h9aMtnrp7FIXbRSiZ5Gh5HYrLpjM4QG7ZDjCmLHXbABCkcDTAArdzBHRyGAyEZO4dL94JCu2ElsWIZyaUp9AcCsWD4anT1yB5DTJWotL1eBro1hPVGzGOrD9hGINYriv9Skq2JPnZR3a6I+1KsydxGtaHbIWl56F4iq4zUGoKt8fiIflmORX0M/E0FCjmgqlT48XHynHM3PpptJxdsyHwE6LzwuNYXC44n7uguySOLKEJcAsdwJEkxakc/DSO3TQLvIBfL80U/ausjMdWCKsH3c5LvhY4FS4K/Dlrx1L9By0c+RPXPyHcFzimok/W1lsBY/2cwszA0eiJ1styvAFfRBly26+cmo/Vje0lqMBgKuO84Wg== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9WkXISpP7rLhvv381oU/yUr/Wr79WbXIQWfj/BwOQBMsd6GQEoM/ynKZuEyysrSN1d4KlC6YLpG26P7I8QCHvb0A1gQsAhYLVvSlF3ld8P4LT3LjPRv2K38ucaMA7w1/gXGMteoj3HJjlu+JNuX1nR37pwZAPsAyLjUZqRHPeIHE7gh8ecnZaEBkXbLUZzyhRsVNyCONAHjTzxuEfxu4VfW+IXvu9Fn115bIMod6rFDRRJ3yJ5wetEGPwIyRsfz+C9VBWAr3XIWaTAhBOMdtZPI/FQxYRWnpEo1ZZttwAbuTo4rADQq3qPTCWt2JWMnHBxJwkjUohsnubNze8QKt1TFt2Mfm3j1vb5tX0JVmjKSlaunNTciG3Itm/zioADVXATs1MQEq6r6zg2+iFdPvfAgGLlZ/YaQq8t6c5yIYIcWzk6k85ePhGTH655SYsJnUM7+6A9BHAptcLCB+uw3j/1wA0sWCXICB2Cn3VI2RA6h7Gd1ydkVBGrJdrPdsXJvOkZCwOwd1RYoB7T4cWf7Fe6qq2PX8F8SrwEkshOx1OmiiqzVGQNv86YTx7tjVwGg1pgo/IHpA6lC2aT/WDEIyYwijtAmQYkykCg0zWk/MqOR6ugUklNDZ6OfHhDPUJ0GJM/Ng4G+RCEnxPkG9ivyaw8mVYvD6Y/5iU3y2hrBNSWdmv7FSPkP2Dml1rCxM9R2Z15XUM5HdmIGMLi1jGAxf97F9ktdQcy9Zs0ZYofHLSA5xoJDROIcBS9wpHjpI93Ks23WB/7YnL/4BDTJA2IPRf/zRKOmy382wUAKKCxKi7z7YKd3Mxt4LKgLmOkS/BkdexlIcGrDqzcBEuVAAzLnwpgqc/VmdieYCbrgsfKii3ohxRDvRR0Mcv+NHiYNm9G3zWRsSlth/GIHS+nJj+chpp1f+cngMFUA2ynLsuotzYuzYckjCPDmIpofpOQ1As3CdJraAUNTjoykU+LgYDsxbM3HiMPCyk8LQgXhG5qbu32/BlCNqf1/4g86p7AUygsXbcCWlJNPGdFHlrYgM71aFmLU3zdDoEDqKh8qQMngMtLGu2OS91frOVN9L7XP74QuQ3sZ2vp05aVlHp8kIYLlEaSD9/JNOCjaW7YoYqZjci4YyLsINHwxo2bYfGcKL/11Elw/I/MZAhPr0zaDxSsQNfb2FScwdPWv13COtJv+03w3jp8HcGiXTZhyzeOUuEAA7EjiZewQZwxZtaqSZCeFfaf5GGVadBBaAtXfl2PhXe5UNeBDLTethNrD/37N1hPFckdMeq8XNS2e9PHcMrNznbdSAQR6CoFfnvEPY8tEl9MoSXERBIlGaUVnSacZeZr6pEuYSl4mLYdnwn5zpjGiNiZnO/00rHfSNhuT3qQ761rmYOMF7XObtR3aDCfclo2Y8Ad1C4DPWCfJDkM+OlTwqGwxeouSJipb4xXizTtt4W8kIjpDNCvXIhldTlk8b8yLvvscdUBhu+PmcT8OZNoaYL0PGqTA6i16T83Xt/xg9cxRpUa5mRgsZh5ON58f4wgc2m3uR+qGUeHGuUn0HyJcCXLOt9+8SxLZvSVML2s/YOPJPlPe3230kCYTsiRIGI7ZT/skazWB3BJjyvJGH0GF+UFbTxxxN1rbdg0KZvOLddjs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87226d49-ad27-4c75-6e00-08dbb321de39 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:24.7758 (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: TPWSjRVf3NS0fw4bNrwU3vRgQs+B67X77U20LdlnF6P1xcga7KU2kn8DfEFd+V00S/sxwK0vjycrVnyaW3bhpsG5mMsZ2m+xuP/icxCkHDeehTFE8rv6kCnJ9Ew0tHQ1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: MYEAUSIY66NLAZMO3CRLIWK4XW6XHBCP X-Message-ID-Hash: MYEAUSIY66NLAZMO3CRLIWK4XW6XHBCP 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 7d1492c15b575..4a19d4908ffd6 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 3d9736e7381f8..fe272befd9676 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 Mon Sep 11 23:50:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380410 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 50369CA0EC6 for ; Mon, 11 Sep 2023 23:58:03 +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 85169E73; Tue, 12 Sep 2023 01:57:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 85169E73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476680; bh=7VG7C+owGqMZsuzQ2xwN5+ek1x5S0lS+o0vjdw4Bv+0=; 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=JsbR/R4SUqIyPPsl/4KB9Bw+OWi5o77qxvoUmrMKRuNXY5FxvDPEFl9GWpxsB9Wfm 5k2K1anpAjKv6gcHwjF9jZWX+YaR39/DG34PLY3QQnkSXgJVGi8GVM9bEdGlNccKT4 iiVCu+O1BYiFio3+JRG47ZIjNkzz5Bo47X9A4AZk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7597EF806C5; Tue, 12 Sep 2023 01:52: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 30A97F806C5; Tue, 12 Sep 2023 01:52:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DF8ADF80603; Tue, 12 Sep 2023 01:51:52 +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 7CD71F8057F for ; Tue, 12 Sep 2023 01:50:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7CD71F8057F 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=R5aG7bR1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U2jE3InQ6xbd+cLulFArGXYTavDsR51g0ngdFXj0uRZj8qqMt00ZGNN7iqqXVdkUrmRK9PFttQKLKPmrBNjbqbHE1N26aShKdXyZeNLqrvwR6hroKAI/A7IOXOzMpsWIEEKJrydNB8sqGTOuxAeXG2O1VGCXDXxqMDThNoAbx1ZOJQrJ24t11jwsabOQ/jYURiAzswEpxohGtNWATjbg1BeYoced2IgCMUZnJ9OANbVrjygQGzLrP5iB1UHrIUMo724WnFceSgWSLcG1pNW+uPQxhcEQSrL5Abi+5bULwHZf3uAVUn/fRxrWlvVLy/rnDvGPERbYH7bxg18MdoV9cA== 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=RT6azurZlOhBxIy93FZ+Zjg/oC75TCXc//lc2adlE24=; b=hf+ZCoasrF+fWHjtJeubZuJi3dAFvCom31uEVfDOkTTK2mra5k8TR8y+zOX6KZXFKa949X/3+d+3J2OEpbRQSR5f7vczezFBvKd9hOAoh0XAiqbseOaZ4WCq8Fy1dP4vwspkxtTKFs/MsGhZQOXKh6C0X5VoXdTSPoTbJPhXXdZTfFLCycChAcvOc64QY9ZYfCh6V7EMU8MADYv8zRwM8pOzxbks71fU0FLGlr+t1FaLmig4tU60EJHLu9/fmShKz1FDLnkWkzvDaq9QKpI7OziIx+dmH/ANakyew8PNJVj4I/31pT324X6HDUbb+jjQNnzWKxLxhnU1smEzC6lkIA== 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=RT6azurZlOhBxIy93FZ+Zjg/oC75TCXc//lc2adlE24=; b=R5aG7bR15ivUQj3Z4U2wFGyFSLgF8bpHUce1dD7IRu28tw3leDHasiNSRTT5zndUpg7Tut9g+XhHZkGW0RXJgnwL8F0MEcr63k1phJ8oZQFb4AQzbaGB3xaWvHARQreELqSGeo5gpnaXk+YZqjXchcsEIoRIk6Itw9Df6D1qbWU= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:30 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:30 +0000 Message-ID: <874jk0qnga.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 34/54] ASoC: soundwire: convert not to use asoc_xxx() In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:29 +0000 X-ClientProxiedBy: TY1PR01CA0187.jpnprd01.prod.outlook.com (2603:1096:403::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 1cad44f7-0e0a-490b-d371-08dbb321e16f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DdUepjM9FYhx1qIe2Ss4HUSmfuo++C8W+llogGfnATiT4H3LpQdjucJ2FIWW3EVnQGv/R+y7lVhgMeEP/TSMAPxwpW/XVwkPIb+7bCv2Zi6+8DvzfRNS8YXvd7UMgc5GytLHj9i4MWTMqlMWdDyClfvRsuHLmf0tKMETsKUy6Aivjt/1nf9eFBnzcEld4aoXdHFE/rXZZ1duJSpKCZRNyn7kxqhbog3hwL6K5wOhbWg6kjMjS4MeaBR+WjhDaVUgjUHHDRJOXkOv3aG+lWT9RZh6t/ZqBgYgmMqwazuPwvkvsUJcno+dhiy0Yb22y8g5wrJBAusIyQMy8kUZRRoqusZvTCcnGJv9QFRiR6PS2QarnrdhZHOxRbWIf4cIkq5RbhyedLQYaNfaTRir2dl4Yw2HLcV69yDa39A0/Gsd5j/K4h4QibZDH8zJuK2+omkV8k0JblVjmzQIdWqqOlYYZ3aOFcbGDuq6Q10dNyqIUd/EKbU6hLe/TI+7UHg72/tgguiG0zstAo+nuJFY9Jd513DGjiXm/25VMLax5XDjYOKWuPo6vQ0voFueVrQ0aCYmIhPwCXuSgoWQHYXaz9XmKLAkKIQqgqLxqmCKf8VMYXEVfRbTYVNTfVzSHC13e5Vm8raVFaXZrtimeFFO765X5w== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V9u7ZB3upbTYDiox0/2NhLGb8Pn4FfTkylhuLlfNl57PefOmj1+ysIpibKpl2yPTqWSkDcM5XlNWj9QtDI56q4jwMlw3MBJ25JTnAWMwe9RTbl4A6n91LCIKDykUuENKcp+w7qXAe1+9vDuvdGOLFZaiWQAqO94SC7H9mlXmbGZgJOq1HGtQmjTKX4f3bFD8CcJIyKH+yFfkzXJi7nkiE0dst4c0FXBXQdXuzeSHx4LDQiQhtoRMh7q0wAzHaEMIbzmeyv8G6YT4tZA3ImH6wHUY3rUx/9oAPV790WKpkRV6CAGb+RM4sHZUnqCKI6zW6s7J/rvuMc4i36lj/l4CBOx45H5Mw7mGV1pfm6vRLYUJvzLxZpauDxh6CjBoWADnyrsSHHf3F3ovHRcHOKWhf+X04YeUCthEKPuXFx6l0FolLNQb30SoEGBjDQ3AWmSGLUFDXUXuPSE1Js9fW8WYkF5JPRj9U78fdPKxnyWXd8Zl4qpsg22fC9y6wmz34FzP+LGvc/H+SvQWXFIXlNuFC4v/KJGntn3HcRVGY9YEuc9R1/FgKL4kvbr5B5xakrW2EYtGo41boap7en0AwRG1iKI5Z28XBqtyaAjzQCq8230Fi42bpkFM4+dvT/OIcCzgfOZ5ahve48b0ddTyyfFT0xGb3AigTz8fO1Dnd8cBu7nSnU6vZOta3qxWi4lO0mmNmYDMhQ3R4ZOzc/IpymNgP0qurmfCxDsdI6MSsKPk2SK9O2kmsOpiuJ4pQ3qJKCJ6yTywSoLG4KlrCg6wW1kGJMREJ8t6z/ojKBK7ZWVpDuEKuu44UNeyA3FTeNkJXDlzzgwCbjvyVe0Ih5f+ro1faQ/oPbAeemctTSx+i6jmdw+9DGr0rKwYjuhGYO33XDN1u8xrjxBjgc7QtSXtiSr3CundDQWBqrjzioTnKvXnsRntRlX6yPfZfEIatpcYzmGt9xNDyK15VyfviKZCrtfBEyxw7vYQEtj/lF8y46+e+N3Oh++FPsaEDUH/iTC9VHCbVl/3vvmkH1bETjhmXS5gCc8+bqPN6dAs27aeptkxQY+6OoC996FMTWCk1t5+YQ68PCIarAV5URI0DGNiaOchrjMEPtna2hOsrN0GyWFwwGNeElXRfFa/wPLJ+g/dKScAd1lxm46kJ5cWKH3DYnCx3/KXE2LIapIAOrxpCMPZ2WcyCvxOmhAcv9FnEcNurzNenUU7q79fUZWyuUF2wMnZf9Rjdwna+LYKr+ED/su0+jGcg1ccaD9q203R1ee5F1KHLVMhLoDEJfYKzCelvdNBviqJ5kafbPnxvqT9AUp9OHZBbkrVY+QNaUynW2k8PT7oHyUquy1g7UlX/zRd8E3wl1mzYiHQAFzxbhKUgTgpyOP7sKmud+pSJI4AdCj/NuMMcG1w0H5vqV7ju+8dNuaFyZP20lifA4eg24ZFXQSp+SRJr71ZaytdzFrp0MHsVbJTXQB6v8rWzrFygDpA8Szb+qDTKhdpygp0WP8TBek48u0kWs/hySYLlPSqKrK4xSAZMqeUYzuMFSaAm/KcuwM3Nzhrh4jx9H9SQAIiNPVLH7gmK7xmgEjOIplPxv/RRN4OeFmKeqQHo5BDqINZHF4kqsaiyC20fGuRohxII1HlGls= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cad44f7-0e0a-490b-d371-08dbb321e16f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:30.1952 (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: dwWwfXfHuqnSU9EV2bZjyXr8ffBHF2jZoC/ltU6UEEE1JVdoDq+Z2cEeOJ2QTRIVW+cK3MW+Rrtl9y5GCG7aFz8677Tc2H1kap9CQ4U5HUqFRl9iXr6HQJ40UioEfVj+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: B3GULRLUOKLU344QN6TKY6ROLSIOMIVJ X-Message-ID-Hash: B3GULRLUOKLU344QN6TKY6ROLSIOMIVJ 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: Vinod Koul --- 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 26d8485427dd2..1287a325c4359 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 a9d25ae0b73fe..82672fcbc2aa2 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 d77a8a0d42c8d..69719b335bcb1 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 Mon Sep 11 23:50: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: 13380412 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 0937DCA0EC6 for ; Mon, 11 Sep 2023 23:58: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 17C90EBF; Tue, 12 Sep 2023 01:57:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 17C90EBF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476708; bh=+2GXE/nA+K/mnqT6UvReuUoPQ59+iWTUCQvkW4V1KFg=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Dpn2v4i6N0Oo+sM4YTxQ+bZ7+CrrMGghfQ12WmRxogRAvpT5bfuJmjFaxawtrJh3J UpLN4K0KpKCcHtA7uUASfcH86RuQCbnCczukU+Ol1xabIEQGKPVJnzQhG2e1VGF7zs BK4F+FJ0zbwdzXnq4BNL7kLVLw/5R5/i6+tn4svk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D6BC6F806D4; Tue, 12 Sep 2023 01:52: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 943E8F805B0; Tue, 12 Sep 2023 01:52:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 60F8BF8059F; Tue, 12 Sep 2023 01:52:17 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72f]) (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 89439F80571 for ; Tue, 12 Sep 2023 01:50:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 89439F80571 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=Q6HUeh2g ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SD8xTX2RqZ/Dab5oGy3m6aAUgJOJ13msk4D7un82OLWkukca0DRC+ZYlzSZga9h7t2so1s+k7Vv7ZPWbCfSdeKXgAiTK3jpndcZxzmG6hX3eoJEGsBaX/Mlf6eGRwjr0g1TXRsZZ3wAwShTSNXU9gVnS4TatA45HMnwpbZeYZ63e6dXjupB+Zg6VIe4ms+HWVU2oi0CHG6dPTcPY34DjgiUaFkHh3Hx77XOxnK0yJiCIif6LUGx9eDlzs/ok97mVcNVo5t/WMuSnII1TIPZ1SP0yV8bAEqgtTITCKP81Z9KDFQM3NP7A0FKfyRyulpJQ14rVe9tNkh2UjsvVGQ8a5A== 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=C2NPmvmV7pQElnrZUo1G2r1JAjzSTE8xJ6cCzVYOy9A=; b=aN0L/7la+Y9WSQOvN1XFbTq/TUk5B/ezmvAuvA+KxbpUpGQ+u9GZ7su1pjNLvv4oL0G19GqyrdVx2Nc+vJIgcrAjT2HEAG8Mafw7eK6RMf4rhQt41vyMctktj+oiDO9caeD5+aTOLu1dhULT9DMa9I6SGev8xIFdWdy1lrBG8axUzp8rApwv1YV0cmPeqPPkusgEZaWLoWD9v61ZnaZOCgz6IfF7fXj43UVxGdPPEtbjlJ0JC8wPSRclSF1YJfuY5gI97NFV2UrAHRGvC2i6VjpFRtWG/cbhuhJZNe5bmiAdiqRRS7+Hl6mHXb8cvT7uhF2oLp/+4Z203Zhk5Km8CQ== 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=C2NPmvmV7pQElnrZUo1G2r1JAjzSTE8xJ6cCzVYOy9A=; b=Q6HUeh2gdklZTkfHSnptPVv8kLru3jJND3/1IuqIXx7zW7p11qd8E99Xb5sqj93LMJDIxlbnJxiDK7XpUZe4g6FRWacQulbRAfccYRStC1S27I5jMOq3W1YtuEicY5rW0OEE1aCtYxTEFrxy6Au+qlgel89M15soD1tU4+TFDNo= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:35 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:35 +0000 Message-ID: <8734zkqng5.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 35/54] ASoC: intel: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:35 +0000 X-ClientProxiedBy: TYWP286CA0031.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 7984847c-5bbd-4143-d3a8-08dbb321e4c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VE5E3XXIjLVp9qTCSWa5tpSd6Us5hQ1eDkjlWqRdZAatmzZlTVsYV6GR8x/5KiRincvIyE425xg5rWa+LtZ6TUVYyYTE4oG88sGPNefPtMxuwAXNaiBNiBiYMWZMsH5YIFePSE1x5tvjDaJ1BvnE6mwnju7ClDy4giVc8y43N0Zrm65Gbyqsqxav+XX2Fq8qbpM7fCt/KgZOmPGZUuXA78sCehtn4NQ3NnB24ALVN/7unAOn5lBQzafB+bXeGZ9dLV/YWG0Akw6+Ym8/MuWL+OLWcE4ROoUhaO50Ph1ef8SfYLuCWTKnn+Xn4JUBWddda1If41U3PpqVxsL6q+YZINR+a70YsJj/JThs+l8G7OsCK3QtnyE8mesGHj4FwAkUtA/9PSTwmJxVnNpVmr0Kibn09RCIuzcQmcsJOLzpy4dWlhBf4MdGFGS3G7AkZ+kvRZ4/9rHnoL6uVCQqZ6F9FeFMmy7fqgBJlyEygToJpEkrjmFq71SmPJX5KZ4lGdZa2pTTExhMxkGyZq9t6FbwZvC9XIFvnYs7w67ECjUBYUl0kDSQWIdg3AQDP8/dr++hX/v7iMgAsJCV+NFRxXIdDVYBNIDinuV9BxO2lG1PeQGjcxtPbYTaa/pzVXroVQRt4NPeWbO//B6ZhGkb3L3cgKYSPJUkIF++cU6nlGt+dGU= 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(921005)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(478600001)(30864003)(2616005)(26005)(21314003)(559001)(579004);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +t2yXBoo805EoWX98Jzt5DCf8nGOFpnZeCJtd4FYinr3TO+DjAra2u/hpvJAOS3RHZWwoMbipLw3XhezPn4gbTXRicwVxlJRvFhbH+X5VmxZkcFGxDOFbqFE9hSV3vfSoWMoGAkDpOT7zMc5ZPjEHwUM+GB5/4bf/HaE7WfZPFdo0+Ol1HB+9xoqaEOqSanvbS3Pt2u3DFnx0TEyztVrCg9UDOwXO55WO9zfILqU7jyfZSxYyM2jAy7HOUWF8svRlnYWmQ1DRKd1k9akKNPNe8K2IPe6VlzJWUiSAhjtFsddrfSUBJ5sR4/O7M9pfOPx/BKSg8x7GUYNw4pNmvFHIXHw6zL1E5fRoFObfqO5yUgPJ/7l/ZWP4ehURyKa1rFTB5aGR+N+FiyJ8HqgbMXyDovh1LSU1pfP/mETvmXCNXsUFOhM5uyxfQ78kYPwTmls27k/QgXGImucRTEwMaHNhAooXR0i5JTOYR+2s+FPiPkgeyekqz9KMZaKtV623i1x0XCUY5xcZJltBxDYvfQPknyiSP+2jlHIszwLv81yCnb+L3FexGnpnzaYEVfx0iBr3nMxiAbNau1F6j1DQyroAFtn719acDskT1x8vpNMFIxJIpeFFyUe6HbTXKHmR8jd0s5c9vSIacCKcgwigelYDitYf16TlGV8GSCPPYNA0b9NqrTKkIJ6c6krzMJHNRjuDeusNMgxxlnGytm4pfawDBjBkfDfroo8nO0euRGuK7dnwzAWrHo5s8iAojFkvtJEvSxfCP/uGJpuDEmdlQVQ+7ofegkqVj0v8LQnpvUQsu+UooznFENi3lk6vPiFH/rfSci9pcstZs45nIYCDAgz+rksXrHt/Q7u4VLRgX3hSAlB6CP7PglXvXEKdNreNRinjlMqoFIcCy+BEOWCUb9COjhHV42838LIASsDYSrlk+A39OF6ddfAmUOIVzcQwl3bXVQSprKS6eHGSJt9kn5ORnz8juWtiUiwBiv0EfGak0RFEuf3uUSobgmz+XQyCw8/FiiBTBQzDv4L+anqXKG+PJ4sXuy0NBFFeYD+qz3qXQq9+A5t04mKsIlQ/xbuP/zOqtiQ3muwi5MktbmsHuAAxYo7pCB2yPfqsrsKyaZG1QKxKrbBZ3y3dr022ARpOgjqrSgYZ9WtA4ZhQRi3ZBtJyb+YhkG5AUhscoEBAAO7WDGLAD91ABBLKx4fo1kx/t0zcK2M6WyfgbCHf02VHrBp6WG4zL5Aexk+3zhah1n+iO9aIKozYAooktSJRywmF2HvfZZtyksIxivdfV9fU7LpGwCgatxjdM/Q9Hcm97SRi+e5XoZlJw4FoXgJtx8ROLWr3Q9GEGOs5Ikv4USzhsqZYTvSvX2SsAw4yubqnfArgk3qOehlaSJ6c7aHelWXtsRvFah6Oxtcxq3cZeM28xaM57BaZVpkockGrNBgMCWdfFv0Dhw8mrpIe+TN6KKxLjm0FGx4qO5bR8Qttj7Wx/J6HOy6rqZimTiQJ79IvUw1hM8waEqfDcNFiOMZj1YekT+HOVcHk80SjDZHyQQ6kfoymYMMle1dWNjhu0YMmVU91/0CnF8y7LTFV2q2jtj7FnJwxYC6WLTiwGyeSJLjxDKr42oOlwpn2eoKk3PcrkHaNQk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7984847c-5bbd-4143-d3a8-08dbb321e4c2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:35.7799 (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: wKYEmzJU7Lma+qas8gFq7SlduSN3A/Z2JOOfCIhvtAMclaMVymJcDiQ/0DdZW0uR7TaflcVLPNEFodsx/3+E7DyPiHNRQTgK1XaF01q4JJemNXeejTPmSXpan/YMcvy9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: F56QLM25XRKT7QVLPDOO6KYJCQNL2EMF X-Message-ID-Hash: F56QLM25XRKT7QVLPDOO6KYJCQNL2EMF 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_max98373.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_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 +++++++++--------- 53 files changed, 233 insertions(+), 233 deletions(-) diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 6f986c7bbc8bc..8652b4a200206 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 d0682bc543c9a..3ae26f21458f3 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 f3e08d258ac17..304af3d06d017 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 036579331d8fb..7f20159c23e54 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 cbfff466c5c86..816fad8c1ff0e 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 bf89fe80423d0..4631106f2a282 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 9942a2de6f7a0..10a84a2c1036e 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 a3b0cfab17b05..7e5eea690023d 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 7a30d2d36f199..8a0b0e864fbb4 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 7fc03f2efd356..4a957d1cece35 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 630784b6cb6d3..ed14d9e4aa533 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 805afaf47b290..f9fe8414f454f 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 5c9e06ed1a535..643f1d0094c4c 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 850310de774be..f43bc20d6aae4 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 af2d9a78465d6..7651b83632fa4 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 875bc0b3d85da..df23a581c10e5 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 daa630a0efc18..f6da24f3c466e 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 20da83d9eeced..679a09b63ea59 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 fee80638cba27..686e603212243 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 cf0f89db3e204..657e4658234ce 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 050c53ebd6ba8..2a2fe27dff0e8 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 97149513076f9..a5d8965303a88 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 a1f8234c77bd2..98c11ec0adc01 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 2c7a547f63c90..30e0aca161cd5 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 2d4224c5b1520..9071b1f1cbd00 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 2c79fca57b19e..178fe9c37df62 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 a06e05154ae1f..6c6ef63cd5d9e 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 e13a5a4d8f7e9..0e7025834594a 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 575604dc8936d..fadc25a536b4b 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 4f3d655e2bfa8..c59c60e280916 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 8b8b07e4f2feb..e71e09124b34e 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 e6695e77d5943..f378e0fd1ff7a 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 */ @@ -503,7 +503,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_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c index bbd47e7e43430..eb1e0748cca1d 100644 --- a/sound/soc/intel/boards/sof_da7219_max98373.c +++ b/sound/soc/intel/boards/sof_da7219_max98373.c @@ -160,7 +160,7 @@ static struct snd_soc_jack headset; static int da7219_codec_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_component *component = codec_dai->component; struct snd_soc_jack *jack; int ret; @@ -202,11 +202,11 @@ static int da7219_codec_init(struct snd_soc_pcm_runtime *rtd) static int ssp1_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, MAXIM_DEV0_NAME)) { /* vmon_slot_no = 0 imon_slot_no = 1 for TX slots */ @@ -247,7 +247,7 @@ static struct snd_soc_codec_conf max98373_codec_conf[] = { 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 f8a3e8a91761a..4cafe20b14fef 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 628b6d5d3ee42..3c00afc328050 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 46b7ecf6f9f1a..61a18c32b4e70 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -67,7 +67,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); @@ -97,7 +97,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; @@ -136,7 +136,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); } @@ -144,8 +144,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 */ @@ -525,7 +525,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 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 9f673ccf81b54..b01cb23295425 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 6c12ca92f3713..80c8687cd1da5 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 fae091b9b55c5..ed0b86a228c8b 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -262,7 +262,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); @@ -292,7 +292,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; @@ -381,7 +381,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); } @@ -389,9 +389,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) { @@ -797,7 +797,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 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]; @@ -887,7 +887,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 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); @@ -914,7 +914,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_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 5a1c750e6ae6a..25d1cd78cbb95 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -515,12 +515,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)) { @@ -533,13 +533,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)) { @@ -573,7 +573,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; @@ -621,12 +621,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)) { @@ -1769,7 +1769,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) if (!idisp_components[i].dai_name) return -ENOMEM; } else { - idisp_components[i] = asoc_dummy_dlc; + idisp_components[i] = snd_soc_dummy_dlc; } cpu_name = devm_kasprintf(dev, GFP_KERNEL, @@ -1800,7 +1800,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) cpus[cpu_id].dai_name = cpu_name; init_dai_link(dev, dai_links + link_index, be_id, name, 1, 1, - cpus + cpu_id, 1, &asoc_dummy_dlc, 1, NULL, NULL); + cpus + cpu_id, 1, &snd_soc_dummy_dlc, 1, NULL, NULL); } card->dai_link = dai_links; diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c index ad130d913415e..436f41086da69 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_hdmi.c b/sound/soc/intel/boards/sof_sdw_hdmi.c index d47d8bf528c13..7e07aa685573d 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 414c4d8dac777..e36b8d8c70c9c 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 3a9be8211586f..7b7c9def398be 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 c93b1f5b94409..a1714afe85155 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 2b05e2a707dec..38782fdfcf154 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 26bf9e0dd3d24..436975b6bdc17 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 623e3bebb8884..ef62ac5fdf553 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 5aa16fd3939b9..8647d6c4572f7 100644 --- a/sound/soc/intel/boards/sof_ssp_amp.c +++ b/sound/soc/intel/boards/sof_ssp_amp.c @@ -170,7 +170,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); @@ -226,7 +226,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; - 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); @@ -324,7 +324,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 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]; @@ -352,7 +352,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 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 17224d26d9d6b..4cb0d463bf404 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 f1a5cb825ff1f..3daf5eb37f7ba 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 6b06b7b5ede86..e929497a5eb5d 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 ac3dc8c63c260..9f7b0a944bb13 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 Mon Sep 11 23:50: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: 13380411 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 7C227CA0EC3 for ; Mon, 11 Sep 2023 23:58:17 +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 E3C9EECE; Tue, 12 Sep 2023 01:57:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E3C9EECE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476695; bh=coA9QPdtjCkBGaQJkWT8b4JPoxiq+2Mp80xdlxFHSj0=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=YUwlme081mdf6ZxNUf6IWCK0WjAiZmfBTv34y/StB06VKITVDyY8Jirsa2BkysG+I Xr/87CMM7mA3qByHPcZlcwofs/R9aSzEbRY6e8gSqvlX8VoAIqjq+TUMBS7PEP4MbF LUsg6SNr8zlGycuhDaF/1jLw+TDo5I+yqzeUgrZw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A4903F80578; Tue, 12 Sep 2023 01:52: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 9CAB0F80578; Tue, 12 Sep 2023 01:52:20 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 14239F8059F; Tue, 12 Sep 2023 01:52:16 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72f]) (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 6F493F80431 for ; Tue, 12 Sep 2023 01:50:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6F493F80431 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=mhDVeOe4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KWwnbfghDEUGjPSQE8Fc0BE23x4ECQNbkE5QWwD4vf0poR+xcymlc1WAtI69tZGe4EvVi8zPU4v/XuUVB6Vvmlv0UwvRiHz6sDA3zLrfo91qnTsybYlBP7859qOhj5WzBLTdpIwJDg5kqpWPL/K2FO4wV7G5k+G6NEpWq+wjCkdvtqMfqumkwgers4y9we5me7kHkT0WRXxKxWG+KYUbGAzc3JLE9lndo/xkuNiNqR6BpR/UOJV9GCifPAEqr5xoLvA6gevW/HLNxCnu8h6efmo54EDSxHlNxHnmhqYmXud9yLS9MdbBtA5tLmLtZjemrG3brUiO72PWPFv5VyJd9w== 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=bRS34VjWYGJDkpRdsTJU7OBGFaL6JbJEuRLEaQypjbs=; b=Xquzk+g2Sp9vC2kbwKtb1Feff+Um1sWIw6qqa7XoZ3l40+AyMGw1VQPOL6ajTWXKNgGYrpU21HW6L3kC5viL6yuIF6TUxsEmG+JpM6EGizGPctqDbw61BdaOIeJJgX1inUCRSOVGtbseaNrd/tZ+nDKkYzqkfwTdsfFYkM5LiMAuuyYD1sN/L5rODx3ucP05i7nZ+nwiuJiwmyn3BbqW0ZdZmmnqWrmBCk1rR1zjNJsU9h5XpEyl9wTANZYTwkzo1DkIwEgxvAcGZS7DlE+L8q+mofeszRICSGi+hGq/4gygDtj1OJEG+VxH8yAE//GOEBbvWnTs7tylGQ/C1cvPHA== 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=bRS34VjWYGJDkpRdsTJU7OBGFaL6JbJEuRLEaQypjbs=; b=mhDVeOe4ZuL+qX/RbPZoNU3e/gugou196dVxcmXOxv9IwyrLqR3pY7faYShVmsVLkktEsYrXfZS+0jjxBu7KkAgu5VQ62B0F1sQtiWYIoKG+H3FX1l3F4mMEABOVGlyYgi8NNcaYvvhvUV2r2B8y/vbD7OKZ9ni3ygs7Jjti/+E= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:41 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:41 +0000 Message-ID: <871qf4qnfz.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 36/54] ASoC: intel: avs: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:41 +0000 X-ClientProxiedBy: TYCPR01CA0179.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 9629d117-0dca-4d54-57b9-08dbb321e85d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q8xs61/IBlGhogaE72vTy8q2IA3GWLe88GhzMv6unY4Rqb0AmcRRSApKDlVNMTwlyL1cJotPIL8B7zGKDoAlLqX25z2SiGbyPkpRcGDcCxs58O2UWXZztCxsMp5yZn1x59mO9NGyMG4XtuzqTP9yvUGf24ZCu+2ExP0BXj8izz4RsMi9zQNB2ioDkuAMcz+0Kz+h3fwD7ys/PKRr6EO9a273nECGK7sgk0KCH7BcupD/d8uCx285xLWwP5Z0CijkqjCXujeTNGJ1FicvrUFGGfsxVKIPhbs3bhj1bDBRZak8m2Hq9c5iNKNV+xULNQWcQrC2jCyaN4oeKBE725zyDaAnyM0KFbNHqNGM/yCM1XhaPadCtlCZLqVkJMQdjvVMEVXX0yr/q4kze7xYENk6E4w/o5Up0C5bfLZxip3SNcz2WmJ43lRJlkZg/634bioZWUgs5w0tQ7sZi3NQUOpPwlMZmnWIIKFL8jmAfPDk54ypt4jlImbcvmoDvW+G8KMjZYUGphVk0UQwAgPBDITQPFPAfqm6NewMbnbd0kvTIcC15opqs8ogJIGeHG1v9MTeUVkeNF+hlQXoOb0jvBXkI4xP79aoxlOuM8N7HfOZuqWT61iVnoeUxGEuI8y4m92NqLRIbUTVcCVBQ8hQ/ZcJVPI8e+kqqFNj+2rHTdB2T9E= 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(921005)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(478600001)(30864003)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mOGWpgGGYSjsWo7c5CODwXqM54gAqjTcy2+Vy5uQmPekILo0NAfTBxyzrqzi7AEUNILUHm8I4KaqWxS4gOOf7mLDAjVYJOM+e1OsbQye5GAs52xR+NRbCI9tG+eiO+aurHTEaXLSt+Kc3W08eXTCkIj9uURoByANdcKadXlObZaPCIm1YMLx2R47rBHgh7rvfUVehFoI3ry2Z0okAmRGEYVFz5G2NoRs1yMvhP2J1gXtfJpVqo5MZ1teYjbwIdWyoieieUAOBXiYjELvYR+smtqO6BF2XjszpKGf0UX2htVZYsyQuKDm3YUD2Gnh1ZE6q52x1Dd19lH5Zu1+XbdJu8/pBEvDIQbrG22NYE4jull644+vCdxbj2MC/ebt/yQTbnWzvlExm4jmmQOD8dYPLSVGco6hF4P8w0olHcpTqS+Lt6NbpMoPIRtwYqD//wsTo+qZGrcPvJUonFam9ldID8qn/cEe/nfjVeBDh4iAIJdnWXfde1BnErIHTJllbetuvaP+yqp9iSy7scPxM4UD0qDjGuAwem5nDvTjnUicAlJyUwPKmKg46KYMrs1cTFUHo81mxsP7RvQ7SIIi8GugI9lYw4+DcXxNUC8aqEBCy72T8z4uYC5rlC+OJxvzpslY6G4qbsmP+lDawQtNhqzawrTca+a/3PQ/EKl2xBZP0D7KSd84PZaO9gouUbFb8hNI0OtvqrSAhhFIv9oT8rsOHUkwe5erI2ai54177Te2qM9eAJ52f1OVLL7e8DEhNr4mkPtnMMpOnZxzohFo9WJBNuJSXU/0X1Vz3dheo4syo4OCKYeX8VcFMjKP7v0joHLTaiQ9LjjgiiPhsFAv+K2BqUCcx3PFkF4HN4SbRQ7CfZmfQ1Y3iK3KT1QKRcbTNbq75auSIyj1Vp87LRVzuBmelEuZY3rQKVmGb9sULCynciY1dvOGG0ciZQy3VWiqyvnQ0MuqKmDh/i5yiL5nT2GuwWKJF0d0YHxOVS5VlAYlwVfpDedzk4fbMo3HLo+wO+07nRRSBHfN1TcS2mj9iEZZxvi7iRM+m7vXGO4LXtEh+RZhbjJSMbwLKvhZyifYCyejYWwQ61FEXax6Wbr8A+LvugrsyYn0ov7ER4E7HXrkHTMb2tl4TDJwAaUknNuiYQKhoHINdwjt9Vbi6PMSAjg2X3OeP4ZQMO2Ey1IwGSLY6+InvlG8GUbcSTXQ2UK7fQ1USQVsLAK+ro6OI9rbRkhHe/M9FOGEXtgMZVExZamMK0VTDhRnyMidXrdve49n5qo9vuOex733dUAYu8FC8ZoI3xu1GD4sMQHUEpPH+Hobz+hP1QCOePmLa71pOX4t2NETUzCOeiYdwV9InE+kXLmiHHLWlZD5M7AptxqRZ5ceh65trp35W/g+ivAyvSg/gOTfvfOv02DlSCk6llJoAJ8xUKsZRLOTLDJMc12oOwoWfjXFSoDpmt5b5StdKg3SUsvmS1xzM8/Icc5pR3yL3kz1y5Qwf0uN09Ds7o5TxknqAmy/qwp4nuswr4GTgw9Kjgf8v1wLf1BPhXw8KBShd9c9+YOPu5zCqZ7su0EeHoYYpDlyH/9xSSIqDdpEOOIZMfoDHumNJ0k0wk+CFnuDMH6PWcUeKa58ehKbIPe9CjbzxQ4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9629d117-0dca-4d54-57b9-08dbb321e85d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:41.8045 (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: squFzTvTObb8Os3uV1yA7WaI/CsqHyBJMmlWieM4+wR3Bc0prebo8SzPp5RDknDG4tfbhuAojJABoCeUEExpCQIePJcV3mEtfdfkjtbk0zEiJ30F++VT6acteRBTeviK X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: HZ2PZYGWQYKPTVPN2VJAKL3RN2D5DD45 X-Message-ID-Hash: HZ2PZYGWQYKPTVPN2VJAKL3RN2D5DD45 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 85014d98f7e8a..2059d61567384 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 0a023f871d93a..6d2a7c8e445e4 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 bc3065c6ceda7..1dd0c59a8d91b 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 3833251ade265..7820435e3a53e 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 09b231bf4e6d6..ae465b231249c 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 38c5087d98e97..9f15b22a3c3f6 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 ebfee54814cee..b376d4c2d7063 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 84cf9a0c8dfed..36da0578d5b47 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 3b0e2b1a32519..3cd8057f0ed64 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 770b36d05bf42..2e84bd629766d 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 b93468ae09773..f1c46c6abd9de 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 7324869d61327..27eca051122d3 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 8565a530706d0..3f1f98e1a31a9 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 Mon Sep 11 23:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380413 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 863C6CA0EC3 for ; Mon, 11 Sep 2023 23:58: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 AA58BEA3; Tue, 12 Sep 2023 01:58:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AA58BEA3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476731; bh=v5W7QXExVEQhZM4vJF8ZiZCOPE/f4kYGhLHbP5hWm/4=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=fYWT6ojSH+n29kcrLnp/SbPUxIYwepsghuwTyC/1UhjBlSygCZ4Gja/G7A3SXPwit eYM9CajCrgvLwEPCLFGFmz3MKRz08lCLLiSct0oiIni0hyfUI5KYB2DsSjpy4m1brB Adzsf/WC21G+Jg8g4uvkhCEWAcPX7YPTtVAvcq+M= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 58EB8F80635; Tue, 12 Sep 2023 01:52: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 0CEBBF806DC; Tue, 12 Sep 2023 01:52:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 52579F805D5; Tue, 12 Sep 2023 01:52:24 +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 3D616F80622 for ; Tue, 12 Sep 2023 01:50:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3D616F80622 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=DAN7Sip2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n10j5Kc7Nvu1P/2zLLiIQv/VH/nzAk42VOAtZd/FDSZCW+Qj4bMZMYqzDTlCh9+kIF/f74qebpW8JcqW+i+WHQnkhM2fb5nb5AKeozhjrIaHODg/EAbaJ7XeJtjSzheg7f9K/v1aukiFwrv+op0Xhl/GnDi2/9AZO50qNZTEXvuA1OXY4gzLwI2G3ZrKrDT03k2f0BebU7H1EcjBZZftxLrSMHc+AaASry5dDvdevg9Zmv6QdXdhJO6wRHWCU37JZPUA1UrA5LtP2/vwZoHfQkZAS0VrO7/us+PR6AJK2Q6SKOcvufDk9DLeizBLViqSsEKtn5REizuN09DKCV6ZiQ== 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=pLuXRdGRb9ea6U0f6mW3pf54V923Yv/oZYI/Z/UmneA=; b=ISWIc3BEGqLVtA+pqs7KOYaPmRmKl0pYgao/zEXkqFJjKQqYCCl0xNDTKSRYdQtEWt6/acm3HlSOOCyiF08oGPakAQb31jjRB1pkDunR7BAyDHCc0YRVmgDvQqcW+GuNp+rOarkXXcTQf9V2J5XUY0jWFkiP8K4rS91lIaDlsAF0rVQs3qQRyUMhVY8k9HAxzXQI65i+G9zMNhMQpiS95m4HHbtQD7HPHd61Fj0T0mpCbQjbznG0twOK1Gl/1A9oni1HTnq64PmOLF5h0sVDylqKYxYD/xvXO1DOU5sZz4FqsTKObsmFJRuvWWYk3sbCL/RtWJZmQfBxZfpAT0urgA== 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=pLuXRdGRb9ea6U0f6mW3pf54V923Yv/oZYI/Z/UmneA=; b=DAN7Sip2kfs8e0XA2euc0+70fh5Zp5SzIrF3Z9/63C3Uf7qVy2cTZ9xIFVL2HJZugoM1+ENRUc0qY+uMthbyjmjEGlTXM5ZLlWGjL8ni0s/r/3leAW0ubXQ2DiTu2PmHyBgGCHBNo873REreAtossh3oSfwen27LjVEsk4zDqvk= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:47 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:47 +0000 Message-ID: <87zg1sp8vd.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 37/54] ASoC: codec: wm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:47 +0000 X-ClientProxiedBy: TYWPR01CA0007.jpnprd01.prod.outlook.com (2603:1096:400:a9::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 03d22d4d-0b58-47b6-ce97-08dbb321eba6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CVbxOjHteEV5caRo6CCUgA9A12xoZVgcS3a0RvRUAFyGzN/aUxChU40c2a2JF1HUiTrw+gcXpXCm/JCX+8WcVmYqkcbgSTM6BglDNkyVhx9KRTkzYY1WuY3u6RxVz9PQTcTpjo1wpf1VjpzyHgH9P7EjZCc9mpsUewpGglfyNb0dsJ1yxG+aCqkXXDD6np7jbIzYdnWBNnnIdkVqKD0CNBFoQIh8NC0WXjVzQbVhU/hiuduAQZH7Qt7paoyrlkMYyUiX6WpNzNDqcCCFqkOFU4oC4E1fNxqvirxGMN6WblB90zlZO+fpmGJyuSTnhFDpYXENo3WlbrQ9G+FyN0HeLgdP8agES6uVrxhriH2vnsungiCUuApsqGtlCvPHNsYu78UZmC/8Dge9ZpeKHaNaSQgBQca4gZHApOKVuf5KNzAsn86NglzOxl/EnIMnl3KLSPqQ4IQdG29bbIaeJnXMv+sSFdvIOTS0vARvQS3TV5CZ5qb9ahnUxSSrIFtQyJzn7/7CEF7UHKONGl185EUqQaQAml/BUBrKz1gp3ijGx4JiukFZyINZ2ccdHW0ZbOiOKzoDs1cmtJ/+RxVPVRBz05YZ4CCKuIWJdpa5CqhY7h98Wr83F/UgThp7CMQMXx+F7sR/nvyGVsE+H5NWzuBi6g== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jl22lUNafb5csC9oHLkNflxEE9ItXvJljxWRK2gd3H6H8uc6ksrJa4T5sUvnxyiUc3j83QZfWDgQ2lFAnRFCK6hmnx7qPDCzGpYHPI+74D36fNvZaNYmI2HxP8bqGwR533o7N2W3FrUf6nOsYExAQg+C7ahgmsVwl3LJiJvx4yNxb4Xymj9tVdFQHxxkQD4te1lJkk+PyqMX2gXO6W0xt1BgYuVI2ucDbrKV+b+UgkDq1Ld1VrkJjQvzE0O6WS/xUMofSPN3TNhqqYF9xS5auUCRzR19cs0XCt7qAwKAr4OkhJozAwdBgMySMZtBjISBQUaGYMKeQzHza7y298toFmEb563DXNzg0U7X55q4Y0Y5/tWVFz9CPn9d8KAvSyO2ipkjoHPBb5nuG1bT17l9qoBRMGzsisK04PjqYpTWCwUv/l9JgK7Rn57gn0Ave3RyBtNrXbCAoVTW5ak3OyhE6dUGsq1mRyj5hO03BnkQa6s/b7lCmZlQ5sHN3OUzuRmvcqyXOH84345GJnaxFGssWcSfQIulBEYTzwjPs/iLDSsKDfA3q8xeWcXwSyhS9Ym+ySCURV1ti6GjL1FtlZp6yL2kJ2ejPPoFeCFDgS+Q1hbyeoSin2Vbj7MrWfI3kPLMmwpmRk3/hmGeMN5kNHjY4ESJ2ljclBAgDQkkDBq3Pi/JTthJ9paVm2gHmvWAskxpZQFqUlGU42Cqu60/2nbeE+xIP/6WUiGACJ3nPqH+4s8cKc858787q4Is576EYIuVdBtSC2NF2gKPk3Lk2FJN4ogDRqUZupmAqgW03h2b4VGZTIaL3Oqc8QeHlIPYyen/mlC8F1I2gfrmUAznfeAX1/vKkEu6Tsp40xX+Xw1dM8zIC1NfdIf03LNlRap1EczTvDnXPzHodYV0Y0a6QyZF85LpmfmFs1aInHbgaeINi9lylSjPckNECU5PMMfgYcwIAZ0tYR2sK94Hl1CX4savSQ8Mbv1LeT0VAah2Q5+e3sboEJq5mFOhOXMr38HQeRwFy7t4AjeprDfcsiHXldQLtC9Sf4TEUqrZOGGhBYCQBaMbcQHRzB7nXpxzGI1ngf7c2vZLFuXI+xOtOOF7A8HdGqprmzT1/HS4H7h0FqsGQc+9zIvAhq422njhnhjxw73l7maeNCo2hY1dk0gIghwx3g0QQl/7HuL5vFdOZY0mbGIm8kq+4B4Kf2qycZYk2GA98krOaADePZFekz8K2HjOTBZjixWl3+G+ll+UO573SjFzN/bn2wuw7rKaZIh3QkMsUWaZCTQSK2xh+qBnAaghqbNOsbsAzRXDWTQ6PkptJgXVWmZurQVGFoSOIhbKsY7EFGv2iRU3HN4uD+YSPiA9V2bYTbw5N4d3AHJ12qEgmjgOiSTdEMT8hO9Wp0Q9cRZPiMl45fXxPKtZ3HtNIeoWEEcGAk0vzu6tvi1xxdNZskeqcX6VcpicxQ7BAb20tXkltcUvnuNeS/OfLnhPosLnLWrg3hVjquxY9oiOFF/d0WI7w3ROHCPHghTelLOrL8HYlIbajU1IuYdd6PISFE1z20bXsJBoGaUBRyoqmo/7+bp8xZkJSGCD3YHA7cNsD3NE4fqdtccCEakhRHOVwFjb8EOUbNrdUmfERi/Frdov63o= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03d22d4d-0b58-47b6-ce97-08dbb321eba6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:47.3116 (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: F3jJqfFgEr54IfOTPrn8efqM+pHa81FmxaihsJA+f6qPz5iW/rWFp/IzHL19oN3Q2Lf4U2wIFpkrBafmyndvo80aPOaDADXVbBz8OCDww5agarhEkSx/OGPMGRStLGS3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: CXLTR7NZ6M5MWKH4REVL4FKNLKJKB533 X-Message-ID-Hash: CXLTR7NZ6M5MWKH4REVL4FKNLKJKB533 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 ac1f2c8503465..0f299cd07b2e9 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 6fc34f41b1758..db847e80a9c60 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 Mon Sep 11 23:50: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: 13380414 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 E7ACFCA0EC3 for ; Mon, 11 Sep 2023 23:59: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 44484EA6; Tue, 12 Sep 2023 01:58:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 44484EA6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476749; bh=tnpT/IZH/Ok7pZ9BvfleC1kJCFvrpBQ/ZA2eNDKiE2s=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=vBVDfo11AMftA71xfJODvf0uaiUuMSWrk7Os6Tr6lC4NrXn1Q1BUlG9PxLJh/btku hPlYjSNwMRIeULeij/MWgeBqO7wnFsWJ/9nMba9m9yqNCH+oEAI1EeWrxdx40wA/yk U0NE3kXssKmEjz90qtmRXKzi54o5UlUwX5OMFAUA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E7206F805C6; Tue, 12 Sep 2023 01:52: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 0FA64F805C6; Tue, 12 Sep 2023 01:52:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 73776F805CB; Tue, 12 Sep 2023 01:52:35 +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 72EBDF805E9 for ; Tue, 12 Sep 2023 01:50:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 72EBDF805E9 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+MC3R2R ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m1C4IE1vpY1yOOO4y7WoEsuuPmAsFRVngsTB9OX5RjjSOkvluyL4UmSmCfdlTfv7EwjlUNTMHJMaBi/J700+TAB44mzyEKpKOL05Td3rvU3Ia3KflSMkY/HTEypli6MPMSEHTzndKKUvnX5PcOsAeVmaoZkGXZuUWpyqDYZlurmfAs+mHvAXDyzPDcDyMjFHj/w7FMt108YH8pTvv3Di0mfYcxcZbGXIsS7hd8ibybtiBs4KxSYiAW04aYymL79RX+gtolZj82cKI7WFiSwlMBKzKgyVVfeKSzbdVr4Ok826lcGsIH3J1mnsn4hNJi3PFj6snB9hnsl+bZ6H4S9d1w== 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=2796x5QOoBlMgwA+IuQCvVThTJT+wuDUntIloEwzVq8=; b=Ta/LmgQHiN06xGRjXJLaa6Jss+MGUyJkk0JBwvFNKj6jAxeijGOqgfkf7U2yC5BCjaPloKLrz9x71MlMdce6bqPMPzsekUcqIjXb9Os2PsBnGXQlAe2dXcly1vws1HR+FMt11N0Wy/y9hxJDWaEc0zMeEnBnnMpZcOzenDu6JXp8E1ZHPDnnZqhXAljaEUbco/aaH94dICLhALU/VLVTvQSz69RECWdBluyifGcZEu8uHg0n9b5UGaVZ7aSlJErOX6zHX4cHVnDpf+H59JGhPFWYEg07ZEeYrv9oRJgpDly0ezaTC3uscyJ6v0L4jqAmB8dtPH6nOzXIMgbg0UOkOw== 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=2796x5QOoBlMgwA+IuQCvVThTJT+wuDUntIloEwzVq8=; b=E+MC3R2RojrewheWu3P+tnLDV/L8tMGupIwP5pSMErs3yII2Yy4d69DfQd1pxBFrda9rY9z1GbPD1Wdd296e8+axg1qb/6rzYBSCRAZBifP/ay19C8FTod+xZ2lCGorVUUzblA2KR3oAQkqCTqGx/v0NFonR1htH7tCB8fpfJLs= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:52 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:52 +0000 Message-ID: <87y1hcp8v8.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 38/54] ASoC: codec: rt5677: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:52 +0000 X-ClientProxiedBy: TY2PR06CA0013.apcprd06.prod.outlook.com (2603:1096:404:42::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e0fcc7c-dc78-413f-11f4-08dbb321eeb7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: drEVcUYq8bHKoxX9HHe3B3MO+8r5FCDR7NYiqmsAHlcWP8AnAASmCKpNIbaiaa+d8+J7Xd7rTZvXyRBd+kvfRQu0Kzh1bUDfRGdIneh47tlYQFV7CJcuUoCd5kXSKJI+2d1XGycI4Cbp4UtWTby/FFONh3ZlOgy0i4Wyfy8O7zBUSG520Xijuv/6xbrFoZNeTnhgiE5y5nuD5XxuA8syj8Np4UnI1t4pXpPYEZLXtRfdF8L//W1u+2AYy36zjgQfRaqCM9CYFKoa5icBirJQQOwSop3ji+1k8wEqW+IHAQxSRvcDhnNkmHs6qkbjaaP6odZKqaXGPU94e13rBWXhkbKVhNsNPObt/bV589Cax8NFD5LqpfL/RLyk5saIY3i65AzkkoElQ5GUkmYPR/LtRkclacCTQyunpT57V+KARI3Cm4ldruuOWAu5KFaiNYI75+buDk/SFkwq/kw3/Q3m1iqgMIpugyX/fqzggCPhXYD6JE08eozUm+XlG6KOi7jbGxk0iI3Nhmx9iK9X/wVbtqoPfEdYbrujQ8EZ4IZ5ggFhRAbZ1eZsQIckts6Wyag1/y0FPOc4a7eC3H9sxisdFGUVEtiKhe3zKDxeMpGPsC7DIbmcrbGtnFvYvQ7GHWxcvxZEYM20vCE1iKaK1DbgcQ== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /sMW/bj4twGd/UguL1+45JXJH+P5U8Q4VajZMV07vay90DxkYD8OzFfavpqRO1piCP7JasCZsAjbGEm0aWpmgeRsQxSPAkZ3dIzleuEDftfPE0XKB32ijysTBffv3nvpW4VUHZHDf5QNVINrJC4VQY8WRsn505GZK5pnsZJY50GLdayswCyHMZEuxeqbXxsev6xkW4Yz8UuR8OiRNK05QhjqdJ+y+GrYa/TKDkynyr5M2TUZ6eJmIpCGlif5WthuyY1dCA+9gruPE8LB/Xqgi87ZXJSqwcG/k0l15KOqusJN5kuKrQ63+g92xA7y91x0RgdlF5vI7nM71sw48bNZKGvtWxmfLkUistOfULQu05lZJxLPipU6oWqWW5AsTN/mxeaNkLgYTtFKe+96rT68SCSm1RkIKwv6oocJJFRUbrvfgSXP+TnAc1FDv1EdtRFjbqrE4bzQ0bIxKCrdsda8xdjQ7/UZnHgbBGNeVemCgywEJNYRpiNVstUlLmeB6aHnkzOIRhPoF6clSbBKuC2fSrwk//4B9Ch+rxQXpSD/T8dldy1WHMVAWnMJ9lH7myjcCiIU9/0q34rjIRFLHy/AdhiALoP3nIbRac8Wr5anlR35IiASvLav/87vX8vCtLW0/E7sXCg+zsIUOI4L/Atm6kmEQu+47KC85aPpZE3OBDwBjOXKDWSDGWHpiFsNcTMcypmmp15Rgugq+l5in0k+UK7zjOLoZ0ua6TLSkA56tLgu/ZXGmWDM/Vd4ZwC5ZaLlLi05NkALO146WjLf1kSueu/OBeup+aHWYbFYMzV5XX4I6CZ3OcEChNIu5miDHmSXKUP8ZEVIsTkmqUaxYHhFWN8x3/PjxQHUcHMB4XVXLjLXzbInGZeQCqF/FXQErdstbrh+Um5UX/k4G3hA4sjH1fURTO3ryVycO8PtRuB0hNR3JVY3Bo8hnMmU2VvrRvEj4mJTfRzKYDI6/nYH8qaZf2SvTuFwpwSVMAw+i7JDpxBypha11tgWiSgqP3ezphaG2XPgUvbRgwCxhgUKTrj2WfhH79ck3W2MUJ4ohd6mljVYQLIOVHmrV1mC34JvnguYPrgK83u6HVlGxeLAN4/jo8bbpa0FHSWxhWllARlqW0oZVwnURIC8BmGZ+XeATXp9SqisqTaoCDvwJ6vG59Jwr7foqGJDHSE+9t3I38Q4MEzxFQOuOrYc+XXZXIY5Zln6Ce1fAvhXEudjhHHE6hTuLwmCpGpFq/FeTfmK3T7h+n2a2O3RWOQjmnCIFM/puQmhaV3l7kE3N1s7d1km9jfCA12xZExhEQJrUvckRsoZTKlKfZOQFT+Boj+GFsUbNOWqeVsXZdAzXEErKBO4WiHkHXsqSId7jOiSNN3jLizrwLzvHvN4M7sZ+HgnLx0ygkLM2mbWjo87uq5Mdemv/jSeaD8vE8uC3hqo32mbF5yA/lSUa/6q5bHCB2jeMERLtFs20Kv6Ddos7lrK5ubC2WfPcQM8kp9CoSKXaCGYCQGBQrsOvzS/m/oCcfkCIYFCS09Odsc9ILEalYGZ9XL5qmYJw3CJC/GJ+54kH/U0zyGXG5TItxTgGHnp2OqxFFT0QcDusKYmQvZIqZwE77Bb5m6l7LqhtTnD0BONAc/SX+qle7o= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e0fcc7c-dc78-413f-11f4-08dbb321eeb7 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:52.4267 (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: S53lYMJbYKGhnfsADycsMMJpga3+KtnpC0oj0+EQ1Ttqf3YfkMZpAgqBuIskUfhnfweII/e73frz2wPiES9KdyYxKCz4OEKNDE8uuI2Sab21OUwMHWiGMrZR+kBcpPvN X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: AF4TSADWRTS64J3WSJ3U7KZ74W2UNVBF X-Message-ID-Hash: AF4TSADWRTS64J3WSJ3U7KZ74W2UNVBF 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 d25703dd74996..d91a2184f67c0 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 Mon Sep 11 23:50: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: 13380418 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 1BFDDCA0EC3 for ; Tue, 12 Sep 2023 00:00: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 D5313EC1; Tue, 12 Sep 2023 01:59:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D5313EC1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476809; bh=yNp2LxkVhN+N667EtR4Kka7aItx4vpddhRWIzUP591E=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=fzXPr53ir0BVOI8JU3d1tY+z/lKvWBWbIqSRDv1lQjoUSdwtj9pjLucojeWMcxXK/ 4IXjnTNZ0DBqrzdhjcEsxBH/x/2L5+IZjBUa9EYQdJwC5bD/6yiETHknseu0vLu5d/ o+swGUdaybpLKwn/nMXxWEs7BQlA882QHnlVVce0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id ED467F80710; Tue, 12 Sep 2023 01:52: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 03AB0F8070D; Tue, 12 Sep 2023 01:52:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 672DCF8063A; Tue, 12 Sep 2023 01:52:46 +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 E6E0EF805F0 for ; Tue, 12 Sep 2023 01:51:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E6E0EF805F0 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=igCFIGV3 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UCloqA+FmFvbkjx6i8mJwWE6VrXTWZQz2sr2NBk5HeYKaAT+7mYsXrZBp0Uc49Jt9FgnhS70MsiG/bxz/gf+nGPBoNtCaR/ahuiZk7F54EtGeVEw7seSU+FeVaFr1NFS/IXqi7xom3w8H394tsCy9gXZGM+kE0Yo743vZxcsH/lkQEXbvLQG0QqER5RrUA8ywu21NM59eNiFdhX6wIP8Xp0zs5PqQcC4Ap/EOS2vDHR5KWTiCTnUA6VqqQRgrhIGN9sLg4U1oa8dryjCA7ApCjwllqnQfpMYrF2OwtxdAvRy+L9YRj/rBmWSxfduMkfhM+FwV0vvk9oLczS/C1Weew== 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=PVNeOFBwbFABxhmKWbE4RWnAsHU/YQfPs59iIfe7JAU=; b=Wxbox63F/7BkbLPYrpqH2CGi0+ie4H+rJKmPHkoCc6tnWJ5svbpBGienn7mS2j45XYi4UGYnMRixnegwjj2tCB+p4YLSjoqopbVCYYExsVh4ipnFWUwwywzip/uXm0RToTvof/zyAIDvwiPSqkMIhYRIrXHCEM0+cke4XI27Qm80jiuOW/Spd75CPkKsBdNvsiqy76cW0oUdJT6Opemr39lk5ROYNQ8E+3N6uROTJqufGCJN6Rm2o+UDbcXVvH1slT6JcPwTAvMMwt7mVVH1fuMlK+kOaoXm3uOClXVQyV995Gcbyyqnz3zq5tUfi/T9qgc+1pFnqaeGipf42ancZg== 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=PVNeOFBwbFABxhmKWbE4RWnAsHU/YQfPs59iIfe7JAU=; b=igCFIGV32fCTiTXP49yvH4Opq83LE6r9zDibRCuKIlMo+0H/nlltn52ssqaOoRzOc/+mTqTsSkj59B5Y3ko2KA2eDx2RD5fyuIBDrAWEI2SL8oSGVZuPDuUDXO+m0t0uTZou7RJQNWgGu/d/8RHpOleRs6CnL8ztQuYpSU1LLJU= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:50:57 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:50:57 +0000 Message-ID: <87wmwwp8v3.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 39/54] ASoC: codec: cs47lxx: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:50:57 +0000 X-ClientProxiedBy: TYAPR01CA0180.jpnprd01.prod.outlook.com (2603:1096:404:ba::24) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: e952d1a4-dd3e-4ca2-519e-08dbb321f1c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1k1OSmMm//J2BYAl9vwnuqCSYYTWJzbUYeGWRl09P4T0rD+BSFdcJjxJA/uK0Km+PPAK9oCKTDuKpPaP4kcCgavVj3k5wyogIB9jLxP93CzBT4aSh7bWST35a7X0FcrGsmPLw6h0n4ujrE4blG3Rb+avRapYV0pB3pJaibjThjI0q+6faT4zK1/7atcZx5erRjZUP8rZ/iy+EJJ99av9oOoaUObwe2U9UoHx5cN80sXraDP6p6r2zjVg+hgy0xQ1WCuHhsKHcrrH5xGcFu79+I6F2oPvEUQWm2K9T6fxsUW1C6CMVd7WSAguLVbIOk++MmA6s4ZALjFbovYTGmLhPbveuP5K4t6cqK6Sbo32ffHcV2nbUn5G8so2IojtN+YI97IVTsH80uEkRBSEL9+zzOBkPaeVTu/Nf9Q46ibpCAwljYitM3JblGNd4Ub4BSOVWBN8Q3gprMLmXnbbDqJBU0ajtlin4cbW/9lihJQoP9h/gpIxL1ZowiTics5NpZXNPQRXyoFV0USsmvpJm3QL9tXA4dajtWisWUNTFbRclvRWh3D+y0JFDmu9+Ur7q/M4OjQ7AzC8ww4hs0YgablTius2CvaalQnDIj8wYCL2kQFzjbr5jRwQTMQ6Qn7bTzbqq+jQa4dEy7Fu7gyYZAqkYA== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FnaZBEWGZfU1YRM8u72rObmNQXWu/AVARObhgynPVvOWFhxVQo00bJU7LEanEs4RSSPLzid015R7vdse+kWSjsOZtZyejaw/SiGw7aZLLhjZY71rgaDjcyUM4f4fLpDI+qg9FXcXiQqACv0DH9amW7v3YVvQnn7Lpc+Qy7bF0ijKrepvCAZvZkbOfB9lTsrwCewh5jDQhgpMi32gkhrtzSEyfxbkv2RRavfkOomcM1nYPa4BoqpYgS3T1alFCc52+5ld/TbOEVbKCiFKyOrRANyZkYHtFJkKuzPjeSp2uejXGaAahYWfH3PNXIldYnAPvRvyQTFz7uKqmPchlt64LjmuqkWolJomV+TykKAKRJ2DC5xHYwLirCPG9o+oP8HZv45GTksufIa5LJOLB1wbQWjfJpQVRHgC0/BA1XBCF1yTxSz+y8rj7M6iywhVX2PUQYT2N01MdAjTBfPVky+xZ0n5yY0T08krVbttzsc2qTIFT1VqYSQvBzyQjXSf7ZD1SSuDB7Xxp46KG69i+dt3uMgwko/4QeohGqIhgp+wrb/QvSid/87JYZbZZIGqbEn/xcPsUYsUejU2e3vRwpQOXbes+aTnpFuqg79g+WagajqacYSKp/RrrfGm/o30yeYWs1iKltGQnB6qkm82ory4IXef3Icezdxz2vKJ7KQaPTwZrqSK4pH6IqNYA+kidYo6iqcQrERcdXB2+598H6sQiJbNo/eDBxaiR5Y9MbSPtTIwMDoWPHH12a5lf6P3wt4WzLRT1qtCQuReBmH3wcIZIsuKUq7FC/jEklvatg8zWrI51vDCc1dCvXi5o/g5HeeUcJgnMc5yq3J+PnAwkk1JV8RXkUoQ6OuK+gdI6PR9Vdf0oswKFPBgAmXab3q4osTg9bYT1Xd35T+1KW67XflJqhVQTTcylLRgWaPRDsHKycnsLwW4SkjcZbDbIx0NRiRkPgcTAQFpsCh/sNcMLsmN4khxC2ZoF1sRLlud8IuakfoZGqPGa5EQk0ncv8KimZg/K02ggBjOWX61RpCLIuTmWXNh9VCy2UaJ/DhojWrQpeyrVEglqMAnWrk25cfvCeH4jcY4RwjcwnBB0rOpTmepqga2Vshl4fmLYHrZS7L2n88/kgEhEey6L5sqAq3Wy2+46H3/f/JF8bn/byr2PwOL9GAEyD4rg58pbxM2djuUW5i5OYPLkkQmtPmT492CwVfQ4rWZIpW6HOm0BGpstEcwuB/rpvZMDX6X0Agj7+EECz7czYMD8PkPT4UJCHdQXoX6eigNowWKanTfuwwkoFIqKiqISTanA442SzM8mkR4NfU28MTK5Mn0tOyAr7ZLCPxfiPGxrBUoq8k3DRLEfriuNC2z8d2IeDuNrltsBxvCRbmCIQaecM6WUARbvuRzoh6peh20S7lugfa8PyVLqh2HE9Duc+1hWdoQCOZIx9brPq/n2ZvmVCXrEmA2NDxb9RBzBESRP7RJpSyU/0Muhh1uaS1oHlfLDyPqTUKS4LWAs/RiinUqHsp6PQscqLnqovASlVaDMMnyHVj8ti87V/ppbQDSqotnmd7Lf+0pLAzjJtbP+tq9jg3HiPQz2n7wZFuiwHKs+8Itc+zBgrVOaIE4qX8EUdpJjNE6JtWR2UqU40I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e952d1a4-dd3e-4ca2-519e-08dbb321f1c7 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:50:57.5569 (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: 86CyFGwrMoSf3mxjoorh6PJOVtU9YZM1TfsbQwpue60+WwhRRkdlFpzN2eQ19EGExzzEiuPg9frHRepI5LVRBVScGjQiH4snEpwiY58zZGZfTucZMxWJUTM3fD+DBEHs X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: UG47FFR3F5FVIMKG4EKJAU6BHPLTKD5B X-Message-ID-Hash: UG47FFR3F5FVIMKG4EKJAU6BHPLTKD5B 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/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 1245e1a4f2a57..ab6e7cd99733b 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 cfa1d34f6ebd8..ec405ef66a8e2 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 a953f2ede1eed..0d7ee7ea6257d 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 8276854818595..2dfb867e6eddb 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 2c9a5372cf51b..2549cb1fc121d 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 352deeaff1ca9..0c05ae0b09fb2 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 Mon Sep 11 23:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380415 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 11770CA0EC3 for ; Mon, 11 Sep 2023 23:59:22 +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 43640EE0; Tue, 12 Sep 2023 01:58:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 43640EE0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476760; bh=ZEGv5FvoYCHSFk2oDcg+Vk8xYvhNOYL94CtERYwTwbw=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dbBU9Q/n1uNCFBnBT133Iu2ss9CJH7gmKek+GnxCQyjFXs0olpYR6UU1KEjNZ+F5M gRCbICE6JwCPgqSPPHEUgk/JPq9QHovKHzmOFT5prFb8+hGaqM7vJsQUIruFODDeK9 T6L/sgxffpdJthbA/5l4DVWVKoe2HC7GuFMFctSk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CB94AF806E3; Tue, 12 Sep 2023 01:52:42 +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 0233AF80570; Tue, 12 Sep 2023 01:52:42 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4F98AF805E9; Tue, 12 Sep 2023 01:52:37 +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 3ACA7F80677 for ; Tue, 12 Sep 2023 01:51:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3ACA7F80677 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=RbsKytaW ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nsSO5gZp2hoOmJrIRffsdyWnOzzSbsCf0B2nhnUCWxFi8bfLlmDt67TGWxRSn0N7ggFhXI2jroQC61Nmy8BwzXw9v5wIlLD3kUap/qhjPD02SEQ+Xxb2CAdI2G8MwfHEWYxiqClVlFuy2RtALJmZAOiKNgCEkGOdVuG1RVVUeIk2HurO7snFrEnBMM8CBAMqYcS2xcgbbVQiMT6D6q95bdfBRrD6MJgWjUI/RXH118EBJ89F+JW702LvUJtYjr5/QdwiVI/MckLpsOKVKbNbk3f9AOvIDroQuE+PugljLMwYonT0LMbjoUKocZM8sUNnPtHuN0WTZd7O3dWU8IKWNg== 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=rhzOUelusQoBR5Scv5ve4RaOIOmoETDDfVcm0hyHtRk=; b=IeoR8AmIcE/jzeabdnpBMMuy5MxJ8f/HdAgg0lc+5+fapRUb9qwAUaXt7H+Ev00u3LoKDPhbXqpvot9HkMdeXOQHG1HbYP6MgVYPMNYbHs2DzWchzR4rAiYABCz99NSa6DQkMamO/volzciGf3mW8tyZXITjh+n97VUzr3LpduPik84dOHYeitDthZfHjRgPhFZNQGwNjRNmsrIZ1vwiI72251zek8hs0fsfxISGklqZUa/eb/l5ScFgghW4A0zwL+yuG1jyFCo6+4P592jg4Ui87mLaaL9YMX5VBNAv/QCFoFHbuOBYX0nBiO54Zb9ljzsxgggMsWXYfLTtjarnag== 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=rhzOUelusQoBR5Scv5ve4RaOIOmoETDDfVcm0hyHtRk=; b=RbsKytaWHQgbsR+zwH/Ph6hGM7wnRChWkrc9W18Od/eNn0EOQj7pBOIUUaXHsp3/sgw1+o5+PNtGNTcTiv4MUWKK98q/R/X9FOaMlPWbg1imip213sfPIQaUXt2GhU72FuJuw61FyOFHHDSfdINA41Az8i8j7s8yBXVS40gTWx8= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:03 +0000 Message-ID: <87v8cgp8ux.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 40/54] ASoC: sof: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:02 +0000 X-ClientProxiedBy: TYCPR01CA0164.jpnprd01.prod.outlook.com (2603:1096:400:2b1::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: f39bf8a3-505b-4fef-1691-08dbb321f53e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hcE62zSd8asanzDJoUhD3Skd73l+EuvO71PPOcQ9RzrkcmLtTCwfdJ7KKpPECfZm5TXjZ6g3H+RLKThU83FLaP8lbMIQESMtVlBTF1/GZpWATjai1DHxwH7qquhjO1f/hLeWjFKv64K55BKtVrsfdKcWtI113Yep9vz2incFx7NXFRZyy/7GPERsFrrJHoSvhixuUh87vWfhNMUU9XgSJ655c3KOUwt8w1ak7z4l+OtrekPw7O6Z9FSFsOudkNCVVPPdxv4d7Jeph20s8uNyRrYX58bRpdFeZSMAbeA9RZPt4x0CksfCoFlBfuf8H836ChGdX0+1FnuzOpeH9EP7lcASoJ8x0orzbk+m1ydG4dysrzwvELDcenzsggDC+qoXcJHV3XBMfpRlY4KrKOxjS+YG5ZIsazSqL4MFuzCano/jrHgF2/VUAKYnVRN9Es2yIdx1zaf0+A6IlcxLrtJJajLr+jt16d0Be4o3X/jPL32+FcPSSuSZ7esObbY4DNTXoJknnxlyoF/A686LN6CyQwUZBo3FbKhh3T8ynomYstcLUQ8Cdak6SyblWEOhXJsb1VFHUVUg6Fz6vsmO79v58YQvKCitn7ip+RpjyhqnO7qPXlIi/tXv+rgI9QOoYtUVZ9azQyyXjYSfcXuMbgZWaA== 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(54906003)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iAYbQUZ3ZSxJXGxwu72CkVLDB5AgMAAEA6VslcfzTSy3N+A6OpG8yJkWikSc8HwMFHE3NIk1Erft1QdkxwSf7XhnD761cGtLd9WewZA3J8YEP4N5Lrny6JPmoUk6zsk46XpX2AKv8gxb1hJInqG9qQS6uDtSKXcfKyzL/hLGEiNATqOpG3Ulh7STz4wBY8mSvYkhx3D5W3y9a5zv5y+jQbCkWcIpfSadrU/KDrPFEEJbezW6xj0y8vK1x6xc1n8CqxG7MfPlS9A3Z7KnwajCPC8DYbivEtqwk4p+ikfjgc2iRT9FC6WlW8Kt0meEp8uMuBCE08mZlJbmsNjUCzhCs6SfBqbMj+GDAl0eS048vJPqqESfSY4u27byJGubylvLp0xGWvsKNStKDIdtLpIJmhuZpKesoMTC34DySX8xzLnMynxL7f1sh/ghukURkcgWvbF2hiUsybs8zJ54364y4bQHmjACa1TLSDryLpwyBGCRhJ72ZtU4d9DooiqukuFcnk60QfrbPPB2/7pWbncrgSzyTvTkWcucTcOJ3CJIMi6wwn5NjLXWtM9sJJrUW3zUrF5Ut98IasRkUjzBG42vZgl8Pzl1vwCjCs6O4mQN8IMVDygN0/QRVhZTirvidgA5uOY2ckj9bWxp9nkUnXlT0qNZKqhgFyT1RAmezcnvly6GcXRQ27bEqn05bQFv3VAaL+bJjhBAFNYzrsefO92yVes8xLshRo+/ZIeYGxTH7d72QdmrddToZnfcR5RvZ7EWwZSCSGpB9khMg4kLKtARzAB84kzLxBKIzGMxHcPbSIfmyLuH2wO4aVuaqkWz1A7fJFykONgES8V9Dyjed9DHDjiOtWdfC7yidBVf2PgRCxVG2RrbbKfllw79TD2Lr5tEKU+/2vHfBRt5ejLebc9cu795POqltAP8e50o+C4EMt9fOb/TCDRuy3kWakqKJj0BVxd0pvxbAY6EJG2paFjb+k/4rYHhxi0VgZjK4r9YGroW7eYerDnGh3fuw4FgmlyPE5+uvtbfukCL5unb50c6dM7+VRz3r7w99WaUTZTcU09mcebzNtcPizFRctqqO0J1TnYP0dINwIDL9WL1m29KKUCPolLyweSaXG946tzI2LVSpqlkg+X9KQ0PnLOoze26zmOaO4xEXFNcvXAHIMXdX/hRvGdOTGY9d9vZTiB3ZoImct5XwwylKEvLq6z3e3pUtawlq5gfOjjjiWA2vcFQR0A4dxrndu78fMnUrVQf5Sn/cjiprHcRrVVZ6kGsAMBNnVu1T8am6FZaOEEiqpdqTt7OGItULN+D9UwP3ota+t7eGFWsoXOJFc9E+JYJBOXQRAhap3uPxsEhG7oW3sPshgPePJNbgu8qrrDzjvaep3n4mSFBEePx73ms0flBc35huRkMpzQw+92zNp1gcVFBvkIUU0ggtXWwQxLCcxxwDIX+l6njqK4C7r0Vp/MnknlWEz2Ho8dJcrzadjfx4bTyD7kfq3J3WMfGPI8qLpGfBPgnHY28683VEEk0UhB93OI4e8CSymWJ6vxZrtDYFT4GJ6UdrQLLAd2BSJG10858TLYkc2E0JfST99dO3hZy1lBkHZu3DbHjSblDASg3VICtFLnAcIBsrdihlhPKtDF5Z1I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f39bf8a3-505b-4fef-1691-08dbb321f53e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:03.4160 (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: 09TT4TcFHW1fNASBNhz+37yM2k62oe8itd/IZCuJVgNrVkF+7Ag5yrV4ibzjMAlO/rBVVeMrXOnurX5PkLegg3XQmYy3V/aF+j423n0gT1nxtHTMjLObdBde+LVueSfa X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: 622J3EYI2KBSLKDV3VXTDOMI4I6ETIKM X-Message-ID-Hash: 622J3EYI2KBSLKDV3VXTDOMI4I6ETIKM 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 cb58ee8c158a5..2d0addcbc8192 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 db19cd03ecad8..9a458b84d6ebf 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; @@ -518,7 +518,7 @@ static int sof_ipc4_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME); struct snd_sof_dai *dai = snd_sof_find_dai(component, rtd->dai_link->name); 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_copier *ipc4_copier; bool use_chain_dma = false; int dir; @@ -704,7 +704,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; @@ -765,7 +765,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 7c5bb9badb6c2..34aa8a7cfc7db 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 d778717cab10b..33d576b176478 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 Mon Sep 11 23:51: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: 13380416 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 2BE27CA0EC6 for ; Mon, 11 Sep 2023 23:59: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 8C92FDF6; Tue, 12 Sep 2023 01:58:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8C92FDF6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476782; bh=NLRo6rUkv1Bvwc8IFlPV35lkzFdGrsohcMNLxSU+NXI=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=S/0wij4vAK8w4HNB3b383P/9Pz9xOyQOtNtBVmKlouCh6aFwSBd3ot0dxD9e5MgXK UnNK3TCwubGDFiYKtnT/VrP5AJHcTFn0prhvhqoRg6LAO/GSUVW7+Xqz31VKZkzIW6 5HGv1KqU8i9mvZ/q/JD8WbzVCoEsKF2Q8UC+RtII= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 373D6F806ED; Tue, 12 Sep 2023 01:52:49 +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 64413F806ED; Tue, 12 Sep 2023 01:52:48 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B62CAF8063A; Tue, 12 Sep 2023 01:52:43 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20708.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 69E54F80687 for ; Tue, 12 Sep 2023 01:51:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 69E54F80687 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=YhPtSE99 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RQaIndgVsSlB6SfOxx8FkRPUGR5bFpMXJBVaAgMQktx5zY2o7oV8hQy5P72ucEXoJqcKs3Rhwcu8xKWt9ZqRvKo2KIDiXcrL1kJVHf2RauwzSsSJ3+8EhHEt/wUV87rYWZQGDv+S/kUOCwwvE4+g7hkSElZHKR3/QO3cWhh0er5yNrwk8awEVXWbmTyyTmimPOY40U7tVJ4u/mQeOCYYyZyqtJs1qTUKR4P0pDx3OYGOkxU4ueWAcyr+lBcOjLeGWmQwcNG5SwB+WIj/04RC2NSSnxob0vKcRk+ly33/WEcui6UxupaAO1l39xJ/qUmW0TQ4pzmsvIV0KGXIoGbrNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K/M4y7AhyQ0+lSWx5futQMphbG3WbDCqmtxvawpaDAU=; b=iTAXVqJBgQZfQdfq2RAucn7+sjSxcdrqS/UKqKxkpLWzJvXZyklRxApo4k+ltwuRQjz3W5Fg0FQqXaUHCEH4UfK2fooGSpMr5D+YbDxY4LU0KUDNs/OjnnG+TzxxTx8MqYWuDP1nzTW7ct4ppqk5eoPIN/I4KvRJyvWIo9Z83BhS2e0UU0jW6ew5lPT/BBUfOUF0GwA0fjjUAqMtwPVrOAsutP7HpVdNXHUmongoTsmG+7M1Mwd71/8tod8kdLV5EliPyF5/S/FAE6XXLbE0tBRK83acLIPi4mfs+nCGgancZvyL+k6Ci4HAYwS9ayChnCXKxU8RCM5BvSUa+CumrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K/M4y7AhyQ0+lSWx5futQMphbG3WbDCqmtxvawpaDAU=; b=YhPtSE99Yd6KXCKgCqtExatcJXnyARK2UAwFazNtDSiaLHnedj4f8VMxkqmXrAxZQbv0yRFdY8ukv9UTfeLuVvF1BDHVfM8wLzKdQl/TYU1aWo/kDwrTa6phZONlAj0/OF4j5z0qkE5tI+IdTkgzdxrRYGHbYAlBqeigXMehiwQ= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:09 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:09 +0000 Message-ID: <87tts0p8ur.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 41/54] ASoC: sof: amd: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:08 +0000 X-ClientProxiedBy: TYAPR03CA0014.apcprd03.prod.outlook.com (2603:1096:404:14::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bbd4a87-c587-4382-dd35-08dbb321f895 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: luBtFV1cb1TWV9yw4w7UCqMVwKi9alcP8feRsjAoQJ/86CntIk9I7YagBf/XAuq/FQW41tqNye/Q1jBzUzGsGr5yfx43mTPdyRkr6nNlbmJz2tYNJoZyWrricHJdbOOpSsC52UURpdV2m1Yx3G9dd89tKAD94Q5bd8ywMgR6faDsrwPdVJBV90vGTemtjuAL9gGWmOElVdfFs9ebHBTSR2OIzQ2MZLqLl2tCrgrYOI1PGU9OBZ1MzKKG9jt2hxYfoSEtHq7VxX/Ej3qUS2VQfH+zzgkxAy3dHG0/MdLobW3xBbsIxGNf758Y67ghOUqUW2SR74u2//keKj70BhAtYQmm6NOTsbcMZwjoR7ZyqRCUrOk/WWyHE18u56cy1vxTc4UmnslwHXzmg4Raij4GY/rbgJQJippchryaJSkY8CivX/10lookFPwjFKGIGaPA7WhCBX7JIpIH9Jgp7b/LSFnLaIX02LciuMkbexf9sOKegsnSblzW05BEZuJBLIQs94zoPTYtYhOqScM8TVsyAGjOLDAo7nTb4rN6qR8AN+Zm0ZABySduoQrXnmu4xl7NF01i+u9DFtcz2Qr4XmfjkOBwY5r5DZhmxqEKo7kc0gSnz8kL0njub+f0RK5nLzgoNYgdpGufILF78Lrc+Y1njZt+m1Ufrxv/q4ECFVOaRs0= 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(921005)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(4744005)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aA/A9wiVenF+cC+YgjxUEoXkKZYrLQVia+Jd+ka6BzGii4WRyluexc55Vom7ARyU8XcTuqeiJ+5Hg0vAYSeBUtjTPGLJ6um9VIEOWK3Hp8Qbsyp8/jOYOqJ4FkUI+eawtB1p+ST2CLGXg2yenWB8XQITXEBlkzgipGJZfLimO44mt1xXGqlzA4x8IbP7L96OM/3t9IkZqM2DXmq2+RSuB7PCgowYJ0C5yZQInv+NpFoiP1AyCZsF4ZI20E1ZAzzLqF+eOxODop7DKD5FkxvgFXGrNwHCDVoxRNhRxp9+hiY7Ff5IKuJKyxaRXd+0nNQPv4pooa2trtxLwrOGfQSp/cSKaq+TQci37QoUFjUnMMitVcNT0Uiy5t7mBlhDUYe3mRxtMsEzBvHFK4jkJNhEmBfnEp+DfXJ/zgHDhTK6uwlSnz4qBAEwnalB1MghSD3ASLpz6jp8+Wbn+vLgOgKoW40ya+lTo5xaGlVImxTEU6u+JtiPoH1uLd7PN0/b0MhU+PfMa4nNT/R7+4EX6wLmX7Vr5+bQcniuIeJgvKVilvmaS2Zcpx+lmADeRKgjRXN64A+Ue1NzsfHP4Ka9JPiZPa+jhLRROPUoSGbS+nf/WB7Rxc6dO1FThPyB3p83b+OnNY/DuwnJH9z6FtosanY4fW43Ij+EJnu2ADZZDT05VcX9aHbmlL7TP75hjJUoDXeI6onEUQzOxEgxObswffsYxhIzFdtOH8mZLJxX9mxhajjko0XLIoan299gKPrSHAtx8p1SOmCCO/o+fq0b3a0cuL4fNPfz/NMK3g1roWlqjWmPf05IUYDxWdTn/EgvTY+24UrNohqwtOesl628E8YjD/buXTBP1g8Hp3jpGHhNrfQUvwPKRJYfSt9UCDap+sOnszE2s6ODuLSy5dkWpLbkOcrTRhViR8uI7kzz9/lSOFmYNwgEhUB5zAKqHpaVybPnaWwDQPpP1pwI/JMn3fnrS9Sg+HubJH8fSejKuvLmduxpngcRBvMwwVPFYK6T0YSYNvVmmS3AW4Io2oCzj0RffKzaRGMmpeG/0ShxYR5v4qgmAqvxuEY37v+aTJCNCglULDU0ocrgBIMDMJloQJVQMtwwiMEqhOok5Scc91UtBvzswGo5VOhVEriuJWURfMdvUCellfk6QIKAxKRmeAI6zC04V7mJCJy79SYHwkTGQtb1BnQY/PEaM9fo0FDHHEYSp46jzDIvznYlSUJds/3TH3WBA6/zCcpBcQ5qALXx65B9lSstM7YvdUmrQ9c2m6v5W3eLbr4M2Id4TmdqimDYiG6kQYeCXgcE5fL0aPW512XC8jLIpNFIXVACp3KHCyOYfDj4l8F60Ss+xrEk76g9Vn0USXMr4Aqr9Sbn/hPP6x0Kvpfxt9Z9gNaNNqxqESCJN1gbssaYlrdjTDhSEkUOccAtpW73niSREs0+se5ansRSiwWGyxsiwOMsPh1ytCDwvOJnrYZWp8G0XS+7vezqt+4yEs7o/ds2Z/F6wXr+0YHA+KaBPJDrqnFqMnpaUgyk6oxkppPqwmXFKxzQ/UJ+QdSZ3DEAmO9kPa/AlKAb6I9vNMGXBdVy+OHLXa3J2iIGL1a7L68KfEa3DaXhAkMx9Z7mLhLwd85Yc06IUBv3MNM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bbd4a87-c587-4382-dd35-08dbb321f895 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:08.9829 (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: 5ExkKM8O6AyuV6RIx2zPCdXt/vHrWfKpc61NPrhkCruRcnetl8H4FxoSfRQJOHFv0a8cakBCa1R65UFjNUbivTiBoF0ALRGTczhVAttExjNpUK9Zqtf+2MVxBcVwBy89 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: 5LCGFHTB5KV5ILF7L5FDNHYGVR47RCBA X-Message-ID-Hash: 5LCGFHTB5KV5ILF7L5FDNHYGVR47RCBA 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 0828245bbb997..cee0b11548742 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 Mon Sep 11 23:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380419 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 E6331CA0EC6 for ; Tue, 12 Sep 2023 00:00: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 6E83BED9; Tue, 12 Sep 2023 01:59:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6E83BED9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476823; bh=EHwC66dwFM6mCrgdio4E3w4OAUdT3n9HIrnYYoAQoE0=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=PG1DKf/7aVs2XbrStpw3koYmURZDQSnR3fJmyp0HC5Oy0qlZImKPPyW3cYWpKZCud qc5pAhX7Q4YLyBv+SryP38rIjukSgIMfWOmzbvDyELYnp+U2gx2aY6xJSk4hK/Vydt m/TVXCVhUyddQDN005+x3TBvvQkd+dfm1o+haf14= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 58F6EF8071C; Tue, 12 Sep 2023 01:52: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 88FDBF80714; Tue, 12 Sep 2023 01:52:58 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 42BF4F80691; Tue, 12 Sep 2023 01:52:48 +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 9A5C3F805F5 for ; Tue, 12 Sep 2023 01:51:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9A5C3F805F5 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=aXfX1JQK ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y3Y6NXgmPJFEy7G3kT1N8Zq//ZgDzTIUpiaXwgDH5Q/OH8ZtLrDh5L55WDt8s4Ut9p/z9y+dB2++IDnJ26k2biBC/ijJFUM7CneLnr61Bop+FYKGHgcKOP/eQ7d7LpUTp85jnP7IyMdmZlEz39LTdXDz06BbXdsNrRDAGB0mcoP1m5atSbNnJc2DzW3dv8TboHRygHQVM46OmqDpWUhHMSUnEq6/7gdAIigyLETS9keJUTrkD0r9MnZNfjdQgVhMRWaRt8EvbM1ZOXi/4AucpSlkUes6uZAPOFgHGVodmKl9fY77SsXy85nxfTwE3wRuYSwvk5aIWuJQv0OsME8sig== 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=WduLbQvnPloeg5lZhn7QNhXfPURfu0qIavjiBsmLaWA=; b=lZ9U7kcpQD/Dd4bt+UA2b7xFfMKn8osG+79Ms4VuewrzF4HGW7oODL1gMFXy0ZYJe7fPFDD3doevbSxpmWbgIBhhDiT+RSDZ7lFY6W2BlsbPMzeTLel9XUL/yCA/Igj8han5Lb/d9fZlXfEP/BxlSj8odWZVbmB/tMtKFUolqhAhTRuh5uuTQ60ZBHpYzc4tEv6ZSyehmbqxo/n0Gp7O9pDbe5LtD4bZusiNGfo39Bm6Mf0C+vaLpq55/93bS8C4KDeL10tsEph/+/nEWCWNfJlhoX6JgD9Axqq/agLhOAI9xQt+fhOu8SlpTf/kfvXX/PgqbbF+FUOodG9wPSM96g== 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=WduLbQvnPloeg5lZhn7QNhXfPURfu0qIavjiBsmLaWA=; b=aXfX1JQKnCTQDYAwYggUIOUcy+5gWaoA0MQd559+nqLI0TGW4NJXRbH0uipt47DgAEBAS29IIpJH1q5r6hY9vOGDfDzbmhFvYjygYGfpjFqnltN6lyh5+kaaFIzqJzS4V8BAkxxvjai6UNREL+M783Jfcqr67DDBpZsaasSoChM= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:14 +0000 Message-ID: <87sf7kp8um.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 42/54] ASoC: sof: intel: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:14 +0000 X-ClientProxiedBy: TY2PR04CA0017.apcprd04.prod.outlook.com (2603:1096:404:f6::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_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: f8f00f63-75a3-4be7-647b-08dbb321fbd3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wN259NoyRK2cxg4A8yYeKlAptxC6pBCBDRPFps9wRVLV9xdLGTAulZESALWVntmJcFFw3ExV5MtFMM6pRG1Rq6QvyEi2DiplwJ7Dwdh2JoqBfFQLyL9VWKGW4o+xSTKBMSBOxqenkhXKP00rOCZX9gDFRET49O4+dx+H6LN94W/+AUk0R77dKjuLm6RuiWILR0aIyz/QGvuZ98I22GUejwc5UDEWD8M+paNJPW0ngdQ0XmDII1Qe2q2tdfxkBerw4aGihfunLqMBd7uQG7p1msOHsXaiAEtoSz4YHSKjqYPk6JMG0YT3IBVeO++oDpQGBxxG+9RCSeyY8+BI21WUf4PWLm3+uUbz2q/sylMqbZgATc0zH6QXufPutjS5yBnX5EuvGxhRWpxWHaGkxdsRNy0kg6RaFjWNeAR3/mgkXHK/7UQokI/n5VTuDLJMcGaOz8KUTSdc6DS/SXpCnLRItqTOxn1IAABqex9C75BwjTzIJve7Mk6lgRYpOit8Vr+vBgMcEmu9xkMwGN/n7EMkVSZ/0G3+n94CHsXqeTqN9U56NUhrMRcT0R9IGjVSTHNfHC4S8jCu4R97MwtAvhpbUnbDCJ7FQfMg4FCE2Z9FMb7BbAcUz/HUdhHTEGhmUMMbF4Ijux74LEzfNRgPQ3+n/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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6tran5hQ5VuxZgyuK0LQIBtSq8f99XFZUOTWDZvspux6afBQQfIC9ickqzRMN6z8D0Stufx7SRAEdU0kK3HeJR/+WbLKgX2n6jRSBMMKZsbhVIzXUM5c/b8HChdRGSUBUgdtMJl93FTCFWFJLwIMvteQ6JlqkJ+idnRh+pKg7Ra77pczkrPPT9gNO4Ezd6pq6Mz7Ffo8KrtaDCWCV4Bz2XyC/1GklJCmw60SGaF0p1/SsqNEAbWpea0pB/G1LV4AxxrlzFVnje7a3ovpuvT4ev5bNiLrWGCDN7Cyfjzaoa5gVolKhDrXMwTYThizYHF5CP9fqR1B3IDOC4OF3qiovZDvgR8lUqv4re/ZpqSRTX10QJbNFnQ/S09rky0sPtOH/3qy9+d9GIXTkErxcOetPyblPrttZPy2KS9kjWV7TiEUzOlwTLlgD1MM3l9B2lcI2gOTnDFaxKw26nVEHdEoomQIr9+6VY2uYU9kyRynTzD0r9VB8lXxMDzWKRCP5A2TDf6vgnxyi0iTMwy1XclGiRlMPZS4Sy3feybD1JMSUA5ohYZybPB87qc39xRiUWaT2hcETgqd0XrfrSFt8yUTMYxJBoA30dlx6XJmUvEttvqy/OHBt0eY+9fJIbUuMDqHVR+muzgbJl2N9ClmlGKae208M0SXm6NhylFP7ve4Bt+JbESjF5b6rEVeWvdKsRSPggxdvpLDCc3CHunNhogSL+4k9cTZqpSuk30cZSDfhRE8kBpjIYm8JIdb9OsCLqVopQiRZ7cxrUzh+1ftqIIHTfieNN+j8ej9UHZJ5bbZ+f/1ETcIUWRPx/264oXOsQFxU6nyIySLUxNeu4+0akmwI/KUZoLx6geeYmqimavQfsST8BN/7JpeNn4W2byfk6jJQSo8El47xJXqeO+O18k7MUQC8DjNF+iSsUrMUP08zq1YVpNPb4pjcvz9y8S3rHdHm0Ojz1tbU/uXbwwoQveJztEYR3HNeKcCcrKWca1yafk2Oj1ptuCLbc+TBcX30Y/a7jx3WaxDJI/9ZBlKa1zN5Q4T0WfCrP20HVhHxpydXUbW12X9wdI5GQMcWNX67tFrKTJDOm/jYn/s6LVSDmedqbqfi4a+P1afn6dEoXYtY7WOY+rJzpG2aPNfCYzEP2JqQ7YTJj+mbpGW6KQcf4IA37BwWqtGidJbO0abtPd4SLHqZ48dz+0ZJbktiWDtBC6yCnyoJy5YsggqwDYHlsh6j7afJO0hwqu8O51juXZJqaFAXCm+Dmb7/CFN1NIT9ViNdrpUs9Dh1e5KwMUgItlDPBFtDoINGwQAxtODO0Ert8yF1UwaQGpuppcGffgGZskTlC9r608cg+Xk266e/NxzqiXP+w+6L87jBi3UReGOBmTe+GoEHNVmHfxBj1DowP3pdjKBDRmZWnzCGTBbWJ3J3T7il9ZYxUy+9J+/xC41IuK4P+9XOwm0De7Ujlp01j2+t8+JEljAOhmM9EXROgwR9PVuUrxYgFAIy+iXk2fTwa9Ot0GaMSGgwraiRPXz9mQItyiDDghuwbbDngbP+1w/Imv7/BR5FDOc5Fq4SOyJIJcsO3Wt8M0FLQkSvOyyPpvsHO4yAY7RPBNppxWfURrhADF6MlU5x7jaAI587ynmRcc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8f00f63-75a3-4be7-647b-08dbb321fbd3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:14.4482 (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: ttTXwx1oGzNYo5c1kPm8bpA9eWE1uxwhOqDgAXoK70AAYEBGmfJfGXJyJbyvqCzx4W3PmSbWLLQ14rF5HRbyTG6l34lAthfVNl3BWQEiQ7CMFq+kNRxXLYWyoel6N4Hh X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: AZH63W2O5CGZD5KRPTLAEWMJA5MH2V4S X-Message-ID-Hash: AZH63W2O5CGZD5KRPTLAEWMJA5MH2V4S 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 494ced2b746e1..d8aabb313c1b0 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 f3cefd8660812..cdc523604a93d 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 f23c72cdff489..18f07364d2198 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 0b0087abcc50e..d0b70ac39ae87 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 Mon Sep 11 23:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380417 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 A249ACA0EC6 for ; Tue, 12 Sep 2023 00:00: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 C0F05E84; Tue, 12 Sep 2023 01:59:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C0F05E84 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476799; bh=iRo9eI6SXe/f//P6EjGhXZbAQ19zk0cQd17/ynTONOo=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=iy9HJf+yDY23M/3ZqzrrdfE4PX2SMO9KaH4d11sSj4lF3GSFbawT4R3r1cjWVpkPW Y2qlvH1lGzvO8XNMdm5bUVyF3tD17bP4lT9yqbeuHNsvWZdfWGmRkiMFRqwFcft+8b 33W8ntbLYEuPp+EwPH2S8AP2F/d5qXAe93gGvxtk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E91E0F80246; Tue, 12 Sep 2023 01:52: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 17D44F806F9; Tue, 12 Sep 2023 01:52:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 19507F80687; Tue, 12 Sep 2023 01:52:45 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20717.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::717]) (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 C2E89F800AA for ; Tue, 12 Sep 2023 01:51:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C2E89F800AA 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=Rcf3tiF9 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dJprZWmH+9TC1qr/lsqKUQkjviypt3oaVyKVd9OUeujsHIGEHIG132ZjxB+Qc5Xla6KR/EAmehoUgxxAnbxn4Obn0xaUT8DDAIdLexmM7sOfIvipDI6iNDpOVPEHzz0IZQIgwaVwUCu0riwjqB61FVQHdeUTM6mTucyTUpN1HgyV1M7k8eNOWRzarMykX+DH9xOJZLBDrQWRu3DiIb5U1EVWIVQWhf9YDaEf56w8RrgZ+DMewWS+PVUr9jvBJg+GueUX+nlPAb+15w99gvKoVZZ+SXgW/6VMELJMeGjLHIBOgjM+XLNPCEKEgP4CjDLKn7sYqFIKeKhesCxaErasXw== 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=FnvWcNgK2vVAZybDwkVhMMtiJQ93tLL/zSZy5ztSfoE=; b=nMdA626xQvzPcMLLTp1aA12gcwEwViZRfIWJ9ZiXqb6boWHG7YrQXTUrz9msiAD6OQXHDSSaQKDYPAEHPmqCyoUokwkH+JwandPcQjbJ4iSPIC+9I7SeXnq3CqSXHSwL8P180Dl8AkuEpea5ZlhqKT7WTXt0z02+5RDhGtJD+dH2zo0OtMAF25S2XV48kM6gBbz1pE4LopmStSH+dauF77C23sKvD/j5KsWnic6aOarJJn0S46ce5heAj2pGeDYidpX3OWsQ2+ebwxexPWk8xS6f9a+fDc8hkIhXSBsHIpJhPrVkHP8WfxdGb52lAM/MVz2j+DKfEEItS8IpqRrUhg== 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=FnvWcNgK2vVAZybDwkVhMMtiJQ93tLL/zSZy5ztSfoE=; b=Rcf3tiF9mFoIsQ1xcKlQuqpJzVtZVZpyspbOpJu9s+Ne1i/QfdfRpogITLGw/psGJYxDO5EFaDrvOB8+1pIfd5tJK9WWChzSWf/r4clR8JrDtxPlFXSXnyQot/dUXlCO/mDXWXxjPzeKS1IBKUpwpLuqpCstFkMBjD2fqUDCjCY= 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 OS3PR01MB9445.jpnprd01.prod.outlook.com (2603:1096:604:1ce::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:19 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:19 +0000 Message-ID: <87r0n4p8uh.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 Cc: Kai Vehmanen , alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 43/54] ASoC: sof: mediatek: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:19 +0000 X-ClientProxiedBy: TYAPR01CA0132.jpnprd01.prod.outlook.com (2603:1096:404:2d::24) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9445:EE_ X-MS-Office365-Filtering-Correlation-Id: a99d0812-3825-44e7-b7ed-08dbb321fef6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dYX4YOGcWQrYDxFG/0g/xBuizO/5ofal4ZeErw0rsReoVJUjsxAp3Yo1ImdkDAOu2J0q+ckbZMdOvhftaPm/gQlvfPy3WH/GNyMdeFvbLUSHHeZMhBbUcUdSSJpcj7EEX5IWxyd4W2kQRBwmzbp1MD65lPi4Hf/XLnyCw7EeNE2bKx7xk8tiBiy2eHjFZIdRaaMMTfeK394Y84/4m+NoWZ6uK7EDqygQ2DZnwY7hu3eCelP4BvzGYBo1X7zANHYjhctrbRdQiYyeuXYDSbDdU5Ys/DbQhIpp7+SmG8ZsuBEGjV5V0NgPU23tSHoP5g3XAnUaAjEwHviGWjaQo33XTqKplVQWvs+yhIJt593PcSvIeMylRnDpBCAxQK4wPUw+wACJHQWxJdGoo/qvHWqgA99gBI7uT95/6M+qn7uy3iNvpRvbhyxVtP1kK5x0R6uvf0LQVdozM4tcQ7WQOPV1LLNjdf/vH4miswYst7kS9uCTO5CuSC9TLB5frtjacyYjXjPAkLIs6pOx/XN8XjECoJ5iTNya8RFm2WbBT3lWu+BS/TWpTpaFGpshpjnVdeAcXUQ+yn7LSYL4hH4ZTgVd35whFEy2AEqg6QUeCVWTwJTiXXD7eZws3ZjtNb4r6vN/EGcbWIV/mgglx2q8FXR7BDr3NxgImqUcbVuujMlFgnM= 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)(346002)(366004)(376002)(136003)(39860400002)(396003)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(86362001)(316002)(66476007)(66946007)(8936002)(4326008)(8676002)(921005)(41300700001)(5660300002)(6506007)(6486002)(52116002)(6512007)(7416002)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: shehFmzNsTHzyrJ88HIOXPnDlIx1ftwqpkZax7MVcX9V48qpGAmvSOxeVAYDcmvhEOS/ZRVFauTX9thzvCK1/dg2y+KBgx5nlsSulVBqc0axHKYZRGRIqk80p8g+jhoagaX/yC0uk1LU1RFPapaGuh9hn2Wkp03JHKz7PzpJ+qocvPSqIH3esB+KIS8B6ZMbjJYproGG6xvl8LakqqrlldV6UfmtnalvJ4Q3DUzA5RfWyGcR1H3sxF40daTAOfwblBZ2d+8GDGe+G9WpnuLH0itlO7BUERyhpbuN/tHt7AYiwhsQ2OzsqDDwhB8JjG6hQZyWb7SgwWNx9hwY3gS/qb8ik+1Pn42X+8Nf+bAoNuifUibztzqI5q6NZ6fJXWpYyi7G4C90hyUX9PgvEdLwZ5pqLJ+/3EFGG+LVvlYme2VG8RDmBZb/7dmM4L+lopwT4xTQ0F9sSsuLGUTxMqtbEpDXEW4nGm0qj30DwZb9GrXCVotFPAljK/Sgt5QPUVr5MNUBXvFaO0on+tHs+u8GU9Vk/ETdbpHdIJwSN+3d4I6Z6C5MpxNWWCjqKlFB4W2RM/lcfG5TW3HY4Q/1IF9sPW9bdZp9tnQoR3h1jxdJjQtUPxlG6cdcAc0kaCgaF1in1WHPlSwrrmoI2HTIQaoLWapjnQKRe8eRPGSKC3bZp5nf1dlKvlCpI2gCZO0tKkx9+7M8H5hsGQhOB2sEyOssDPMEv3rw73WPNYdI+uqYmKA8QB2lkoFgE9ovyHPH2coH/Vsatw9YFPh0RvtIzJWX4XF+FI7ruIs94tgBm7i2ue+n+wY1JeOLLCQqPKWWOK2EVAa+oeHyxzVdmxplddFmwAnukmFx9xM4xqfVVjXokTi4y6+rA6y7J9IAboVgM7V76GVKXlyf1iAVGHbIFTigEEnpCoypl9rX72qiwQEBLaoGDipzz7E6Cxq29OZ1tDbc7EoJYKdTOkWDh3PUwZ+41Qkj+6+gjWSawT1yboI66gtgGp2UDdGtTavDRlom07U0ua69AZqwBycIpfFebguGbj6MsUyPJyf4VYZ2TIn704L7JUM0hi3mfmQO8J9r0GfvpRNR2U4IZ2wChpT6mFwJ4HWsnvBksxLTzvSi6ef1dzxZTi1rm+s5xLsg5HD9xWkZCSmAv/XCvHIgIQ+NH1gM4I68t0wdoaoCKtyx+1fHSoHWyur0IA4kMP9K6QqoRula2GpFFfTZK6fyhHTsl8aPe0HIH7KcprQVeq0HXd9V8TErCXJ39GOv25b1mgv4iFdzTsnyUdA+3FXE4gLaCmLHbFZkAS9SHIGgEJgZ2BA5pgXA3iVnM8kE9I67vv5hbkev3sq98C24vQSYDO7ncNwOBWrSCjQxTCdRk/h0YbcXnODHDrofzJSW1buuLieVB22NGKjqBDHuXNNSzyXU0WOuJeXVhzeMEwcX23gxjm6069K0fWz1rq+Cog0GaJD6LNRz4fWGi67hzj0+4/xYYoUb239NAMR9SHjuORyhvxcc2WK+PR7laXz9ZcwslumxqRwi7oR/3WHOm0F8DFL6mX3AOMqPqS/a2jl8SrD/V4lKkKJ1OJFIPiEi8UABSFJ/8afjry+HrwwC8ZPtZbywFxXt9Jx3R8uzy/9GLc1NhCgoowI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a99d0812-3825-44e7-b7ed-08dbb321fef6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:19.6902 (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: noroj7qBVpDIZz0aR0W50V2ZpQwRYDYxNQQX0i48H7pnuTrhLZ8VE3Fh87w3eyYdt7W4VVhCFjPTbAfdXlkmbc7tYzpwW8w0FC09R6rApulIJzWZqEOj1L5QyCBGXb5C X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9445 Message-ID-Hash: QC3SVVTZVZFZEVVOI3DO535QZTE5N2NA X-Message-ID-Hash: QC3SVVTZVZFZEVVOI3DO535QZTE5N2NA 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 f587edf9e0a70..3f96ab670e8ac 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 7d6a568556ea4..661a7a2cdf37e 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 Mon Sep 11 23:51: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: 13380420 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 2D5D7CA0EC6 for ; Tue, 12 Sep 2023 00:00:49 +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 469D1E10; Tue, 12 Sep 2023 01:59:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 469D1E10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476847; bh=DfCEjaTDPjOKQDcDiKVAXJYLELr9t8TU402VI9kIMfs=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=fDy1hF8C9wi3vqUvDHjxLgI0/ZxmvCS0MxE+OgSCi6uJ0kQ0EYk9u0Zi0kwUSfyMC RhvxtCYfRYH2O88gBLScbWMt2fDJjrlc2Uxhb6XkOfQFhzxHXpR9Wtxqojdey2AnSb L9ksIB8CjlSRta6gXzx4W1eATb4bDc+p7gG7P3lk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1870FF80722; Tue, 12 Sep 2023 01:53:02 +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 D8BF7F8072D; Tue, 12 Sep 2023 01:53:01 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 63B26F8069D; Tue, 12 Sep 2023 01:52:51 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20717.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::717]) (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 9A25EF8069D for ; Tue, 12 Sep 2023 01:51:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9A25EF8069D 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=jWDDjygc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fm79473wD3x0tvf8fNoOM2UefP4CdrCdh1FCwh4dGSINFJL/Ik0B3uc7LDXjk0oEl3L2RoHQTUGvM0qqf1b3bdB4zkgRw4T/l53hXZNdL1ZpefbMWXp/suKxC6wIUSZJaq7BbNLNJ8bqWThCjgosn6/L4Yw/WNT7ZLZiWGMvAqP9faQ/dRvloE5iOHsjdNsfmS2otiAphQkW5e8xQzzxhKSL5oxvl0ff/Q99er/uldg9F0OGKJzFdwSQf5RwopIx/T7j+x2ghxQf10/uwPlMiMSs1iCCpyPvSWnpG5oRP2oCtUn3tFfcjX7f5olSTGdH0rnN4KWaLux2bYASxx1n1w== 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=Qx6VUzeAbfggzFnbcTgVqI+ULTit6h068cc9hexjlIw=; b=Ac/1IQ/H4RFAArXhdZYyrdHTekSdvBu/tO067c3B3QLkAwNu8nRThLSp8ldJf9QHgqlhGCSpwOMB2UIfHpjm9a/zpNq7aAJLVWCH1rT15sGiRDgTS3nhXW8+LeL6EN11ZrnMjA/+s6MWakN4TLfpDBUtp0z5xCmIVKfSFKG/PTNot3oqoiduQiuV006OfTxCselm0sZJfR/lJxO9uWKH9IdmrjZyKjGNE7yX76y/laFGtdqNErC5P391Bq5QzK2TxiPMH/DwY7fc03Hu+WaPvImYF3uGL9y+FW0+Pt06YXY3Uhn2MBbOMdJPPz8hExiJ9I4HK/u3LrEU0Xvklc0D1g== 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=Qx6VUzeAbfggzFnbcTgVqI+ULTit6h068cc9hexjlIw=; b=jWDDjygcAYwsU2wGw5bmbuVN0s430Znd/E7JznUlcigWUGb1PfNMZV8O+b83D/gvMC2BC5Mlog89tch25N3GTdDVLkaEzBPinZUwqZSVV9alegqpgUp+0GJq4Ozzu5vFwL9wcVV9jwpg5pcoQpqYpAoohNip8kjLpNFApD/AeEE= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:25 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:25 +0000 Message-ID: <87pm2op8ua.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 44/54] ASoC: soc-dai: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:25 +0000 X-ClientProxiedBy: TYAPR01CA0129.jpnprd01.prod.outlook.com (2603:1096:404:2d::21) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: d345c122-85f2-45ea-78c1-08dbb322028c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DRP25NpLBqpNEYLhB6XQJW0LABxAkNdevNTYYuijdPX5BoCycWA7ldcpZ68MinbvP89bfC2gCZKRd8HJe2K0defR8u1q2TYqHWFGGYnwPqYtJI6PPGypLaN/os990n+y0KwSmlyZOmeTrP9k0PTadXB4wH8RfgpOJrQ3UCZkkBgma4YXHxN4AaM/h2Xn/5jG/UzMbVw/umKkQSZ4U0rdRt2nBP6Yxq1T7MLAket69mbCAT8v/dmP01WoshGlMMY63kYc+1VtliUyORESRxug9oNwuDjTm9mIkbyLtiPAlCHn9Ri+1Mv9r34aRVFau+QVeZk64/2LWFPXtU57KMDsCQ1xfX7zvZCnepk8KHjhs5kSjgHenglrw3DWLzDlf49kNEHopNwI6tuq2PAkXZNRVM8ygUt4fQJ1L2+t8PyrAVx8i1d9OfJrJqURiCqFw3XTRgi6Vu5I0fs2Qw+NXOpl+XIBmGO8wfQztKzn4MrlZBbVQJ4JS8JQi1oB90e9QZ2dQYvJVAMFpVnXJnxgPTBEFdTMVjiTd0DOxYheQmHybiv7aJSFao6KlQesSDIOle8huGhyo3snjmg683yNv/iO+OAJAGt1xVUnsIxJIpbKVVv6xKcMq/zQj6HTECVQYzV9dUXiPkLD8cakzND36BhRpg== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mKQDQ+yHUz0XuDTMfn8Grzmi5scP4hVe+u9uIES1w6QJFC03IPupOtTE3nKPrM9mbSIX1FsCz9buaQVCFSimT86j+0K4ZqyzXrK8sZbDCJMuRvWjUVV4uQfeo0vZwCfgwZrorvmlRxpPzl0cARmbgarF5XT1lGxF91/9clpJdyNWSiINwqC5bKXSRUB8tjEJBZQ7Aut7ikCX/nOxHuWEMFhIryPu/VGQXe+i6rX3qwNOH/O4D+XdSPLJ4B+RbUS8KvDCxBVUhLw8sb03xRCwzEcxQCh9U0+wj1UZJxjbMJrBJcdnrgh+0jcP+Tupp5rVysD6akKiJ56LjOPe8O1ZGrMzzBz6zLU2mmEBeEY1++nV2hpwFbspAl4OUlUj1E0qimDAd9o0Fh2b7hHgb+UqePxOLGo6sidh/9jChGj2tgYOL2PTkG9SYYotx2zSzv7bwBFGnLMBWcxEObm8uFzZicngRDaVrF1XfiX2AGrgjq1+GMKHwpm+3kDd98p8LdZLh20m3ARa5W5Xi3TPjPALRGwAkeyrQdvBPekUH+LblHeuow9VZ/NNw97ouBHTFdquGHxQHwAH18tFkDg3BTg13ZY9yDJbf+XI5U/maDIznNjNo/thBr6z/E4UEzvyGDXOqIgwJgbnBOqBl+1Ek0VwEeFGJcGsx//uN155dCokAVECnqbo9Z8EyT9eUZRjzusDVfI8OX409MVYVXk+V/i/p5oJCtz8NslI/9df/LYKVUvqYjcqEfRv65tRHqUAMAI1GZ47JXzibSLfZ4bcItR+IBTxhgdHWSZz91iyCCVAWDx19j45m5xn0wxt4lQJgvIF+7OrCtUN3dQC+UI7qm1o2kUl4DDT+T1Sc5CnEYakI/ruvUBWf7h5qEPvOpIFa9DIklQd53zIUYpsXcXR3+yF6ifVljcDkSVgVdV9crCGvQ6nfwmU8MSwDAMchWqcZib6lBhNIPC7pcn04t6W5CzToTIG4JPkUFMSXKAfkQ+cN9TLQ2adEUc6pNCvB+EcnMW4IFOpYx64r7AvocfACeoHY0Im3WNSdfrVNohux8eMpuRDPiWeutjklEqR6Ny/CGPNwd9SZ/uI4hWCu9TtG6NMleoQ8J91v7TdLyD8kNMjI/dAdGfWwRy0md3wT40PTwQyHiatxgIGNZbEK/d1mJIW2+3RzomSY/l10UhGs5dmtJnDHiZUYQay9wMqaVoU8Z1vwF6g5afEIqT5kWgK4X/T9b7did85j/q2yrmrphKN6gJg/OUdP0pYhxqbDDG7OFWDdrmGQtfEDWhFupXA0AVXL0VtCdgCpJa6D3QYA+itSbFDco4by0qcWMHxAz7Us0Vtp+wQwA4HZ1NjxDfYrr3ODNbZeEubT1j0cWx6LANkIeQ2J3/67gF1p7oblPfNrUMMSRBa0d5AdPFWYe3EA9iKEgo9tJDLYAwB9iVO2c1asEZ75YI6BUxCEiFbfqy3C9ttm0XaQQUKfH3aS1s1bOHPEqMjEaF1iKJlnfwbFL7kmyMzl8QkIqsOXsKSVt4Xnv47EwEq6l0zanTbtYAzNfhJvvr1yEhh1b38q7mJwfQVSuyu5eCox+Ks+L5Svjcijdu/Il/+GBTcCkCf7jatH+dNn9tQwU4jcARzaQ8Pwj1kZ7s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d345c122-85f2-45ea-78c1-08dbb322028c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:25.7531 (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: KwniP0TjikVeG3eYrQ43dYgCGy0EM7lEfGgioI33c/o+5JCSePr0+Xd6CHIidg0lP2KLPmthGI+qRMCcBJX0J50I5YZGPdwCE+2BgZr3srMK+XKgFC3ljCpFsbHOl3Zj X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: SOLFBF73LF3WA3DEBXXLKYDONYCHYTRH X-Message-ID-Hash: SOLFBF73LF3WA3DEBXXLKYDONYCHYTRH 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 3f33f0630ad8a..3fe1271204fc0 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 Mon Sep 11 23:51: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: 13380421 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 DB2EECA0EC3 for ; Tue, 12 Sep 2023 00:01:03 +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 B9BEAED5; Tue, 12 Sep 2023 02:00:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B9BEAED5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476861; bh=5yoWt26/yCpO5uGQI282aNfXHfoRMVrvpLLkhc/Mb+g=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=gUtM7Wk5gxvQ38RKo0SYv57N6jFqZgWXOjV7Z4v0Tn+VDbji4ALAPEjXL73NZcT2H kJxSigJkL0j4pXt0wkNakeZngeZyEmn4wW0ANeC8UFmNcYCu2hELxZvQ0M3IO2Lx89 mS3/ZoSgnjfLUsD8l2VMj3iB060NMp3tGXPLQebc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6D669F805F1; Tue, 12 Sep 2023 01:53: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 67D3DF805D6; Tue, 12 Sep 2023 01:53:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CD915F805D6; Tue, 12 Sep 2023 01:53:06 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 2E736F80537 for ; Tue, 12 Sep 2023 01:51:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2E736F80537 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=bisAeMUP ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QbFTwp/BhbagyLxq7tHaLnyjv0TwH1G8hjI33l7p+UHxzlti7KcuIdu0Dg6mIV2+m1CHE8l/zNMqWLykjbf4bHQcA9bEhtVXyfnK2kPXCkJFm8N7GtUMEa/JhtO8wfZHwKpAINsXBn4MGgcO+S7HJFokS3Iv4qIESsfYGi4aXHhSu4n6I+pAiTlaqSdUXSSCG5jqMeLCDa2mubzx/MbsBWKr3y44HULNJXuGK894ffxBLhPj6w5YmlwG7R+ZCvk/xD+43IW9XfOsVSvI4RkjiWdIfqKjkSP6LFg0BY1mt1xJWClaoCh4q+06cB4YcHzDyJeRrKkm9Yh8Az0kqxrJig== 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=L30m1KYgg8PPMEvLE66iG+pWaL/K7NDhfByIOFrGmIU=; b=boNvkBKxF3NqRofu+7+4z2KZzfaiOJLu6Vwa7koBgsye0eOCqQkf4n+y5LEuZGZQWhBgdoIAx/9CPHnliZ/ggHFhR41A69u4w+Z8rdJX4XQVtze729cJX1nBr8COK9TOtvFcrEl09fdLYg31Bv5a7kUxucCFI1X9A8P1krdA6Z3W597tVmTEDL2/Iy+DunVkyJj3DeDBy45B40rr9Glzo8mhIx6YLyg7WVwDqx4MslMYZTexAwuHfvupw+RQ1OO4LLS0Fd02DViRAQzU++WkyhXRL4UP+z/Qdf5e86P4fC8gH8nSfaQBjb/ReDCPmqn/pgvqPx9Nfvd+Py/4v2DPGw== 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=L30m1KYgg8PPMEvLE66iG+pWaL/K7NDhfByIOFrGmIU=; b=bisAeMUPdnHfkqNJ3AcPhR6e5gZ7HmnfGpbzyvKThIaxuAtt3hm/BzqYQcPyMTCjhPZQs/ml2/38U+wCqxSKSPpO+wWteXgnqsKvm7QeTKwVPy41bZY1hOf/xnRUc71ziKDgDEx1DEp4K9q+HGQ+7UDLDmlUtDg3FIRE32WTDkQ= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:42 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:42 +0000 Message-ID: <87o7i8p8tu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 45/54] ASoC: soc-pcm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:41 +0000 X-ClientProxiedBy: TYAPR01CA0064.jpnprd01.prod.outlook.com (2603:1096:404:2b::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 8cf4b0fa-b0a2-489b-9243-08dbb3220c3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p6VJUpxUlJKMX6XmmHbBIWwrp1in/lJeBqyIFifvT5LH079r6CPs1E1yHS+w9uhPMAKGOJKjRsJtAudJSfiK/2WRaROLhyR/kZF2bg+8RySP8gYdFcztwvinTWIrMG/rVf9JuIoftKQIUDH4waLtXDev392bTsA2kReGU6Db2n4CHNucn93dCw9cbAlXMuIrXtBOf1K6qdKz5m1XyaRzmM7Lkxv0UkMEm8Pfk3aOYdzeXntz0/ro9hCb7QNcedsVoNaNr1aSmcjAnjLcp+73GKJCy5lKaPZQ31lQ9KpeMY0e99vz0OtjmRm10vQlcjmf49g5yTajhAeBPDuj4hcGGDTAKgEK9DVLW53NFuHxuMdZ60S9ayl3+viVXEsKuUJ8bhGhBFVEWaTlhA9hT417Tx1rDvSVmyKnYycvr554notQwhuVKD2XWej9PCPz0jiRwYVVrfINq365Vpy9coCiBBS3sA7b/ulSIP2Ayn9mgBcGggpS/q9kMcGsgnvS8+DDehtfSc0Jk6Zd5ESZma1bF1SSVv9OuMwar+qwTFTpLE1nqhxP32i4QkrWl3txY9K/XYhSl+1ZwVMJZIzJ9++Q+AylOhesfAUjJX0uF03jneawdcut+wEsjeIN6srqFPutzVYqMnayI2XELVVy9uf/MQ== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(30864003)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G0nlBeKQPmJ9KZvQo+kn756+hryyNyfvQyU47717uQUhqOXn06YpMwKhNxL6LOXma+yCsgRpZDsw9SFx1KyWcPPeafRav5Un69b47Uc0jTGdRi2jaRInjsmKogucc+cuWh2Tv4W/mWJjK0Mc9zQMiNDE+33Zp9O81belMXc0cOdn7OHGMlgQC8zV+PUsPLfGUHNitlQJl2xykPzUvtcpXLsJwEMTLzd5IY8p6dpBjbfmssMoNOltdp0uN3bYiFLPVe2dXwgULbYodWj7bG++fRur1vUSfjRbDQIRwJVdCbomw2p6CfHHCm4aWHZ5OxTXUBOjsp7GRNG7XpDrvCowwCmJzrkUmBwUfAg14doWXuq8Aa2KbLivWzW6TJxHogL9s7OaO47Qp2NUHIVqq5cztZyb8VJg6VHfRYU9CFsVQWDp4bUMLn5o1AdKYYmqN76EZaeB9huwQNG+5vTZgbFpW9zvM1oNZN6Cs17TuaIWti6Q0JsbjbQ6Oc3JlwwaX8YkRirgmtmwRxcbyAt3gVFxzmES8IAqMG/LOy/jKOvh2wVQvMJbaEU61/q83/jQ7a7CybqyNW++tPjBaHV69w3NE8lYXxLO04CqPI4K2ItRem4RUdQ79pUDTyTWwpQDbIguZrDaBvfOZmIqXjkAGsJAsxfnIEO9VNM4gh0qm05gB3QqKWY3EIjl502r597cICAFszfcEV9RkUWDiww1ZXHkIacg8Ountl10BogGufl12StWJ0aocQT7oa2tJtuXtlFK8wz9FuwRWX+/+WhhthPhFjbpYWmeKo+o3WSSCRYtKi+ABynx6fIj4JpizVN9MoIWtEXATnKlNgSqyeDxJdAcxzLTmywEzL4yBZcLPnmVkoRnqBYDrWPFF2YDO9E2HQzu2nJ38dry85LplmSvpzQ4kZr3CyTYFwDqbW3MMCm9lDkgQ3DIsdGz/A+yJqLC1XYVWqS6lgVE+IgNiPuQyJ/E6KpVxm7NjsKoQ0xmuod75Ij9dHHlv56wKBd6pIWgFvFKk2hf3CbFDOtZ2FfAe15R52ybYdKPTUWlyVBs1V7czwS2DCkgnkxZ1CdVDf8LIf6bdonGesNtG9/YJCETYNzCp3/ld3rmZ4gjS9DPBLHCH+LfCtZYBhMmagTBSXK3tVfztpOYJLIITJMUcZ7SK30AX81xChhtaLWyJU9cSyQCFMm0kfB0PJD0cIZOxbFLHnvMYwxyUr8vLlhYTXLW6Mcog+dYU9GAXkVHS5EUGTboK/q33hUJETO+bVsMUv8+zpYaHHt+o1myxejtezcHJJuoPvwWmObJaOreEzcxRO4SJN0eL1MQN2w9svaw/OJOzEZV1BBdkeQhmyl7XmjnMb9KUJzyzRwJ1f9ykjyAIfGFnfxXY3cRlD4aACUrvrfYgS+6WoH6a9af1V30uoeCFLjtTXgSo0aWk2nMXtb7l1ckoKeZoryeZcHikCWMzwnFY+vIcOWt4wnofFCIZkLUsow0X+e1h+ycSJEpoXZvDHAV/9X2PzT10UMkK2MRXPiz4uYmrU15q8O+K5/72sFNxwqd5aDtEEFeyT4CjWqCvl3AqMeJwE8vnRZJyjdyGra5yQF6OguDDqc+YVlHFLUpCJaIT8/+4F8kLHjmJPCPbB5D1ZY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cf4b0fa-b0a2-489b-9243-08dbb3220c3b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:41.9537 (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: f3+LkqLDhVGAQkV4pwtZRWm1bbAex6eo7EIm/dpsmYP4lwd1iyWV0aXJ2z8dy1FSUhCz+NIYEUg2CNpcF8GMGxPNWvzU0v573hg8xzyQV1062ZxpVbrgF2iWUpmH15eX X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: 633JDJ75PGCF3KZNAK767OOIQTOAMDSY X-Message-ID-Hash: 633JDJ75PGCF3KZNAK767OOIQTOAMDSY 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 eb07238768511..f1b5a443a1d0e 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); @@ -1086,7 +1086,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); @@ -1111,7 +1111,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; @@ -1398,7 +1398,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) { @@ -1671,7 +1671,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; @@ -1705,7 +1705,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; @@ -1742,7 +1742,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; @@ -1781,7 +1781,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); } @@ -1790,7 +1790,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; @@ -1829,7 +1829,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; @@ -1856,7 +1856,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; @@ -1875,7 +1875,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); @@ -1912,7 +1912,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); @@ -1978,7 +1978,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); @@ -2081,7 +2081,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); @@ -2284,7 +2284,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. */ @@ -2315,7 +2315,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]; @@ -2402,7 +2402,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; @@ -2456,7 +2456,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); @@ -2633,7 +2633,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 */ @@ -2643,13 +2643,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); @@ -2707,7 +2707,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; @@ -2722,7 +2722,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); @@ -2736,7 +2736,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; @@ -2820,9 +2820,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; @@ -2833,7 +2833,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 Mon Sep 11 23:51: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: 13380422 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 23285CA0EC3 for ; Tue, 12 Sep 2023 00:01: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 0C6BAEEF; Tue, 12 Sep 2023 02:00:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0C6BAEEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476872; bh=lWJfJLtWGsIQ5NCkzOTwKPQl6C63o14BmkiwbQEqjX4=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=e6llIHL3PRMN9xE8gi5Xgu1l8DYI4s1VK6ILjXc5wgXZ/XNBq7hGvLXaLbn915Aou bAYhi2oa15OUrQa4wN91MiPXmJWHZ0BS/a4y/Aq+pUszk1ll/SBSUHe/XOdsMyKsVX 3TWrrG5/gB/6RJRlN/Lx4/M1q42VWDrOY7s+5Kfw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9F6FDF806C4; Tue, 12 Sep 2023 01:53: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 A0FC6F80603; Tue, 12 Sep 2023 01:53:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7DA5CF805D6; Tue, 12 Sep 2023 01:53:08 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20709.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 CC90BF8060F for ; Tue, 12 Sep 2023 01:51:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CC90BF8060F 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=ERRqz4/4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JolkPbhAAmIrc40xmw7pDfva6jy1xWwtavFruAPcGxo6LJ6jBljlgRBNxd9GBEOY3Gm7pgCFEAV4aXuTRhmEn81ktQFfmBYeuGtWVeWHUmkjs5wsjUGQWMB/Jj/jDrox/bZvBBjKZ5sTALuV2RZ5P7R1HMQCRdd+hIkfncs+T4SSHWgmzOna1UBt0HNU/J/pB6XQ0cx8IbleCO0K0vB1vrTI2gzWZr6RjUfjGYyOBnkbYunygypWK+P/xWBxgE8DgdtcZhNX1pHc7DbsyvvN03U2Z42svGkUaBgd2RweSEI09lyCECk/aZMPsrjQPjCcqV9ZmVYefdsRS5H5h/fnZg== 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=Ri5GN47Qqa4vjhkrIwdvVKc/U3UOkUu5/InypeiIG7Q=; b=H7i7tujMjg1EuxN+NvBC9MDDbnHSQFLXhm848Z4y1HBSd7Wmcuo5YcuSKTJaSEEjyRYvpHv1UdCjybaYrv8HAhJU2cM1rFG9LB1Y/XiFifaBOi6m2FlICP46B977YtdTHPhLIifGmyQm/PNlnnc4TVYJv9e4s62PIsfsdmxOH2rtXueBeoEZ9JkvCFwvZnJvIyBz0SFEHv+bsfLB/oaezu5rCad/8LhHz2stK8IYgZOOs3faihwANDwS2A1oCPB8cwBXCRt6gwBEQ1kUZmrhq3h1HrEq2/mzJOyE1cDPeRKA0/waD9WBwZUMD1bP4PPHvnyKje4XlcwTZKgjgAlcDQ== 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=Ri5GN47Qqa4vjhkrIwdvVKc/U3UOkUu5/InypeiIG7Q=; b=ERRqz4/4FPZjELAZjJKWTa2QErCunGwEmCgogabUXm8uCWiDAtl3DtuJLb/s4c9GGO+ILIzwp3M0pNZUL+15vJMKG0vSQvestJClyQ5QAtMs1tBiRWcbTaeCXjXhuuDsmweRlRXJPK85MGaxFrblNXq6xBaXc55S+NiWsEsRqVE= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:47 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:47 +0000 Message-ID: <87msxsp8tp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 46/54] ASoC: soc-core: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:46 +0000 X-ClientProxiedBy: TYCP286CA0194.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 40cd6cdc-2a70-4a8b-e5ca-08dbb3220f5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sP+sm3tFO2QGqzZzuKpscxaeysezvqSM15rM9milSgsBYsYGyMZwIGz38Xh/yKzUaQ7sdoFqViz/FnVtGprfRqXWZrLKUOxws0XMK4dJ9Bve8any25AJpOsx9WtMAI5E+mkBsg9c5S9yJh5a3jQvxWcPw5gWy+z1y9UvOw8Qb7SJbTBvLTlyKwwO4ZdFYNYE7TtFIgXUECeJ5iwguzntFbIz7Az/Ud2o5yxAYh36CF8LmoPMNmOzWuH40mlLRr7evj1qO0RPrcgvv5dw410s9647JSMqPubSTZHYO2NvSf3KJrzZhJciWVQN1HIXndPXhZaFnwPO6Oa3/JGsmMFMhxzwKPhkwXddnAoIQKg4lbWIP3+XuCbii+G0Drr9si6ceOFg9I2SJTC1QEj54BHCBPaKwjsE0iO6s9GxYN9Jw3lMY2y35dkwco4l0yEjYBzI4vSnGS+CRe/DrUphnzxE1hOXpYsXP0ZXBBKdtLpXj1Fl5rPOtT4R+TMoye8F7hXGHgyVhPmUyVeP0a6Nvdr+SZUX6pvWKlmyEalCbuaog630MG3OdrLGp/eRBdht/HOo93+3TwSzA4zmEYI0JZWezcHd+mMsqhhZfbf5pw4XlhqKVm22ABei7bMCEt76aueQZ+OFDUaVjeJLVAcPYPoqCw== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IphVw5CWBW91hzEPQrTCEDvHzzor6Qb0TuJE3ZzHAcUUl5uOc2AlosLxabZo3DWmYEWE8PilZyvU7NvMrJrESGZEinmF4tLnb99vD6BSv+rXTp7pdlVg0Eqd5Hh4Kjur+PyBvvYs0mj47Q2OE7fRXXP8sEdV34f3uNCJUq4ZkBwvng85G1GiLHwhYHvgZ3l6OYn4+ajg4IKZtZGMvQF70kctGD+kGrXd9vGNybVLTuuET/w+JklnDf9jBZ9uOsTIH1OpwuzYf5vDn+HAayqRq94S35lWyVT4YeSlmCkn4KNPTOwy5GZJIO0OJ7xUxZ4DmoFziVd3gK7yyf7F/53asJv3brL+I9VG6VjmZ8KgOegjOlmIeiy93var6pj5a105RIDUKv6ikfDUWwhz0BtqCNDhU1cI/Db/StfqsbDetBvvUk25nXhy53FoithTBYxshVtfjMh8MWxJMQd0tAjzpa983Pi6y+t2+lvNlAzhqBpzIPFkVycv6duOeBK92/J4IIKduKulro0MJHmRYQE96Uv4EOd7TYlbBVGIHIsnvCoaNBlNUCdMRifCrdgaoI+8gijAyOjcYYpbjT208Qt9LCXnOpd/8UpMyJX+cyiq5+GnGZk4Ub9KevRKY37JcLYTjg6NmYUKrc/nkhG8ZZtem51SI1tFvcpmE8imm5E2EeZ54vU+wo3m5w2wKE4IchjT2qeTQl6w0AF/1HEtW2zophIRNN8Oert5ozdefu12YwBoH2/5ietr5dw1emSpnNN87VDNvWwBqK/4dMZJyjIaNYhEd6PAGg2ILUxKVCJsTbSHtziXsWb5EB8qBUXCId0RKvJiyf2I1TRuwQmJ/iZgaOfDwIOxz5i4H7laOJvdhSm/BQqnjqKO6uoqtBbO+5ZOhh0MqrZQcZ0tXFu+OK1pCtOowPUBIFW503AyIrRaFFvT6aHq4kLrWcS+ibk7jxz40e7nBGTwq6Edo+ej33/eEx2kf65aTRjIwdz1EtDoM7THPOyQHnbaRIKF4i6P/5GRGertsm4+lV11fGCd0d0d1CB9475HixCq0qADEcszxvgYyr5FKe9DInJW8edM1+LBGZfcUKYR7+77hzi6ELNLrpX6TfuP3ts+s/GnXBub3pu1ww5mtmqDSzaM2d+e7LMeC7Qk1o0KCbp6JbPv0CKKcIpne10o38bbKHokDxcelr/gPC29OiNOWUDKgm46wihqOQ6RJpTTxh7VuvjhpEANkw9xHYnQRpf7OOpuc/oMcSiuC1F410YTjv3gccDkOVS05We0mPjAlBIgSNIzBgwoyFqnGLBWnp8NcVFcX74Ur3242xJStsmHXGMD2GE0kQuGFAVsXkkl1IBTgDv1gu0kJmhaAgHGrskOlR1FQAgRGuklZVN3TXDgGzJF204KW88UUozE+uENQnWsL4qjCaayQaatoQp9YAUbjwtsfjoPFmOckNI9OpUa9u9fr8UQYg88zT5+qZvGxRJdzi4VnVZJWZ8kZRrskw9BHqIyoNNKzLZyKFK/mYpRAGbLGWQvIPnRyACMs02EjzEo9pyGr5+saxXmKkxAju2QnHm/FXd57Bpecg11TI+6sjXoHWN4OY3/Suc4q5W0eazJlZ0U+mgWbESGSqTknh/6ykSU0Kttfuw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40cd6cdc-2a70-4a8b-e5ca-08dbb3220f5e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:47.2256 (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: PLXzZTDeJHeG5vf3nOdrmekEb7EaFq9GS6v0qMH4hkZLpOVbCRuEpBLsWOa++9P7Gw5KoUoVmKeKiMLGmLfzBO+UHNKfhg2XHjwayR9Oel/FJ6Quzu4ouIfOQ4AlZQPJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: 53WYOAGDCBBV4PLBNQSX443ZFEGZGG3Z X-Message-ID-Hash: 53WYOAGDCBBV4PLBNQSX443ZFEGZGG3Z 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 cc442c52cdea9..c305e94762c39 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 Mon Sep 11 23:51: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: 13380424 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 970E4CA0EC3 for ; Tue, 12 Sep 2023 00:01:54 +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 8CA07EEC; Tue, 12 Sep 2023 02:01:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8CA07EEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476912; bh=8qhIa3YDBD2UvB3YxxctSyPr/hto2nqLpUe4JVCc1hs=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=d55Z4cRmseby6WiRlwZ7brmgTzZCWWjKgcF9idLToh8Fkjy8WWMzTc7J4VJ1vMyAS FFaBX6e3FUjk6Ez4tfKmOL1Pxq6wLSFWpHj30Dq+fbk9pYfUobBwc617B9oXTmU0tk W2WqPb/rZzGpmATzIl3NoC1qKA0WGhsqVmfXr3z0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 99E62F80759; Tue, 12 Sep 2023 01:53: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 8F9F2F80621; Tue, 12 Sep 2023 01:53:22 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2E9D3F80537; Tue, 12 Sep 2023 01:53:09 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20709.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 7AD81F8058C for ; Tue, 12 Sep 2023 01:51:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7AD81F8058C 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=GkqtB6ag ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IW4ZzTYEM7jT7HxNL5rKHfHDoXePyW8qq8PLc00nfm5lqwLhJVKCIq+4mBXSmASpN5hGMvs7CCD+OK4uBeyziGpAlLLx5+yq5FadRI+XTzxOHRm0tJCx7KFlWXdmwKUSx7HGpHXDCPmx/3pFt3ypbSGfR3JoJRVVC4rwY2WpmjiyKOOd2anPTHmozUG7EIqPQezwLzQSHSlbC2wielTnqQM7C0KYRw4nT/dsnso/8xB9IpmWCCGip9308bm89oifyBj+ul3t0MdnZFpG90AONccahUDVi/wq5HZumttwWcUMVcdRqSIBZ2PhYEmG5rgJQE+PzkWQoInKOA/xZzW0pA== 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=L/5m3a2GhxtUUvs/Ysbuv/V2smIJWfUb6hVJj/Sp+zY=; b=Q9Z1YG1DLlCAoIYtqdwS2LQepXYobqrC03r259BHqR8Iu+lLDvb2/Mie6jQfaJWqY3FCBVcRguCpneAFCCrmmXoyv980HuPa5W9gU5emeiL7I/CYbvnjDG9jug9eMHCAXCIpLgOwPz1Dfvm2J0h7Kxw9t0SQ+jaBDBLirJTr9mS8Oy6PE+cgs4wjf7ByaNu+6mTwIfImxfTAq4Hgu8r3VOr4N47Ceol8lOfhIUqAhas1egSEn9A6Ya44rkhgPnxMtdByA5BddK2IkuTmiSB0V188447wzMeAX1j/FqxHVbYXfUIcpconv33k4vnP0/mzO6MO+s8IYY/X9Aa2j0fmJw== 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=L/5m3a2GhxtUUvs/Ysbuv/V2smIJWfUb6hVJj/Sp+zY=; b=GkqtB6agA35cAp6Dg1MrTiRHYwox826q/fJtaU66DTH/Lg3PUSPYXgn+8x40sxpP7hnxtUi9QwnDXrquils66RitWBcvwaCDZjFYkqCd3dwe9fDcPNv+qP/QaiNfVv/WokuQyl54rswlbGeC6caQYEvt058PJXilkdb6Bf4OCnE= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:52 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:52 +0000 Message-ID: <87ledcp8tk.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 47/54] ASoC: soc-dapm: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:51 +0000 X-ClientProxiedBy: TY2PR0101CA0022.apcprd01.prod.exchangelabs.com (2603:1096:404:92::34) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 154e5e84-b1c6-4fa4-8c4f-08dbb3221252 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v9K/edQ25A0QL3wE8hBCdzhqEZ80icYmGiJB72LEgNO+CxElWqaOACL1mPccQ69Arxf718nuNuEPX+jux/XYMcqNRcDtWSFNxD82TyZESvVVIiLmZNfsTI4pMGDHZYMjZ1qGfS2mSIDACyWY7UCr10G4J+pLxUBvmF7Boxyyxl4WQ7ubSjDdeziR2ws7GgJjGbO0lsShmWHFr7w4SRua4Hq2nJFLWq9zwhokjUaaQ2UJX7C7C8CMVrQoKI9cpUqwXJh5rdaUx3I5PtetlsBi1T/O2K07Cif/gtKMz3VHdu3eQNad3d9+A+FhsC/3HfSUXgeW+BnkDN+OmocmMdq4U8dAAVT4NXUaMR5KxqLECidjBQGUoXT7pmZbvyqosGncBbwypxJ9MrqhyG4uGtICPr56bdfX3Ob94gh4NhS6OC8ydGYeXCe47tNtzecu8mG6GNxw4sVKRpd/tFD/rErjrM+zSv274bdojgNE9J03jPibFLWL+8tx4OcYjySvQWmUrkHnhFX7A/XciHHXrAJxDWKVAZaFWvwIxqzxvuSH0rFNWLzcI8KDY5XSaP6zeKE8a14+idgQ9VNPcqZaPuQxyegmATG5J/d9MnPtM+7BSNcZlT49/rBinA4v+VEtAQetxW4tzFwKEelK4urdIFp3vA== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rykR/7wax9V6zMphDqVcZuMe1U7gQufhGrhbSDf2YZgNdBg6kq2JYwZnP0UKsNiDHuUCu1sA20cCSeJ1kuUuBD5zvaQ4disLDOqExLqhvovc3ZJ/2ZiZHbG0QHOnMK4hkdaTstMDRgo78LPljV7vs5qu963Q2zQORBWu0qrfQFEXj+6eo8w9pTBrpKAOMyChwqnjAgf05o651bMF8lI5znxNtzcIHxNzGMHEvtN8WNZd26C/lN7vlBK7aJKvjmmkCwAk6+CFTC5Ma/pe5FG8UqRgz6GM72dSaEHNTE+6DH7GVxwZE7jy+/H3IUJHJsD/rK+tLPMM/XoF9qATMLfnB6lJ6LxFWhIGcE7e1DQBEFuBi2UWA4eeOmx9Nc+ShKEAIh+tIjt81aIRCtWE8RjlDkZ39/B/2/5alBXO4udQZDgJ33FoUtbGlPpvUOqMgaPUQEdy7u3fISA8mxPj8qKN1EPWZ3t06fl5aUIvk5H+Td9noJAbagfUzoW730m88sb/sTjD7FtRhwe+cmpASEvRWnt2hdLeI4ywlKdQqRm6g/JL0Y6YcF9hJfYF7ndtO+Xo4kLue0Hu9g3x8yMbv8efJ9qCRJR7hPoxS3BJyPmCpXABhtS4a9HZpVvzoVazE96oTkmb4p9YlSKl/ZlsHf7uoVRhvU4TE6s1uuBxQP6LogRa8f8VX/ox3Yh1dEghUswCEtk3e8OxqvhZ1y4jHXcheQb4/jHwMQGc1Pr2hZHPm2ftIUJ1QqbMTGCzlRGq0MHSHIk3RKmu2TymaN5WTyt7OYFy2zuwBY3kIQd/5lSnf5LpUPjLeDc7nIMxcwjE9AOJBdLKQ/d3ykE7R33xPmeDJKqxnGXdT+1dJgY7GUm/y6e3y6iW0D53ass030d0a8+Mt5ws784JFeftdrLYlGp9MTctCff8hTtvDIH0Vz/AVO3ZiCpPIGmQDTUYOpbzYtjKYytzsBg6x2a3oMM27ishXlIR+sstI5MpTmXypYcM1fDNeqVLD6SG7xin1nUfXei+nk88MAWjXKOCnLIgk+6brHfXGUWdXbTJKSg2xvTwJoI4Lxav4bkeQRjviRg/ZVwxLgT+nxFUZZmJzIetqMlv0Cozdm56JAXw3NiwB0UjKcBN2nsfsrcSD3rjSQIchl3s1KkAOXYieqHdL2KSJRoxHhRIZYBhx4S80kKKC3YqLhhdN/eaIPnh055t/Z1R9tchns22iDuJ++hkLksW9uLxsHYHEqgaW8M4Wyf/6+bgnqikir10dlYVRfcSb7HlcRZKUtzayzR+LgUUGyPsxJt2opiiPoxEfU8I3EdXhfMQGCSjJlx2olRBMDoznToNbo8mC0QM+JIFr3bhRojZPCwYRHcSNdRyJXugo3J7WhBS/SnWBeaExGRZ7LywwCHDPCeaLzBDW8KJUcStd1CCj1mRUM3kOV3OlLfNCDBgB0aSu+nffx0sxafH8Z3/nKSDxPX4gvQnpB26rI+xpH+G8hL7gVm4jSxwCPZ7Lbs5nBFT84Ee19xvhgoruq0qSALWJrgaylBT3xjfHWNoLjO5Be5NttWnWKLRhK4EneTx1n951lf9lZhL/HNOobkA3r2G7Sv4Zc0MrllC80uy4GTJYe+Lh3/GWlv18BienWmbnn7FC1Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 154e5e84-b1c6-4fa4-8c4f-08dbb3221252 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:52.2037 (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: XnhEcFR5w0XlmKABmTNbIN18cCyHze7lkdp1dTLzbHQWMVnWzuuRrtOQcCItpzp0Iv6NJgXOU/DqT1FF/jLR9ZZwzwVwRcOX1GIIt7bL7bm8Ev66C9bt5A67r3M/OyWW X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: BBL2XQWBO276GZZQ4EXPOACJK3H7KV6W X-Message-ID-Hash: BBL2XQWBO276GZZQ4EXPOACJK3H7KV6W 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 f07e836783737..2512aadf95f71 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 Mon Sep 11 23:51:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380423 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 8F19FCA0EC3 for ; Tue, 12 Sep 2023 00:01: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 DEC09DF0; Tue, 12 Sep 2023 02:00:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DEC09DF0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476895; bh=QcErEc72y7oggAoDQQthD/M0YtzYYt1ti3d+8BXxMDc=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=S1G0QndWShMcMmwEgNpOS0upMeLNxO48kcD8QD74t9WLntCodQrqV7KOQo1BWMYwp wH8pi1R3i4oqzFb/YbsaHT63JEZmh1yjAmo2SLbSffQkTHwql407INZ/KypWhV80zO ugtsgEiP3odeSEW6cQOCv2W+LOIeTXvrGDZYd8v0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 74A7AF80735; Tue, 12 Sep 2023 01:53: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 77A5FF80736; Tue, 12 Sep 2023 01:53:18 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BF7C0F805D6; Tue, 12 Sep 2023 01:53:08 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20725.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 B4967F806A3 for ; Tue, 12 Sep 2023 01:52:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B4967F806A3 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=lhlKcY6N ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FWdlzg7WRWH1LHVO/Blymnwpy/MU9rWeiLSTGvd666ydyCLLxXx0q9HD5gJTOOL1uuK+jfh7QJeZaUMNZXUxnGYiXsfUuwlj8Fw8MZS4XvKnXRaNwA6u8OL3B85SvsE60cLBoJKe68PP/28mz3/lkBPXmhrWLFjy6L0miyinG/IlRTNbbt6W65bOKNbmVyUrYEka1kKDEogWVE+rHH0owAUvkm8ZereDV2hTVxeUeio+XKNYdRVJuvBUKmUvP6pnEQuQdfeAX4q+ZH9Lx2wIyeCRs4/4VbY3qwpdgJhgznDm5CPYeh6sPj0BRduceEkirTMQ40YTGhSt+PgHVQRXhQ== 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=XLBrlsrA/dfQvS5wz7vmf51ux/atkxxSfV+EiBOZeKk=; b=nmhgJ1Uda7E20PthX7l6XDlVy6V3OYxijs0YosRmHD4H4aUb3g8qSX05zpA5QVfblzg7AUkCp07tkyU99wuooQD4pJ/HQ7iT4HWsNKARfiEIJbSomE8x32MtBf/HufZkIQCOrtU9GYVXzwjVdB3LFtdzulTepxtJF2ZKAxG+SPk0wcRl4zPevGrfAneQLq92A24z+BklQwNj4yXDqCdzsApFJh7yG0R+aaFvQG6ZF4JkE9FmjYJ4yTwBlKSKEPFIzDj2jDksRdbWoZB89rAxUJwUWiIBHSQMyGNdLiN2mlYNPP6awWFR0ShzlI936NAJiSEGWsJze5uGJGcggmwQjQ== 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=XLBrlsrA/dfQvS5wz7vmf51ux/atkxxSfV+EiBOZeKk=; b=lhlKcY6Nb/HVZUSYo+ERlJmbcE1I3oQ6f+KyrzCE1NwwQEYqUPwDLBDPuy3d2foFYflAPtJaeRYmgr6QTq+wMLQRTU8vM/IV9/hOtXK0xW8cJb4fw/zvVWScvTHuOD8Bhpgh1zOS9lb5/MJnMcF/vAzecABxrLJ56QhjFMGazfw= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:51:57 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:51:57 +0000 Message-ID: <87jzswp8tf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 48/54] ASoC: soc-link: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:51:56 +0000 X-ClientProxiedBy: TY2PR0101CA0011.apcprd01.prod.exchangelabs.com (2603:1096:404:92::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: c63d4a22-726c-4902-e2a4-08dbb3221556 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dEdH36wTjySdWwBRed32k4M4QdRqVyghKxsPm6XsXMndrW82NVtKaVaY0L3HvZ/UPWrjWH0bqsj8iRDZ1Ze6aiFNcvUyugJp+WD+XKmIQl9If+541p6pkfA1EcaZQ2kMdBHmJn5m01tpu3y3/+wB06HwLp6sH5XV5HVvTy9T8FAhEZ+S+e3hC6FIomIBn2ClvIbnW4d5VBp74ZOi5PYZXZPXeaxQDo+vVWiysZjr5Nmwy3I1/hdE19NVv6w7J5bn0c5UUz4qVjPpBamSaim9Rc9O2QHux7XU3Qwlx/2iXHNT2reAO8nPzhKDOLpCG9KQIOrjjPjmakGlSrgkdhdBk6CaTtQbDbFC2NdosiUZlnEpO8S1HklhhglHdrXMQyize3c44BDu6Hi85lnVGSmWGfSV4HogL2Um4MJIwCMzyc/wO6imDlnnz7HWr2a7FskBTQwAODgAVJ6pkyMi4XvdddLK/8h3qKm+/slz62kdYB8qdKvAxYray0LCmzK6jFZ1eaHisyL4NENuUitwKInc90cmXzIkQh7MR2N35gTP3IOPkipUPBVCm/I9UrsaJFACuARvp/l1zO4siw4txml9baMuAOF6hKWDCYAslTj3t86SgKmMxWJtAMbM3A0zbCS3syn/zjQiQPV4hIIXRyInoQ== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QrGVDmxYz9UK5E0DWAAGPMcL3ClGWbjeBUv8ycaWBNeECwdFi+op2mHb/GRp8oLiDAmyz6dF183z0N5YCUap5JnwUXbX2VXK+mmAlw0fr+Ahcb/pbPUxrHw2M1auwE+E6bV2y+e4a7bTp71JxOG2OQYukrjKAcH5T7trwUM8rX9a6NM9QqxazFqCPuAUFAWP1SCDIyHSuwLk+EOz8gvEoddslZPctEbxMr83Ix4UtAp5JpGetFavrWELaKJCoYluX5CFupHC2fNird8Q9fsb49xcru9/YxHDe9moKpfUPSyJxpUniBUUldDvEEvAb3ErPcVzKlJSKVO9siKapzBEss568yFdeibWeOKajwi/KwFMqD1tmKhKZ5VgkGgSTh0l+8q+a2XFJJATPGYxxCEy8bq2XdME198CMFWY3KHKgNOO3kDYUytJcNU2N7MtVe16Jq8E3+DI5mQXGYMPD4qwAFA+v77WEWAVXHN/0+P8coVN7qeu6QAi8DkTYOUWDTuRzhJ2itS0Y5pK1kTmKph3dCl66CDptQlPbsJYoGTfPrkDbL/ndSv64rrBoUfmD4PXI+rqJCyaoKvt9GPevd1sxl6M9phtT7tHPQclvt4TDcMVWG5sasaEpaUlinwY69JlIccuvFHzfYiIghhpaB1gyYcEt3CevsnB3ONP/h3RwpORMKM/mugp77wTEn6W3OPgj0bdTvk0MMhmMlEJA0ZbY6C8zf2Ztkwsuqx9u2PMPn4P23biBtR56OGMz+5lWL3eUVX+cXJMzFNAwKnKwLS8le0a1hZCd79eXn6jH94iJzPnuuFftYMzHj79p+eC7enjjnskep2y3wsXnekejv9WCqTxWqSs//oAT1s/xeO7C2X4GiXtKXRQYhSgaLa+PaHq9B2nUqDprJjp9kZl03bxLmRqAn0QZ3FTulIbk2ZLWyiDnpDK0eWGnv6lvRx3KI/Cu2DtyDk8A7T053Lhtk+iMm0mNSJoUrOozAGARBtkpiG8azzP5meA0t5oFJ/LRUiZd/qPVifa93LMt5SnHXpFCdRyzJuNaJGFTl/568nvv+XCiTxIebHjC/zIiUwU6h6SCvyWjVdFxPKNCYEC7ZkA0YYVTJIvwL75fqw+xvEV0TDMqweBuR3qfM+VcXhdYfRq6u771ZnPfdSZ2z/fYDO3VRmArokeGMJOUdpB6f0T7/uUPtFyEMSUNrSRCWzi8k3NBfVzu4Mpg3gnOz2Kk7PMCJvi++Vyb3g7mriMmlgvPpGCzTrybmWCmCsWy9k7d/BkZXJNAcRpxbcsGPD2Xe49Io3AtvXGdS0osBiIlA9AyBmg1Ms3v7zMv1OtIK+9/rnu010THlHyTEf/09t26gDDQbYFOcs2SjAoqXfCjyUzCYWyDmbrXurhW77EiFNQlK71VjpnNLt2teXDbqDycjwmROccN3Id045yF0/WhOYpjp9caKNgAfCe6uRVmCfuHrBcJqvW9VSLckLEsjjPEUC6gzjG1Cqw1GinSSIpI+6IVlXoM02pfenjQtAkMJKI/1kY/Scue4jihJgQPcpGixFgIIJZiqlp3IXhik/cqr6ymCpQux1lv95acCtettufM2bT1dPX4oAldn3k/bmq6pjp4ABZAh2EMtOphMUHTnHt7Fg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c63d4a22-726c-4902-e2a4-08dbb3221556 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:51:57.2583 (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: CACaLRuidc6jnfW6jo2k8dZ0vZIRFvoYzDjZyXmJfdCe3phbf24WgjLys30OJKBfdRTCE7xE5B3PERelGdeCvquXylih1+mMsRHnA/9nEElOY6NBTAO4eFJAyasEnScq X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: WY3E6OUDMQJPSPJ6NW6AOSH5VVUWDLYN X-Message-ID-Hash: WY3E6OUDMQJPSPJ6NW6AOSH5VVUWDLYN 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 619664cc9ab95..fee4022708bc7 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 Mon Sep 11 23:52:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380425 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 1CD51CA0EC6 for ; Tue, 12 Sep 2023 00:02: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 49125F7A; Tue, 12 Sep 2023 02:01:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 49125F7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476923; bh=8m5liTkIxxmRIrdkreBOfdL30oVJ52TAmmLpDj67tSU=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rgcN+AEU7kqwS/LdqexfLrc/ybkONr563j1m+VrF+MYs5jlG6a6xpfsyxdw+5Dkds oWKh0xGZOjEyDqtnHzbmA+lBr8rhS82TedUGaZ8BhgnLXPf8GDDQUChdCvrAynY72+ p+7TiCa77bL6WuMocsYy/lCCcxakzX4OVQEZcQYs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 19B57F80571; Tue, 12 Sep 2023 01:53: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 7FFA4F805D7; Tue, 12 Sep 2023 01:53:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0E036F8058C; Tue, 12 Sep 2023 01:53:11 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20725.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 68016F806BD for ; Tue, 12 Sep 2023 01:52:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 68016F806BD 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=UT0d1fRK ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BCypmibrBdAyDIxwkfQQvMM2IvIF+o5+HJXvCI+M3RzueeZw9X229I2qP5K8YmcsBYZJJok+RSZsXwybPbAW9PmxwqTJjdqeULz1JhNfFpAVdTGypx9LLGe3VaCUdhsRb24mNFjPVHLOJBLjd7fGe9kdNKI55u3LKgDaNa3pC4q5/E/he3sbV61+EwH+maGPuxRhCRA74OfU673tivZjSnbzL8kGZ1DpYOAyt+uMDEzzQMpkeiTf8F6ZinCpLxca66UqV5Suh+eGrC1y8oc2m9WXmJR+64y3ALFbiWcQCb4Zo0UT6fXLO8XfBfDlj4qSVuq9Alz39HJB8qY+NpdzLw== 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=ghmeLQI8lWDQV4jiByPs7FHbFKayQgiNozvuJ2EwMyE=; b=dzQOhzuj1ZUtmnP12kOBNRHS3GAO7gdwvB4pcS81VSft6ilwFP1wmNy9F/z5l2EV8JZgknesEOvfRBKRfH1tlTJ8lNjnMpc/XIh9Q0OxnluVS4usK1p9b4RJtQsQUKAIld1lEleXCmxduvbmiYBGYZG7BX43iEN340xXiQDwD2dcxu+CZt8LDKBFDHKhv5QJK4E0S/HooUKK5ke72EoZbp0d2jOaz3p+BYNSOEGTQpE2eduXUVd3EhxThA6jYOdgRrPcqmR02cfNQNXGwOMsHUcl21/o902IjTovXjtNn7OvjLinwPJTv3ufN494mV3pxbM2evBvE1oxsXWxLQFfIA== 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=ghmeLQI8lWDQV4jiByPs7FHbFKayQgiNozvuJ2EwMyE=; b=UT0d1fRKzvbFXNJmNhIku/i9wtmzXL4jL77DRYrkCGHVXOCmjjcgKlnMAb6v8YGJk6NfOxjcAtt+sl/WOEOQHJdqLUQelAUtB7CkKyl23aKG6vEfnk+HFnu1O2o+wmNEBMR/7vB0nUNpRv+fzdliOB+GZMtyzxKnwzVL0MQz4HA= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:52:02 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:52:02 +0000 Message-ID: <87il8gp8ta.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 49/54] ASoC: soc-utils: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:52:02 +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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: b1b0e40d-8db1-48c4-38f2-08dbb322185b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ItuSoWVgELvfQEbokU/mCg9gcnIQxq1ic9qECwT/tJt0phUkPjAoALjZ5ZQwbLg6cZgmeMNDRXNW3YukXLavbNEa/4WsiYEkCDWpQ9qfRc2EdNNtO8BrxbdCY3UW+AcRGQuvvczi5loAzzwobLgf/DHaf0EPnY2Ds5iE53qOtY2JZxGP77P4L5bvcZXBbansVUI3/wHvdilytj6khrizd5fA1OCKBrq0zSTZrlBLIBTadRzw1akpXThhXFSt6v+wx+T5FYowpw8myc41f7HxZDYI4qZPICfUV+2hbdAdaINotA9KdxfhEhvcjMhtJdoQEp4YDY7+441PUwXwxp1J8POSHxAbUXRw5Mxz6fFHIxlF7fQhbZmSQrJzXiBGdbfpSjzySTTcLAODAIcdCq3XBHRgz5i0K+jizOP99okY/SnRoF/nRLxPT5shCcQpSuPITkhcBTEJ5ltZ8/QhxR8Fgxa6rB9YS+FKJrLybXYAt3hkB1F6DEx5LwjmjKBoXO3qX6X/cgyt8I5Kf2LgELqa34KE0XaDKuwO5wr/0TBdsa/wccu1lWRY8FWsic9HrT9DlKmNRxN+Ktzb176u5TwjZhs4bC5Rj5gQG94xUcbpIwuS7Iz8Jv+TRsMTlni30e7dJFvVQNbVl04sTBaFsxYRkA== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(4744005)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AnF88QCPivOg+yZfXuWXs2mhb79hz0FgoahHmMNXfrqovlH5M9XwmGemboZgQ/j+ff6fTEIM+6vd3DPOZNnS9Fhs2gcF1qjGSNSkWvuwpKizL51G/SqDDGeLJeHN5fX1JlaxSlldjaqeVty7FXCBDL2bXsSjCUzhcqPmu9MryiZg0t/yNnjeAXRDfoimYic68fIL1uSlhSodgTRZq3hkLA9AX9vuar3CTCfs1QEL6FavrA0SyVw2DxEOGPsbXQmxcAiRF9LQKVloefy1Vu/K/t3z/3ODCkvsnb0A47IkDfnY2k8byaCzYKhxWfcLiPDxZvksMPAPB+IBOOOB08JdyfKI7IKTnBOrrT+pB5I6P9V5d7ZOooJXnFMtCo7Jh+ZzjKlYGGAG6zQDAsoM3T0Osg3W/ETsjeQEYNsmAfr6e1r+LpPUy5IU+gUN+0y8SWLq6dJW5pVukgHg667ceN4Rl3720jzuWUsfQFKldVwtXnU8Jg2xUxas7AIFT86bluG08xk32+HAgNbRRooe6xyhn/a935/gQXepeyhb5G4BBzbDauvGSuHJADPXQ6uv9LZtsXr0E//npo3nmW60wfPFIHqr76BKFAENWdymaUnhFWTXpNPR1WPEW8zATAWvoqMwkZgI9kjVESt1YCfQEWYKJVJ1WOezj9kwoFAWjRoE+WvAGocVOSd6zxzuBDEPck7YxrwRpgWGI0tGd++TTEklQ9EuRJxjxhlbFqhUR+zcyBrB7/xNPVXNqhxwlab9I0L1VBZqxy9r/kjxQCZhdM0jYd3xb/fpK9CgBB1cdFzLurwdNq58/o+0KhuOzPqi4LNR2oKQsL88U3izeBPx1ika/Z4Yzj3KmbFK43CLITwkSLNSvAlZBR2rtkOR0zCCTL5JJLQStxQG0K3bE1MynbDYxjFuPxbAQN2jV6WBVntbLJH/O+JCJaQmhxAkJ40FnEsRFfDG4stfa+c7X3nvazPeWjl6hsyBPMkRZahYERddEzVzCSca76CYdVGIOzaWbYrQXptlHNChyIZe+uHlyPjpggbjlBy/iKJvk84V6v4CkItoQCGg1oGCk1pk2I9xW4ejGx1i4IZ7RkRxITzMw2b5C/Cnkhv2uBpySvotocxZwyilVdOZx5TMG76kk+sFR9BQUalVq6rU91dywsdqn7Ag448/jB+2qZgm41Z+LsvzdHsxCqjpoAr/C69cA06kXj3XGb9h571CwwPTCLaptyJ9xeuy7w2ZIwQxPLF3nBnqHrEzSNIP6hU450YVu6Eh1Mz44p+3kR01x3P+SPbhhbtUEZwgTueR4A8HQsRK0KEW3KLTgAfOWHNspuKt80uTKSRnXuPtc3Z1GU/dUisPSapoXMbvTj2TXzutyBiZvXg5VxvwhI+qkD/Jok5TNcGP08diTV8dzp7pBPyATYQEwN5BDXScUufgfx6k2Sj9Jz7K4Wgy8IMfzEDWeT9FZ9QleZON7spGansdNRO3Vz9+mAYYGAWWghY2EqgH/Z43H9NI3grVsie7gEBZDraRQoT92Odrd1gQcKSn/5de0HvPMkrau7YE9FGWC8iCx+QevHlmxwDjX57VyqKevfitsWIIhrn4HyKXsDtpDkhPMFVPtwk9iocGrnR8iAcoUd396Mp1yUw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1b0e40d-8db1-48c4-38f2-08dbb322185b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:52:02.3172 (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: A4uTwA80yx1rQMl99hwrH/sNQUJDWCYwdJqgRwOpVG0M1idMLo2NXemXEZYDlH1Q8JYLB6JwlyQ0rl21G7rcrsD5gkZQrkkBOybmLJJHdx4FrQIVpNjlEvBI8W1l9pnZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: TKWBG3L7HOCMVEPKQBO4MPXUYKQX6KF2 X-Message-ID-Hash: TKWBG3L7HOCMVEPKQBO4MPXUYKQX6KF2 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 04f87e998f1dd..2fe522418dfc1 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 Mon Sep 11 23:52: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: 13380426 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 79D61CA0EC6 for ; Tue, 12 Sep 2023 00:02:32 +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 0E5E9F96; Tue, 12 Sep 2023 02:01:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0E5E9F96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476950; bh=1EJq66xgZMcSrouEANI8w/j7r2tSL5emiSheuIlqIUA=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=R3JGNnefy6if4dS4CD+qaw7RRWl+VTcuaInf2GzZpc327dBp+JS9/5pJ87gUb8GkI UulDrVQtz9mZR9k0uBYEvsgvxxzePVKi2k9V8rmYHs4Xd8BVv/TaA+dRZ1vKdsjZ5s xYkfncP1QD5yu7IgIvYxidKLERrza4/uF4qosHsI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E4C7AF805E0; Tue, 12 Sep 2023 01:53: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 AABADF805E3; Tue, 12 Sep 2023 01:53:31 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6514EF80736; Tue, 12 Sep 2023 01:53:17 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 BBBACF805BD for ; Tue, 12 Sep 2023 01:52:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BBBACF805BD 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=cCgEv5Ds ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I43TxR+A7p2JaER58z2pSUrrlpIsv0kT9pO+5aST4oy6miQQwlh2fLVRLMQx/yYtGCvy2Ro93S82gEKYPoGtSNforz5ana9dyPsURBiLuAGksxsiIsd/lzRBZn5ePHqyteAtgMs6LUhqRkFU9n6/Ey5M0wbjkwrtGrXb+x2Dt2FLfK1a1e/WojUJkE3v5T/tLQPfA5mMOezV5ob2mpts+Omy3vvliFqxVPp9TBknBbJFrLfacCRqfn8yTZioUA4JVDGnnf66JBRWwNnRnPyHuCfnN8SfcNorCJK7Fb3+e4C0dE59cLTtUuYoxYYDXvl/q8ftskBu+fYiwGq8YpDsfg== 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=49uSjDDwC8FHQctqr7Q4iql3+wuVOnJ9x7Lh3O0MhfM=; b=nATpZWwYmE2WiNR83iMSgzMFAlKOhtzLhCelVDmpKJQVlEzl+thMQkgeS+6CeJFfiZC0MW5duMAXhucz22wbRjZmtPwA8RjpHSrCfBu/OnMXf4cbe+298wU7zRInvwjFT5cplXGvSQIHnm8s8XX8+GXRfTZ+NlZ4eAodso+YB4o6boFf6zgVVYzEs8U52rZAxnAHaGScN7CqOa2Ds2O0aWxVVDP+FjQl1UQaxCsL99cgvTN59SCN9rx8VjkhPXurPmCuD10gHq5bea6CpvdWZc7iTM/s78TttRAh319wCdLklmp6PyCqSMyltk1uKmxQgFK8GyrCXsJJXECyF8ZYcw== 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=49uSjDDwC8FHQctqr7Q4iql3+wuVOnJ9x7Lh3O0MhfM=; b=cCgEv5DsHsPO6gMoRr0QufnsFfN9bYme69Ay8QxiIRdPQS5My7E3/carXgRa0Xohcc4HvSg6aL7U4DwY6FDk9WM7CZBNiYCKaHAoyo7XvJXbU292tjh5E/LOheZt/CXxAnyYOJrCPT5FYib0RmJAHsKp6TtRhN81w+KIRU4bxzc= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:52:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:52:08 +0000 Message-ID: <87h6o0p8t4.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 50/54] ASoC: soc-topology: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:52:08 +0000 X-ClientProxiedBy: TYCP301CA0008.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: af0b076e-ef65-4e70-5a30-08dbb3221bf3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uuz2Y4FCb4gZzg64gJzjZdGdmDtFJAX2jejwyEXlXfdaBa4aXTdwYD+TYlWxxKADJEnnfwZhrahHEDdfc79uGx2yDn6/TDb3uB29Vkt1PCy8KqOD5xEs4hcLukD6vaxlCmzbaOd2NXe/Z0E4iQU8LtaF012Ty9Ssq4DrX2T6jOpX/0L7N7dAktTKNzzLu0ViQZslM/CRN+u/3k6mtcmHOIeq1/tQhPNyYK3/jEU89q/cNMA47tjiwiuiOkYsLN9AZMHhNihVM7bKkYbAEON8ne2TTE9sT/jQddO67d2R/jHqPjj8vDm/JTag8rQ6yimqLnMkcbNkmiJOJLhZYVBhQyVG9ueNsZFggEwuSh7hg2viIWHUopk6rejrbksvGOvgqSGpLFaetc0Rt1irmw7iPu4de3QSH68aowKAEB6HUYFRA3kRRRFYqulVmF6hjqOeU9eGZ2PAmqbJJyEzRfd+7rc1S4awcVJGFVvJfrGJG0FW/ZEG3YwKdwKpVxUuXFYp2DUYSYpREdXIiD5tb6gKP2gn1AaqdqV+l/xOHwL09Zx/5RG+0WiA4F8y0auCzwDwu+sxdrLGFn7aoihgLWgCoVdi22YSjVxoOJwyXRWdsRIBykta9rwwnvz/BRkhNTAAByUWfqB8Y4uZa0Nzaj2GHA== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZzUbi0ROwiNPwVW3jQDbVjzcMKglB9/IpacCtmSAgKiDI7S0Fi1e/MjWtIQ1H1YPBU8c4W8j1jczKG95+ZvhK/28MCDpXnjRYwBAPYwAujpiWMTvADTZS6t08yHhF/Giq9156OJsodhxhsot0SRDJvrIT/CJLMFrvs5DciNN358avIkjPITMp11UfYKvWnXHI/qzaOWDAnQv36iDKp9STxRKxQ5rmVZw4cFkaXgu8atu00vCKqbfecxxoqQsOd9qnyvW3Loh8osVVzrO3Z5an9NSNJ4ueVMQb5N6C+4HrC1lLc0V+6gtAqK2VRk7Q41Un0H/Dij1xAXswC4+4Cv3mvHxwfjBeY5EDg45CUYVjjMS4Uk8XaHcJLeYXGDXyiICnkBZw5HSVByYqNvpb12zQOsiz2k1YklAcIkymPIJwAmXF+NiER6TQbKwt+uowycoAva50VvCJILYeJHoUvA1Bu4Na7oHBJR4MctVpirs21XHr8Na6ciEm8lJRwTwEIMMdlmlfcth0RLAUf4BMks82DnUh9NFQqtNyrhQEziePUhXjTFEWxq6qopOyFdoWUqr2dPwCAmeMxvKJ1X7MxMO/LlHcDS+fPcZVeFWVGe11ZSAZ8U5KzNLeLBGhxLIxcjlTIUUCTCfVXhTyYZATTUwSr2vfO702oSuAlAiVGYXwF8FFshSmq8nN04EbaD+Po0MJU5fnI3rwNeUfUyQI+M82hLeKpF8u2Csyktx0zVbxcs5G+51axQpiH+oYetNJMjve1semAizd0ei5rlm0oOLwzmfJhFo0Ji2+OqtkLAQpt7pp20DErjgBkma9Y62jTDJjj0NHGqWQg3lj1Y8TO1X5IGYS0T3YCVYBq1LSUF/eeCkz6Yer1NHwub2YrQ5B0DzfQFGQHtnDTDoBwH9Sg02ZslDTl+TuqdW3b1Pj+4D8DOA1TB5RGPdd67XuAb3buGE9cE4MEA7zG7ft0AsUy0beosa6gPssSxPmoEHqUZrv/96w64IPfzR41dXrnI9cvrBvrmlxFBDBjLAWxFMGcuEqKCzRczyMtalng85bPKI9RIb+MjfgqSAf51oBxPBdCXT4OxikAJ8MsGuwrH+E/RpudFazS1XLBgVS4DRnui+qqmLFgP5fYww9+fjyDnsCvjZT80OL6/dBGQwRgaPs2Crgw/v2BvtVvGmX4iFbLydkDTMwpej09Kek00ugvsbp7YjZ58sYBcvuQaakQ53uncfxJUQhYP3a4tSw/q0nB+FXomG9J4UEhOZa9hcc8Wh9aHyf/UeP/hHAdzk8toNO9n+I6oHD6LhaU01gVP7frgX9Gt8vCuQS5pBQN12nuxTZ3Exo+QXU0t1t8g5Ncjq6v8kYVCdn/A3jdSoByD4ePhx069MDBQjULF3xUWlWlVwbJMY/inp6yN6CkqkkgYXiS1CNtPK9yR3R+RreggHI2pPDZ5nBqLiGHE0gcGr5NdvAwwMpfVHjqpS+gteEPH/lWybANl8E5LuHjvoqOE4Me/kZzb00WQYrcPrpBNup56AVhNwCkC/cpfjLDakkBO1f/OWE3x44P8usOWKB78QctY3ZLcDhyFoHnq2yGajJ0SjS7WE+KBjLvpDQLR/y1AhuAmt3mltGmjAlBY7XX3z3RlHQTg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: af0b076e-ef65-4e70-5a30-08dbb3221bf3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:52:08.3013 (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: XV0hKOQhtvaeVBXj3IZGLOfaJRyQnoeAnoPqDTZFIq2/4GVcWtzD0HJBDQCYQUGdbCQb+8SxTUgUoIacmfQ3rnbEM+jkduVyYmAaBLFbfEAS/J7uHtVlX5Ifhmr4sXaY X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: NWXFTHIJH6YRACE5U3ZIMI7HKPOLV6KB X-Message-ID-Hash: NWXFTHIJH6YRACE5U3ZIMI7HKPOLV6KB 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 2362c282ec8b3..ba4890991f0d7 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 Mon Sep 11 23:52: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: 13380427 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 A9803CA0EC6 for ; Tue, 12 Sep 2023 00:02:45 +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 6B396ED8; Tue, 12 Sep 2023 02:01:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6B396ED8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476963; bh=B3vaj7x6s1LGHUQAAGuT9bupaFbLRSu6tJ0rlUQO4So=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=By2K0493lBzIK7le0mHNgorMl9gEjWbe5qWECf7mw+swJsORo4gHGPNcZUSx0R11K YKPPhpngZXQwMz0wmX7NdOkv/Hjlvzmc4fajzLsaGSJHRuFb+YHFy9VZmx6H5Ih1nF QhxTO1i2JFJFdvPdEbu4yiIrwDQwF8UTeEc8W/H4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 852DDF8076B; Tue, 12 Sep 2023 01:53: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 8AF3AF805E1; Tue, 12 Sep 2023 01:53:36 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 678E8F806B3; Tue, 12 Sep 2023 01:53:26 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20715.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 92AD3F80571 for ; Tue, 12 Sep 2023 01:52:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 92AD3F80571 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=l98lMJEp ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aq2Y0MmvAqDfrnnSHmL7H69LFT6AyEBYpv5oFqJDAYS/3WwOYhPm08lJSrijuhn8woZhCExR9yAGTcrUYDQyrxH1XcfpN/cFkc7xD7l/Tyd4fIFYndClW4Yp/cO73GxEwnZ9qllWiSmqeNkoG0Hf2Zni0ul+uq7cD8iVsq/7bfhSQcnSI4e87Re82Aoy7wOWLp5GSfpW7bHPbto7MAnOxAeZJICaXpJvQjfz0dIiSGJQjKsWBYWMO10UEIYHrYgP05FcOqxTqHtjUvzEGQ/ZcPWsCYiEPDbmC9IPqqA/k22Fg36hYr0OTOppEl33lPEXHLo9jW9gKqanB+NHrD2Qjw== 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=kFsjml5ydfuCV6u9ynnGe+0XkRaAfrGPICqu8Qzx0Ic=; b=VYrDH7EOiqRqsYiAs37PSVeDYJIVPmFKVV8k3pZHDIjms0meVC1ly3AMsU5aGQvoNcCrT72h2jY6tv2XWhxK4bi9vReA6epWxwqvVxZ6qcJxSZV98gDA4t/bwWvzqeNjIME8wVaJCdFHG/0gEX2BiPbAugp0VkL2Pz5MW5toADKQ7Gq5iBACXDkOZqKuPq4r2Vq4RtH+WiwlaBiew7KpjJpWF2V36uHYZ/xOjxYzfUC1bosKD7F0PVL7rDJPAqlfe/cC1kvvpzBCEUoBm0XqEaOcQFOPAtuUSNVL9GevraQpx8KUB8wwv2AaXETf/uiAaBmrBqj242k5ZMyK/ezg4g== 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=kFsjml5ydfuCV6u9ynnGe+0XkRaAfrGPICqu8Qzx0Ic=; b=l98lMJEpYn/XGFSVq1xrnR4Ws4YVPCwo16j2I7sVmXtl2encWGjbOiCirWgFcamPhTexw/ubKipzIowBvbHkCmoxYALMVW2pNsoL28v/ItVnY9Tuzfx/J2ZLI3ofD8kLx/4O4D/Vj1vnEUnjiI9XCWRQC3lRfmIKVzJDcQfhjr0= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:52:13 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:52:13 +0000 Message-ID: <87fs3kp8sz.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 In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 51/54] ASoC: soc-compress: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:52:13 +0000 X-ClientProxiedBy: TYCP301CA0006.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e3ca3c2-3fe3-4a8e-603e-08dbb3221f08 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a9uuKpYHi7dTWXmTUkoyiEaJUqTXAy+BAGndFPHAnUzfV54nainb0yowbvtC5EA4zJIP2ti+igcq6tKLLH/v+qVWQUW6gqALQWOJ7W94ZLfMTZKQEcMOoj9eiyw3UFAMkueOp+XD6JE0TQaEOgG3xXy0d8DdPlXW34vxMmIpkiUiMB+4eD5c7ZaqbOAOR3xIQAycV6RzbVNHi1NO1dbEZ/eTqNWh/AsFa1cIVrj4dWzh029Cder7QPy7S9OVXkhcdjEiTTGs81CaeeMiTCFwqx7Y0/zTJotf8owVe42drRgXDsLemMwRjctTPIlPn/50rWPjVrrHhsB90n81vozSzfKunviMyEDhJkI8CK+pctSFHKLZKmmXamP5EkttLamhKvcVLnHjRw5gFPHWNpe/OiBmHgdkx/MNlk7ZNfviQm8z1OJhS+WS5lzU9AMQBtHkwGMrdRv/6A89dZBjbufJywk6kd2XmCd7Fa9fot7BRz5l14u1L+y/KuVEhxnrHOOUT2BxDo+0D2sa2k2wgRgT64ut+J+OEi3pTUJaEHScBpM3f/2p9CR9AFeuy2HwEEq++S7sqzUKoVWKobh3I6Oxp8vjCxZPdSQ0h1poM+ZXLx8Dkgij8tNfyoSDoxbPih9mFI+D+Y+AMYGze9AAYQiqoA== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DMhsVB7SOxV7pG0HAa4LmSbAYUkL+8Xs0PaWm78Yl9ZdsLgLCnjzCkp75YihDA9bQol5OJ3aE32ZFhyW7fpqVGhz5lCZHdrSvNbjuztR6QLyF9U5aCihYIFaBtkdYt91zjtIpicLP7YHPROGdUyrJBaobYOxuIXJpfEanyMi2LxNNAyE8LgYkr6YwiZP2rz4OvxxmLTwJ8IztRVeaJSiM0lEKP39/XlKeiAQPjGMBtZsd6vFRuIZ8TnhH2FtHZJDaKlIcdVC/UF3jDMGeOhfi3yjmWi1C5aVz3dQpX9DFDqahQkWwtl7obe1TmIDDjXF73nIFBTo80YqpKRIX02MqwLzVdWhCTFl51N9z0MaHOQBI1wATtC/oSbl9xpFebidgVf4Z9RDAyK/5ePHcnpWdYWrXS7dfctX59BRAbTLKaw0rV1Hm06z9Q8FyRPMTT23FOwA86NE4JlEYRF2cMcKD+KLKxcXwkINOXEIuUFchjcKYkgMqF7ooAehwklHU1glx/wCqVAGNeQ0/+/SO96+ax0pbyXRj8kVD4vD4AnFcPdfYkIs7XQ1mjFLDwIm5C0BN8m6IvUupSjxgIx0FnRCGzZ6nOA/Y2bkmg4msnF9nO9I28keuTofFqSlf3ahAL5IU9npUFai+YlmfwMdvn9ZdknyHNsMKgWndoAbvPnlrqhKRwqP4L3UYjPwgaP7i/3M3DPUeCDGJJK5r6oYnAJWTG3Y++CY4HFAr6ee6QkQbcgA/zPw09tphm+U4XTtalWOh7Nwcv+JcBPKctqiUm8GsLnJnyenZywAuBtB+JMxjerleq4UROtZPIajItLByuAU6deYv4Q6+aUAK5pIMXRfJytZHu7jr98myB20BvxAHNxUDkcuPXuiDsimFccaCl6DjaQRuQ/MlkErN0g0B42hesCYscQ6QvREVR5cax1Hi0nOPvgFfk1Qwgdh6ia332ZW4MAeYqJHLdK+4IsXb7KxHxVkq/sEf3VPClvuCDmfZbBZ039Gh0lsggEw5uhh7Va9rdewwelvtZhJ1LcONQhxwOy5ZYtokMWCbkTHm2xTIZwm59Pva6R2daOIWoaUx7U+XsNBEPvnwDhur5tqcSbOv5LjjJerFLcDlnxu8ggj7iGBhjrNylSTBgqz2ub/yixBKxV70NMdwNtoAfjEwtfJuyWur2Ba1cBC35J0GaQrhZCWsTqil8OXgU3Hc17bGGCwIpqFdGs5A/mkAlzrw9IrjMa+RMKvs8b+n+KWY+gEFFgaBZVEGhtv/lB//ZTeXjCubkIpKWUvs29yT1te6oHCMMnDr2/x+Y5OupZ9SAREi7lGXSS6fgJjhFlsDEwaUlj1xkzBqmPZSYdzzwfBwwqkOBplCvXgSywoq3DwacYWNLCeoRA20buQ3ccH2usfLkEZXSJ9pquRsPLIXgocSavfG9G0NMphOUhMnG3LmJUXaMN9Q6j/kZXNzkFeS1Iss8kLewDO8M+YESDuoT7dnr+ogtUs6E7HukQT+An6c9kUJTsPsQhHrxySUbs3SZvrn2QVoS/8cxif/llWiigyk3A9tyyIN+APsIecEExjrwRSVTM1Q4vkgU5bq7TtwCW5CwulYzxWbpx+zvBEeaWNcNq0O2+W3IFTNaJ/COd4jTkrh0A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e3ca3c2-3fe3-4a8e-603e-08dbb3221f08 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:52:13.5409 (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: 2ankCdpUxT+8qrAHCJL4LTx3BPi34L3bfqwtxbBQHHPETY6NfiyFmrqrLJYXoT6LSVa5RN4xU+s5iypf/puRomk9oWdJohc9kMuRhZMpZiCetuio3hVlMQhWUF4LqIeb X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: ZLYG2YBXAU44F3BEVREIK2M2Z5W7WVSM X-Message-ID-Hash: ZLYG2YBXAU44F3BEVREIK2M2Z5W7WVSM 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: Vinod Koul --- 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 b58921e7921f8..a38fee48ee005 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 Mon Sep 11 23:52: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: 13380428 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 4453FCA0EC3 for ; Tue, 12 Sep 2023 00:03: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 30AAAA4C; Tue, 12 Sep 2023 02:02:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 30AAAA4C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476980; bh=eWlE6GXvlDLzYzVqJ7P2wAZhK9Jpk7wBrZotpsnU9rs=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=NY309e5mZFEdWbUryBa3J2XBZIaFNEkDYpN/+X8T3LFUkH+ZZYYoOcw3JS2FLWzDm R8TgyzOgITDHhVK3sIbyVDAcKKOvZ8WW4fqhwElR0vTc+Em5wk+KfxK0bWD2UN3lXD IXEOeShMZDV6id1fGxz/6Vmp+NuhbrTkbVqWd/G4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BC291F8077D; Tue, 12 Sep 2023 01:53:42 +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 CCC01F80794; Tue, 12 Sep 2023 01:53:41 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8C161F805E3; Tue, 12 Sep 2023 01:53:32 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71f]) (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 1DBE8F8057E for ; Tue, 12 Sep 2023 01:52:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1DBE8F8057E 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=XrjqtmkX ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eMeZvAySt34UOAP4sDxJ2vS0hXf5Q92nPblktrDBeHsAnwGxVubMwQ2Ct+YJyDH2jNcQSFVko5Itsjkl/6ynTxcPoH6l2nadfHxmEODuI1zCNGqQjv3oPnWUnhp5t4DZT00wWUxTOZX+tDGWD2wrVRkLgjV43GyI3DJPHDERz2zp33vREE7RKrActZD9+dGswJiE/N3mdbK9qi/CxATiuoLlv25qTK8T2n3uf58WnXXFPfRpQtlzVUfXorILaaHULLUD3xjRHrosrHhYij3WjumSPYNlh3dZbtB2MSIiZ0HsMxxXFRZ+eHLmC6iOqtc4qD0Sc4g+vWrq8wqmE4Dx0Q== 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=ltgQKidT5IUmpB70mHGrehn+v/OCAZnqZglN70KE73M=; b=UKe9Mfp5eX7pTUV/9apFUPj984pDivC3ulOS3WStPktpj5E3wIEWcQhaibZxopLJRvLmoW1jh3OJZDgrjVzLSt/Wkbdx5XrTmm7RXmIvmb/yvK6NBqBbFzY40wXKCXAe8Ro6NxUzof5t8p39Ym9Nkmv4DNEmI69K/E37N8XdzKP1T+jhuuEcme13cz8wtU9cOtZUUmAxettxeEEycZibCoaWWJ/wPAj2N2NalTbvmSrKTRzLtqLS5s/VNWCFKTgyXn4nGYJuOdvIQfg1wOKFEA+zpZOLgaXVLNII/gvRZpG3riNkyqGGrWTqRCH47CuvwoZiYOlDCEjak1MWA5/JGQ== 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=ltgQKidT5IUmpB70mHGrehn+v/OCAZnqZglN70KE73M=; b=XrjqtmkXrRDaxL6bxI5fvqoPuznG2sNn/FVspOrRHppQyPwY+nosekNVlXhsivUvw6e5Wp2NRcJck2Dlw3bctvbET9r8PKGNbBlVAMHIgkQV8rMxd367uoNK2I0GE58AHWUT/YeQhKrwVQAZGMdHJlOTt51tdeSYctaDvYTP/ts= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:52:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:52:18 +0000 Message-ID: <87edj4p8st.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 52/54] ASoC: soc-component: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:52:18 +0000 X-ClientProxiedBy: TYCP286CA0266.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 58603284-8931-499f-2ac2-08dbb3222222 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 41YqgP8mD6I0yuwzeeBpa+3MgZzz4KNfSObO7EgwZJx4euBTB26ZqdLs+uEsBm62CwQPBpHYhKtutSsymDviB1W4qIjxbjLwTaFr4mL4W9sglT66BppLkT7SEZ3zseax8iVkt5ci2HbjnhAG4npgbYr06cvdI2ef52hnilotSga3CJDc4MuFIT2/4NOXKm7B/v7XA6uuU4WsEghXGucWEt9CUjqM5DzF4YE4ryBSuMIPZH5z2QzHmKztO92bsDYmZhYHCUslL8zLjgg8C+kx0WKjY4IvzaIHm4s+jA0kSld8MDXK4j1Jx6oEsBnJOwTGDKAp6gpf0NDnXHEd+zBgiht8Jjc2OQ0w2kG3YJ71KHhmn0u4UMmAE4iL/FFmY/C9QMGlzSzdzSRPV4/wzJ/tUCf6PHgtNH3qvt7XK5dxlx5rb/IVryBrPt70+vlsPRSKoJ2wCQA90Reae787pQ1NPyQBBp69wdeMIsyCpnOhEJLvTCl6lzS03f1P4ya3EeIn/pzEwGiv4x3huXKzKkHk2cr0enMTz8jNLiczScP10lWGD1hPFBH7rjYUz6Bur831dnRm6Zrj2PLFYwRIis3/7uWUx4QCCMtIKX5SxxDMdR56LNll3fw4P4269Vmr/kl+10TC3NqrZxToZe98w0jj5w== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y/bC7pDl5HoWHi0mB5WYTu2BiIy5wt0Wp7wqZS9YHOOgfXQHlFI8TrY73t/MkpF7JTlvhR1eD6SdySz7Wzv6/zZZ4pBZXLTHPlvss4IuTzDs8XCVuIMBLaWB5DCbrLmC3xOPAhz3fjGGYr/qmtNpmctS56cBPRd0i1j1+AA3frSquPKD+BXvC5JU5YnS8hC02ap6M7QglmfYkQFAGN0IKh0Sv5VwYH/sl/mdWmydZ7ylbYKWLIHNCPBCS9aSptMys/rVgrM4UCOh1DF5QpyxMY823KLKCzGaiqQGADNCIfxfUXCS3xTH82xFGGPIuwwCQgjibDMih2mWwEwstnCtLNxWkCm5mdKvS5EoUoaicjEdcL0OKlnOhCcn1N2PQcfqNpgRzFdr52kSv2m0lXy+RgdgvP5Y/wSJDkq2V59KEgl5S3stHhYmMB5vfE6oVIdHMz6dcc1HnF/q1dyGW1vDDGmE3iRKMqty/QPh0vSQpcsy/jIEQbtcEDtDfzcZXMETo3dRmjQdJFoV6i5CPtnbnbsh57xTur9LpYBg5xQWdsSUoYTk73o55mv/Iqkf4vQsRANFF7+TbihC17Q2ciMz/+t98bVcZFnZHmy3ALRcwPvWloyKyeFP7qBezS+aC36v5JnJhD85lAAjGB1JVQehc7JJKrhOBcnnpPAMFvLZDbDRiz6yMVJT7R81hq14BK3aS4zuAgoDXz8oejO74AL+6KSKo0ZFXu+chqCUmOiP75HyNfCeYcOaT7scC7ylzyGFLc4Fw2SCTNcGpA44NQoSCGS/nOmo1qDMkM7uBTvfM28XVOfBpWHGT7f33/2FAJxrCzzG0vSDKYiaiSySBWZrJKVStgUrJpVWeLblOSN3+lmhJyQohJRaNMyHBLwKEG7Or8RHQ1kOBocsXMjv3FS/Ww9KMp9ax2PLF9LD7Kz5fhKWv4SPeJYnRYlDz7Hkw/0CJuGXza1TcEh2702c/GgmjoIBiIKcfyROXqrWp3ALOmc1SPoF4RyJYGj4LNFUCJuHraBwE5hGZlLQNlUHGHHPiE66l9yYin3feUeQEMvSogMjl53K/lwxPkPG6vsZ/1jbA94510WluUjLeizFWSg6bGDkMqsswqi5yYqx5aZTPgw/StzroTYfqpYga8SlkhBfNtk37tADRGzJ2jc7owyKujbPNa31Zr7tJlPvPS/0V7exvgdXgGXKbFo5xJm5HZ06w7q5X0epxX5vg/+Tx1VecbqosIBPPZrgw98fWrzVtCxV8w0iw0XTgkslUmQ0y0kHl0oL2uo1lEtQ8G3l87Z+RcQqd6oM1FqqNgt5wZkvaRDEdnli0FiV371bovI3Tsx3mMyBN0QuDujlGAZ/aQ80FARM4YdgfdRusKzbJLBTJZ34hvAhP/m0V7ci9+OG72sgmCZagmeQnjZJ7TiygfggTAK1psd9Ar8BwUWJBc2cbtPfoqoMSSwiZWFSP3a8PWh5ap9gybhOQBvj2BOVIAsvB8blSR6tdNvAGtVaDp8WpGECFtPz1EDu60vGx4HaAMLrU8hFcPrYLUf0WIpAf2foE5gfV8ro6+0kxI3n0+uWQK/K6oh92fU3T02glojcbruuyn5VOOy7NIoSqjOP3fAXQjhueU/yU26hbQZnV8qseps= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58603284-8931-499f-2ac2-08dbb3222222 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:52:18.6969 (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: 6seDXNwriL98FfYbNST+otfrWRIDNwji8Qhiz2Pj4RXBrEaIj+T0oFuyBn4F1v+/eVGjzXa26740QJ/MLUIP/o7VAZl/xvNuqhSsEXHoLpcYAF0L8WBsMKa4bk7pPZD9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: 2OHZ3T3PPYSCWTTXSIVIF6PRBI353WPB X-Message-ID-Hash: 2OHZ3T3PPYSCWTTXSIVIF6PRBI353WPB 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 ba7c0ae82e007..69198de39e79a 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 Mon Sep 11 23:52:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380429 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 A08F8CA0EC6 for ; Tue, 12 Sep 2023 00:03: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 86E1FF73; Tue, 12 Sep 2023 02:02:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 86E1FF73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694476989; bh=0DgzFwf2cSuw+XTUy1tvdzr5YtNL61afdq1ubWPBFe0=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XFe/3fy4ZCY/UwB6ZFdseixGjwRMFpunlhfvr42NT17bMuUfoVpG0z9K97n+55K9S 94ozZcPzdzvRaUM3hNZ1XaeSfmr6pU1tXrUXWtZ+Dv9l4PGneuuLJGFkKkEvNlr7h0 TAC0nHwPlRxwcQiKmJy9USHGZ0XbWeTaxghpmgXc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id AD0BDF80798; Tue, 12 Sep 2023 01:53: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 1B352F80798; Tue, 12 Sep 2023 01:53:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 63B1FF80640; Tue, 12 Sep 2023 01:53:35 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 2191EF806DE for ; Tue, 12 Sep 2023 01:52:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2191EF806DE 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=CWonBIZC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iDiosULPUrgn/1X8vR+VoBjRpXH++CkKsVZGByiFCUMLJJxGGxdLQw41aSXtVMEEWrPWuT7D9waL9eyVwqEpyG43i1KSQq10hKqRU8yb5rTks8b5HDwzI2eloQ/XcAZUDrlBEYwZLwXrJ290OOtRl5Fo967Vwbk+nIa9teiDR4RfFPiDUQLnIkNZr4WqCOGXwqZfLH9oBKmvfa9nTpXPC9X1+iK09XyLmM2TxdX8BOv1vj5QLx0LtNMWimRto8wKkoaErh8RKMW/gtHn146yBfSmCqtQMZ0aRSp0PHYqBdfivr4QOYR12pF8PqdwYB+weDqLy+wO2NBoUIi2mtgtGQ== 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=FDZDmwaFAA5uAeeM5veBKZ8nK5ZlEA+D5KXlt5LW4zs=; b=mJhkpECO0sN/RAHdnAM9sBItNZI/hDOAYRdig/WdPEq1xLife0DxZm8WSvLFYEqzzf5a/437wV1YN9SmvSZYPGCvjPjPX4ZJBD3s61DyIyvLRLubwyHJNCniy+mhMgt02053xf0eOp8TVpjdjuIgGnsf3Ir+7FdWRMTGD9rDcd8ImCvO9OByADZArq9P7LiEPyK5wsgvPSy/hm4UArxFmODxv/8+xQEA8g7tx+ksvDBZFCz9LEmj4jnbmaetfGZigXaj0BmAMjqAJr5ouGD7icWkGZOVIyPXLdWJzc/cDchl/b1UeagZYuN4L6xTKHapk+0iryhz8tKlXJI5mJKRvQ== 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=FDZDmwaFAA5uAeeM5veBKZ8nK5ZlEA+D5KXlt5LW4zs=; b=CWonBIZCT6DftIx56cGGKbEmOGdGQiesP9psfridikRTQb1STGKN0cuG/R5tWqWFWKdJiunQ7hhrGFAYzBk4Ofn4o0oTkwxSXpg2J1GDHxKV98tywNoFH8TXh6U1XDOiDdeyR4vt7xmqwXsGJSFysx5GyDwiXVlUHPhuc7JgtkE= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:52:23 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:52:23 +0000 Message-ID: <87cyyop8so.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Lars-Peter Clausen , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 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 Date: Mon, 11 Sep 2023 23:52:23 +0000 X-ClientProxiedBy: TYCP286CA0256.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 8877fb5d-a6a2-4f7e-f7f8-08dbb322251c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6cEHpU85cnOAAf7MqrV55+uOdz/YGxy8iOfas8RUoJPGoyJSQp7tCfJ1eWf9vaxHW+/eikBFVPOroqxjiOnyzU+Io+/qk63PPsL34s8whAZRT5ro2lx4PvWcvRC4v/YvNKcmbGxKj/8JPzF4GKFbeQat/U6C1SSiPLLtM6rR1aOKWsbUlFaDVFxvJ2cpAVV4rG95o5qDPJdKwTpHrcUZcJv9ItkqvVFnFiRwviwywlwJa8Jju1M6P+vA8uqwqvN5CCYxJrVQZ4xa5HXZ7BG5XpkshxVfuOIyui7oz0WKna+aT05f9PqBN2+O4y+SE9sNmRxdox+1B1gYBpENmU468oWGo6cYvnO4Bdp9jay6DuEHTtUCKyJqP8xJL9rx9LyAhuJ3R3MZiy9DCMOlI6GeXUE74UF6RjlFzr20Wb8g5KP/HttbYOKGccmuqauHqcgQEgE6CiVtK60OTvq7KbWjDUmRQgxfyddGV1lZYjT5RHGNdrI56DX6F5dS2WOpNfOUCknKBDBgPhsVu/9edQ+NO2tTUtSf2R5chJAQMySm1LQcrRiynNuntrINPP0GkKfwxK1hq0wj0MVM6EKeq27MqGSW4uj2O8yLZD4JtMwYGjzZEA6JCIbWrbg0nzFaG5csswNTOnGmp51DS7warq5CzWBc7Y34q9NYJoPVeMeTJbc= 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(41533002)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xn/uk9zqagdyCkceDlDLRLfYxqfSXhMSdEMJ47MLW3OvYY1qNF7gtx1nfkWsF8FUztTLMBhtw/cf156l1vqK7ufrWV5F4hYxNgccHYKi6u6L8vZZCmn0nWLy/u+zG9IVP8CxTuLbLnWk0Uw/d6NiFbgRAHAdjJ9QZQwHi4a7rVohHwc0LTOxTjKlBdL6u66NJr2OdTNURInSp0RUUeJ+L4+KYfX0zWvv/z6DjzJOkw7ckdgzhD6vsbQmTTRQprpwLKAzNNHnMbAEI8Rk5aRPnl/V8oboqzs3JPNXyUbmm2DxVsZ77MfUyM4TYARDxGrnRr/xnmYDncmJcpFYzaO0sDlSKWocLduJttO4rNTvVuFXI7OAX79i5GyzdfF3SYqbVzqsUYJ0fwrjI/6EgBxFbZj4duWvxfGdYRKoujdNhMkAR+uNq9zixK+E7Uj2SHGmonWUSf8ZQvn/FDZpDoe/o05V26GCtFV8Sr6pv1N+zhiC6GZrRM8jqgijrQap7kQ8hfILvlow0ZW5aMf3eaVUW6vB0Hhifmh6peRrU5CPt7BOAgjtr3Bhn4PZlSGHIAd8po74xOLg5pxkz/S08aYbTZ+6esiQjtvNHIvddLzXa+sfD6VHNRF02NhbEHc/NMNUu5VhxwzitU0yg1jFxspBcatsLHaJfpQxssQ9MYyZuN5Ty8hyaF1X08OXrOaXMSZfEdMDcdlj+K3533qafB/4RtDocIO/ESNel6Su2nXVceeqGjM4bw1PBrjCZuiTdeb1qzy8UGalsK7j6zuNoRuaED0L211a5SvborRBLvYq6pWh+ivL+2X3PFsNbch3O5aX4wrOEveGsz4WbeUVyvP3jH7ZDcDCjAHx0RAZM/pZ9+qI3wBgkrLv61s+dpyutKATUUUiyr8ocEwhmCpKWyglda3HeN6A670BkPQDbMid1VwXbLLMaOYZ+pH4ea3XeDfARfNva7/9bWbo+zdOoMSHHCMDisoNkXk9HF9CtfeFd4Sq5sNWBlB+6i6XgZzDNz5/7UxORjga13OTfRm3Mg9g/H2bLuhnDxSfRXqS0yNQuNMlS/ehdB2CuQE1SVACV0hkGqoJUUTq5clWVWnG7EuDUsJDfoi9KCy3zyiAQeKOiLxUFj8TxZaBx1g4/Z4DT1OkN7YOk+tFTCguZ+GOKN/coMVjrgy4PLM9h5DnAItH9uxvqfxojnyFDlg2rMWvRZI/Z1Oxq0iPqMOHR4HVWZ9iiUcN8YGuWO1hoE2cVsLdn/e+jRT2kaZlZc14NutXSLUDlN7N4PdaNk3OpVt5RRZN8SfQ2v+xVu4SltK/p9FeG9BCu2QJPDSyezJnKuOpoKqWDF3ni2BSkC/x+Nm/IBVThTX+jmoY2x7wv4wgdmtDmYZRblBk7EmoNuGLRBvdFVf3fQW9PnrLNX9j+BhrmD63/Y6KuVBLcZF9qMKPC2JCM7PikYttTNGK8LVH4vTsPVWjqX3s/Ode/0H4OLIzwC4QDIJcMUcOu03EQQbVEiEAvX12TA9jO9El2ZSUbsvDIjr6lacNnqbRxP+OidUvD9GEPFqjxCIjDupjiNc4BzK6g8EnbdBzy8EaMMrWN5t6P6su+4TVoGxDXikNaysbJ5dVzzcUWhh1Bi45UvVqYmHco00= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8877fb5d-a6a2-4f7e-f7f8-08dbb322251c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:52:23.7273 (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: I2gTX1gsLCGCiF/SmRuh8flpddz4grQK3HEYLWZOAFCdnpFICNvqAc1Uu8BRHa3ULPoyQCKqi5fa1dEBIvTptYv4sJH7zOrCj3NFcyX3/qjSKSVe3d9a1a92a4eZ8RKX X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: BMN4JSWIDPYHS4JPLSF4QYXVYC7IX6Y6 X-Message-ID-Hash: BMN4JSWIDPYHS4JPLSF4QYXVYC7IX6Y6 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 d0653d775c87a..63ae0c2310d7b 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 Mon Sep 11 23:52:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13380430 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 07EF7CA0EC3 for ; Tue, 12 Sep 2023 00:03: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 B99DA1060; Tue, 12 Sep 2023 02:02:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B99DA1060 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694477011; bh=lD9lbL4OgdwJkpD5r+AyGYBGYAem8tl7o5AzIlNP8qA=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Pti7LGeB9HvtXekJNVzgC6rmySg6S7A6BDQU6TvczQMvqwOrZ4RpJdrdXP5Z/l4/M TogjqOC4tFTpyeljXSyT/AkOzuROPaHQk4rl89XoDqH+/JvgF+pO0t0gb7xvLYxpNv zrPLftEoiyBNgl/+nOWEi/I0uyHDeaH10EJXWpFY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 37C9DF807C3; Tue, 12 Sep 2023 01:53: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 31AFDF807C3; Tue, 12 Sep 2023 01:53:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 89854F805E7; Tue, 12 Sep 2023 01:53:44 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 D5F60F805DF for ; Tue, 12 Sep 2023 01:52:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D5F60F805DF 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=meH5Eh59 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q38p834iSTlg5Yc+iJHHELCDS4ndC78p5UYABzYoiJ58n5OvRKgIECeyHfLUZdhxb3j1Gp6Mmd0SNTn/SDoQGhBa1VnqwcFF2A31Sf/91ML5azIbw3sLvGH/Lu1hfgpremfl6nHkV6/iJcJD0hNGiDZEmnjNb7XjFEeNKOtbyIr01gHJGoUi4oMaTma4shIfmqnctRr5VktRGrF/ScbMKQxe5RE0k2ECAp5uwSVt+EYxOoJLKmzkNHKVo3KiZUWSxvIUB20abc53caH+B3Og8WkMghtIOd6Ye5ctsFJDkymHe67IzYShmVFZvVndLOQYayT2wyqMccLfuw+B5eBOgQ== 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=TKGF5d9JUNUaczXoXTgNjel+g2m2iW5RR9y19tiwnHA=; b=ZyHZygoD0PGJGr2L6A5yXIFl4YmaO72U+OrQGRy6c0KrgaGC15IQzh2GWyHunHTHsYTdiWxidX7vZZtjog4PQpWZukAc5Iq29WfNVEr6I8uDFsDtw/3kRwB85QzY3a66e83NSeg4teMsIJvbBPwNnP1Xd8hFRYh+1TKY+sGSN0IVNlamupxlWgfNxs3cJXf9IpdvARupJVp8PtiVwOP5rvwz94FC3fuZ/JT+PYhbku8RJEUqCnkKubE7fZrvhjON0Oj8wzv5c+D0uyK4XMpdnfxTaRZfFjMIZEvsf3C+kNyOFtVD362PzZI3dkhYzuGBHgEKhiw1c3lXc+p9u/yTAQ== 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=TKGF5d9JUNUaczXoXTgNjel+g2m2iW5RR9y19tiwnHA=; b=meH5Eh59BaQAbDH/HATxDq/qHSRo9qOPMzGVgLCnuDQOLQQaGFGBcJGmBUTXEPiB4jCZI8GIFr7YCheE73jT38f+TzY2/sMfkEEfzBH+p/PD/0GJihJKcjT2WHM4B+XMt6377XLtLS00tjHGhriA7T/PNYTUtLNcQ/j7xunb/c0= 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 OS3PR01MB5990.jpnprd01.prod.outlook.com (2603:1096:604:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Mon, 11 Sep 2023 23:52:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8c08:d94c:8e54:9b5d%6]) with mapi id 15.20.6768.036; Mon, 11 Sep 2023 23:52:29 +0000 Message-ID: <87bke8p8sj.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> References: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 54/54] ASoC: remove asoc_xxx() compatible macro User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 11 Sep 2023 23:52:28 +0000 X-ClientProxiedBy: TYCP286CA0303.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38b::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_|OS3PR01MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 11e1242d-b7d5-4bde-21e2-08dbb3222858 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: odfrjjFv8yAoRsi/8Osw4qfuTIkQ0yDZ73sGCx4eIqJNk+9TKCFpRRwhAVKNY7v2SQ1qfM2qBs9PQ7jmxST3/veaLvs2uDPWUhFY016kjfbzJCrFmA70Elw95UZEceN/xPpsabfpSonsuic94xQ01GORH6za7BDA9skyNC4T81nQwWheaKpgPWCVumMdFyGj7zWBYMKDpSlvnIYyJU3KpPBQHSpV3HuG53gTdF/ybX14gVAiY1T3FrXX5qDaTAiImRdgzd7+vBjbIBLiXE4DPaJQHgR5zfaVv4IzQ9yOwg8pFBAjRJqvfKnrWh5iKsOFtKlYhcASR6JpeLXK1ILX3K/i1xNCZID8JbD4x1oCQZTrJtiwMtEkOczUTHT301Jca7JSrjLIy6jQ052GjGtCctP8bFfRUynYxYqTpTkYrtaF6z3Lji+qCglZ17ZXjUNKPAq/B8amjunZBzm8vmaFHr+i7QQMEynojS1yeCZuVabLpC6ExallS2zm9h+oFbKaIaSs0S963kV0Kv6Ls+gzQc986MkpQ6IB8wJyYWLIg7kxLvhMBI6wIvjdCLQxOy+R0K2s0qYSMWKbnG2QYpvcgbVBcD1RuAdkdI0do1Ic0sOUFBr8U4sqvXYJb43mkW/QZrHcXoY6dKA8yiq01BOCWg== 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)(376002)(136003)(346002)(39860400002)(366004)(1800799009)(186009)(451199024)(83380400001)(66556008)(110136005)(38100700002)(36756003)(38350700002)(316002)(86362001)(66476007)(66946007)(8936002)(8676002)(4326008)(41300700001)(5660300002)(6506007)(52116002)(6486002)(6512007)(2906002)(478600001)(2616005)(26005)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Jt7UhlZLaXLo9cHJhZEujSSqOpogc51ITahnFM0LJC5gIS6HjmCVfmE0VbkSkGIuskso3gxdPU6li6Qp1dt/MAeYuCq0R/HyqLwv11BMY1HGBVE/F4sI8g4od6HY7hlugR/B+ouiPab/3804mSIM9rttewxO/9iuDn9hNugKtZErgfjAssj6U4eOrQQcVPld/7tCTpN77VFy3Mhd1yVZY94gu63WW6WhxZgbqZWywLwvM/Es81GDdnLFxOhfclj2pGgGeQbZBTe3SHVuwVRQBcBvg2morY33TD9HhsL7jyIylmTft1Xwol4XW3SaIJ1QSgOwvCrWqjYNeX7EjoUMbyS1yHBeyaEGFpwBuHTN6mKnVf4GkllcAHCdsmuqqpi71dzaf6UZZx3rq4vE+MyVuUQsLzPf0rUiIOBIdrIXMUTzujWSJvSpXVz2iorlLkgHaw6rrZAXicMkZ0p60RNXrPg0eMyw18umurcEMll2Cd/n+FBfSZKnQSNG3QvQk4TNBdveHdTMNu4BAP1EhjcHcJug6SYOkIfyMahicFYhnFwxbEUcr53MJlsRBiSRkjFNy6XDgqByBR1GOxAh4ZmhUbLy/aZ+AYI/SSDHrA4DAewW5n7xtocXtM433pfTL/AMLNNCLoA1RbpnGuFKAmhMct5oyFaTtHJTH9K2mkyS+Cb2LZIdI4mJgCmvgEUf4UKRLsjf2NLddlOiwc5ppSLwAuh27JyFfUOlcyeD1svpDzCLSE0/YeeNvlxtsAjYmQRnvJllZdbFmja5SjJNbecNRNHV121cjubeD4tHfBzEMLlSPSdUA+RoRQjIPMvvBPXrbhlgtngPPqCAjGsQhBxKkeekGKMu7A5VS58U4GZfoGLZiHDrcFaTwFXSIqQ/DRRPGRfIsHegf6UUu9Tw67r7Nc86lUuWMOy73R+QdVdfX0BNa5kN+i55ekBDWWvO5ykxy0qMcG0JLBGuCFcwsBbS6TmuyWYPHVksYuSaGN4QDllvPbQIotlxZclWPP2LYs97n2oGSdvhogjOkKX504BeKISAv6+NMFGajVfjL0WzcVH2Al0DWnjvhmMbLb74hT1A35BfpRToGAkNIQkomIztyxNq/qR52vhRichBhbsiJy2DwQsidDN8rD6rvuQ5I+yriKtlmiK2HIjSVAM49XPV0xGr+2OdoDssJ0lQ5vpyHecX54ubwLm7OVB/eVikN16FmCeaHX302raOp9dZLH6FiOiDGal0vda2UEIsl4cQ2lxoEIri98inEd/jtNKXwQr5cqKsVtvKqZ0DZCAPf/kDy74Fw78EMEfoL1CoXT2cjc7WZ/e99NWTWdJN/rfOYZEUXweAdEfwKDfHG1Za/KDR8Pe9FAGU93jF4E010BurN43gkn2S2NDR1mQiyUtCncQpympjvEDl5ToPoE12ey4BrTHA3poarp2GPdskex6S6PGh/lwpliP64xSwLKethEaHwO0Nr3K4MqAlibTIsb0yxC2IAWwCtugtiyHunRNwWDYY3T47yQYTApdPAg0EKhsNhwaxXBXDtKUYrmpWWjE/aLqIWTjm0PrFgYba6lwAgluOddviz+umIqabMwUrCTKjkWykZlpm2ZnXzLSK7PfLU452ZeIKUEkktgKYrEtoRZM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11e1242d-b7d5-4bde-21e2-08dbb3222858 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 23:52:29.1024 (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: ckKDdtjHYWedxDm2qAdPnqVlN5sUrwDngHG54XmR7GaNoK0UJiJjm2iUq6nwyW52XcPVZarAtKFRhsjnH2UVdObM+cJ2NioLDRsKzk+w7Ja5UiZoE+Xpd3ohLZSfo0mQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5990 Message-ID-Hash: J27GQ5LENIFSWXEIQGHAN35L4NUKSZZ3 X-Message-ID-Hash: J27GQ5LENIFSWXEIQGHAN35L4NUKSZZ3 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 a2f214388b537..2e999916dbd7d 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 0639c6df15e3a..18e7a0b893955 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 2d0e8801cd485..e015c3115747e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -774,11 +774,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]; @@ -899,9 +894,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; @@ -1138,11 +1130,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]