From patchwork Tue Sep 26 06:21:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 726449 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A8115E8181F for ; Tue, 26 Sep 2023 06:23:36 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CEC53E75; Tue, 26 Sep 2023 08:22:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CEC53E75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1695709414; bh=8wPfKqbGcKhcG5faeL3QqTjAgfQj2lP+UHNgiImYG9U=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=SOKGXAXTNoQ+qgCXfHf/M3jMZPv6QnBzVVn/yhM1PnfFv9aafMQiWniF4aJb3i+4E nRBwMAUjrnabI64rDIw/geXhW6BxSZcrxGpK2afoh5VvN4H43jPhBK+mc7qeuho1W0 VKsKSjYONPEVQVMy8iRBRQjysQ02DcI+g72Ti95I= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A9867F8055B; Tue, 26 Sep 2023 08:21:28 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id C0078F805BE; Tue, 26 Sep 2023 08:21:27 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BA449F8057D; Tue, 26 Sep 2023 08:21:24 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20707.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::707]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EB2E2F8055B for ; Tue, 26 Sep 2023 08:21:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EB2E2F8055B Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=JB09rH4E ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A7uLVIXKnD6umyvM6JVTFyT7Gh6dzVKbS0fgzX7/0bDZGhO+Y+eC3J7zPfnub1lP1UTWr/jMvaFjnb65/guZTZicJlVgJMj5vutRuPwHDaEMxt+R4EeL9g4vw2Lt/qwZuMNJmwR8PNB6gvsBahdlzNe4MSgz5nunrHuOZ1Rzyiw16x0c/DPwg6thMMorMKsx6P4HuUPJLAlnw/YEGLQ8eMXNzX8+w+qcGUjKaPnKKlC4/4/hb4sBKp4bTFfBmTPU8IHNcEIOWBGbo4fujr3N5cwA9Bqa5Dwr/x5kwztT6cEIK78cyaazfXfXkWccFETmkvOmROGw7VtjxFiIOjDIDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1AmmrThevE/c2Tti9o6Hge+7KYCu0udMgkKq8fIwe58=; b=b/lzvDQ7/86q50X8WmR16bJaQ4yty214drPIs3ngp0QXL2Smo3JtjrQ/KOHFy4npeUEtVlXgPlwJErnf0wYKOAaXIzPiLy679fnPBJBbDrkTbBr4GENmgtaJLEoYOWRCLqGkW0fZcwNoKc41qdDZvatRRbLZZzvexNLwqG5ViArFSa40JlY0+2uM+jVsti/GwmnaOyOyokJb8/rT6fDtI9T660TT+xMI2Zp8kz6qVOfSPoHBSqdpPv8R0EB2VunyPLd2bgPDdaZR9J6/fZyOpJ0oVWMCgpwMkw6i9CO9eYR+BPbN16HxvbF/h2TclsM2M2O0d+OQ+mV0h5tZguAY3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1AmmrThevE/c2Tti9o6Hge+7KYCu0udMgkKq8fIwe58=; b=JB09rH4E6FxPaGAXwBZbXU44Luxr6NR/8s/55y047Bfg12Cjocw2bZxXykUjnYnkZhSW1zW8hDzVkyHLvUFpizf5sBPgDJliUXoy1PZrWXcSQu7pGs7TScyXXUaLutaTYLdLoEY6bXBX3vF+wVRJVX6azZklPHNdUl1LjGHgYT8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB10426.jpnprd01.prod.outlook.com (2603:1096:400:24e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 06:21:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::d2a3:45df:a180:595c%6]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 06:21:14 +0000 Message-ID: <8734z1iheu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 08/54] ASoC: dwc: convert not to use asoc_xxx() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> References: <87edilihhg.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 26 Sep 2023 06:21:13 +0000 X-ClientProxiedBy: TYCP286CA0214.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10426:EE_ X-MS-Office365-Filtering-Correlation-Id: 046e8508-9a55-495c-aeba-08dbbe58c8ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /nCfi3fa2ozzZwsGD6ePu/7i7W7YVJPt3ZQ/+kBaKAmXUQXuA0rObayFInRLBbxE0pAbcCas/rOOmLetY0mYQBOwO/KgA+ObKt3Dl0OH3mqonjqs1dDwW6OB26+q/BnKpz/PiTbQasyMW/OGrr171XIwFooChkJuqbb9a6Vx0lhc+DrJa7SZDEsxLc2nrLeGkFiP4rr9zfAyu4yHQ58yVDddoObtqbI4euhe8Iq4UeQt27etXKH/g2DlKuOkl5QyOXbc3PZM5dBOSKzZNwPrpD/ZL3OJBHaf6Frs7uUwhuMIop4hnO109wiUcv+GrdQwBRl0VOe3IIGCQM4h5x7GFxjLajk8ixI7fyDC8VtlEn7k8Vd3tKDafIFZvp718mwujKtPSDoLl7qpQDuAJnF9z6sD2eXc0Vb9pO26reJPGUyHwbz5RvJFr+JKOpDeug9LOJ0oOzlMJE9k2tQnmPAHNF5BgmFyui/STbDfgGECQiFLjU3YbtnY1wQR7j3j5W/eqx6VwW8t4EYyCQj/HeWi1ib/Zh7zzDuKBU2JjaB7gLI8bwCJa1Gzt6EXgaOX5Go7F6DHnrwFDcLxjHcIsM7vmY9nmslr5JNPK4eiEPvIlvaQnozZl7nyjiF5RQOd86rHnS6BK8cZ/LkYxDgKoqCgNA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(39860400002)(366004)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(6506007)(6512007)(52116002)(26005)(478600001)(66476007)(66556008)(66946007)(86362001)(2616005)(110136005)(6486002)(38100700002)(38350700002)(83380400001)(2906002)(8936002)(8676002)(36756003)(4326008)(5660300002)(316002)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gNNruB3uX5m8x/TSoowGx47D8mcv/hnrQ2pLc56AhH0FcdzVH1q/9SxoTt32VDqBp8jntO2wU6kJd8JskiT9qN4EMpgf2BMTr4KVFxPW83kktc/e/lOTjNe6tANOEyjGOaYrQTDVgTmes7TQmIUnx5ZwzOx1+jsrucWEo4y3rwdFLF7KetnS+7uUJ0wBqwtTKxxOK1LDOWOhsJ3lNwxcptNedK2/oVnoIOMagSWoqjDMEwFeeVuJbqws83ThcCwwwe07rQBLGQ7Nha0FsUTSGD9KektUTiwuxvNmEbzJv0rzY9aYrTqBv5wH9esriP2C+Dy5WaMEPpI8KFjaTVFXd5icWdpd8A6ppJ8J6FzuGpU/EpE2/4AF5XS300Wld/9IGLPtx9tBEi4TgZsnpRUcH68CdeHrhW83fjpAuA0D8qSiC6lbd/tm34wLLdXY3YqAtf1Vv2QfVoITt2Uj0uxQuI8keZdqZXpwzzzNcwj0DqKZ0OEcHHiX26dagtOWoGSQkDm6n2efhtk9338uLqTc/JTMHQ9K6/l8e1mqiUGnXk5DZj2+TrPrzOEst8uI5xOZUglX3ZdeUJlkozPvetE3DoHG4mYwVJR7NurwYHEPpLBicOXTs6YqoOX4zqqraGxd0pDlI1pmGwrYXM27Gp641b8ogniyYOiCJXo4KXrtVshS7nSYDpnUiKZtHyeP7QCdYRSf+47bez+scgOJqhMFM/Xuj1IGcrquzJxrMmBQh43Xf1js3FhroVbXwSNy0LPTFjmdk28OMgloOPYIXanTPXan/M/q5wRttlI7zgGxxajVXOWIo4LrxaUQxtWDLutwfDIMSf3Ehz6K+F7xxGdS7Kpu6ojlyg6DpZDmee8YnrD91kEfN0kHj/JBTauYyi8HJ8pAyS2ph34fhyqY+waZG+NILAaAokZPABrf0fgAureqNRHFl+T1pNN8AgXaaHcA4SLgKIa4RlJStCxbISy2n66tbRnm0OI7MqGJw2iWShY1vnNW+GjMeknniM5xTnR5gK7cu41E8SRMm8CCAFCwU8umLgV4y7Ev7avzwpTOPPwrD1OJZKHYe78wE6Syieaz/eE+oyUp2ItoIRdzlc+yaECwoLyKW0OBwcsmIEoiM15sCiIPmDqy+gP2YQ2WHxnUUZukhYjlCVsseTZF6UBBnF/5Nl3nrGah2VV76bkpClgRP+uoQTwzzeW6Rg2oUuueofWkOV7FoAikiNGh0RPbi6SOKPsT0VOdbCWKTlDm7YgQAAnU/wcadNJ/08KSd6jq6PPkD5J7iZ9vhoHyciblwAMyDIKRXPgIZZLU+G4hdldRCgifDz2i+mKZx3QQHuobOzgz/NYnAX9xnmyphQ65fCp7gXzvz1J4b7X1PjYQazPjRvoGXYcpdjKGYW/ErXzWqVAGG53wqaJSRU8QuXMXXiEAWoYNjKWFwWT/6aSeKlgjZ16CdCSTIA9FfrHC9DcHat+SIUGvrLdQS4kfFhMRUAmVlZtElr+t7uC6zyDTBAavhUIn3uEX8C2RUGzRQYfx6cmeDl5l73RxHNguiXyJbzCRXPUTvSWOftol7rhCQWz5h/l1NfNsJ+kBC2Ch2vXLKBdrgMv817Pk/Gs9+e9WI98kTgFw3kI9UIG4tu/CS84= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 046e8508-9a55-495c-aeba-08dbbe58c8ee X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 06:21:14.1527 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +An4QBk0O4HWVkk11Q3jwdvFHv5G9ZXh5WqCfzIPcr/k+VlLVLJJ2wBAUnPTUZVsj1vHKFHLlmu8mbBGnXZr/+qNvuD9z1e03HkPG7f4OIZ773ZsS0CxkNKP637Zf9l9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10426 Message-ID-Hash: 7QEOQTAAFMKQVCC7MNCO7F72HTIC3V62 X-Message-ID-Hash: 7QEOQTAAFMKQVCC7MNCO7F72HTIC3V62 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ASoC is now unified asoc_xxx() into snd_soc_xxx(). This patch convert asoc_xxx() to snd_soc_xxx(). Signed-off-by: Kuninori Morimoto --- sound/soc/dwc/dwc-i2s.c | 2 +- sound/soc/dwc/dwc-pcm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 22c004179214..2ff619a29655 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -235,7 +235,7 @@ static int dw_i2s_startup(struct snd_pcm_substream *substream, struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai); if (dev->is_jh7110) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai_link *dai_link = rtd->dai_link; dai_link->trigger_stop = SND_SOC_TRIGGER_ORDER_LDC; diff --git a/sound/soc/dwc/dwc-pcm.c b/sound/soc/dwc/dwc-pcm.c index f99262b89008..a418265c030a 100644 --- a/sound/soc/dwc/dwc-pcm.c +++ b/sound/soc/dwc/dwc-pcm.c @@ -139,8 +139,8 @@ static int dw_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); snd_soc_set_runtime_hwparams(substream, &dw_pcm_hardware); snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);