From mboxrd@z Thu Jan 1 00:00:00 1970 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 220C1C74A5B for ; Thu, 23 Mar 2023 22:55:20 +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 D1430ED1; Thu, 23 Mar 2023 23:54:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D1430ED1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1679612117; bh=idTrcn4OGfzlT+s77KriOWz9niFiORzyCfBXf/05SLI=; h=From:Subject:To:In-Reply-To:References:Date:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=phuYNC5ul0Sump+KPDI5MDkxd8fdA/1ZKjUoLKCjc1wwx9jTL+79LFxvKzNOifeo4 4zS5iSu9eISqcfKIaNdOg118S5vIE0lFCp5y/1ez0Odd9UFbk4Y1vL9EQls0rdkn8p swgWhQWa4AJyfdvXp+Lad9b0fgzy4onBeNM7XCJs= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 52F28F8051B; Thu, 23 Mar 2023 23:53:45 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6187EF80520; Thu, 23 Mar 2023 23:53:42 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6AA34F804B1 for ; Thu, 23 Mar 2023 23:53:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6AA34F804B1 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=elMgK7wr ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j88ziA8liElqVruRWhBi65kwVvT72h3+d+N5KPwftsUUHUC9Xqhz+9os6EgYrll2UUaibOxsb1Qz8sjxGKyh9R9L7ilR0p3WvTaydv1qEoQDDEP4+dhhM0GS/FLycPKprt1YoBPmKoMBNQEC3IO/gLF+ZJq4uZZno8y2SaxIwqB5lh5a54zrmRHuYSigprWHbxg7toEE9hzOPOc0woQmWDbZdnf7RBp1pTURFXJGkTMfh7lGxcn+j2f/p44pjJpETTgXud53UDfpNM/1lxKvOZq7Me46YLhEztWeoHd97w8xmg2KSGpkPHEdWn/iJ4pPYzTqJEJ7BSoiFYZGaSFn2A== 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=zhbqETopQXzX3UUGFWKTENpfTXjd/Y++dYj7uNAvK/I=; b=ZgFgOFDEKaR6bZ2JTTOCs68cWVS4tLg6zIQ2uI3roqzvZXBBe+UyeVFyA5WSYExcYuC6i3hFSWdpHxVFlQzLDknbdwo7kU2mhwv3Vf6nMWKrvY6oDfVsatsbKdW4sUgyA416x6hCJ8NOVDpkEsAVHmuoxm//gqzT5K5QFti1b8+dHf8j7KdtJFtmPbznmH/q2jjigp6a8YyHoVKwAfM9dvmIbsRCP7KHuT0F1kIBlL9YF/0F7noEXjM1DCllWv63Cr09hrIFYGOuUNx0hrnjT+fKVq8hUdCWP0NDpTCImSxO9usXRYNTvizNUx5OsrA/Awu66YjFBl+RquDO485/Lw== 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=zhbqETopQXzX3UUGFWKTENpfTXjd/Y++dYj7uNAvK/I=; b=elMgK7wrtWbymXXx80MuHZXbV3JNi5ECGW6bs3SG72QVQZeBL/1/Ru8rFx+AZ/OXHrSMPhnUXGAT6vjMXbPt/Fiy7od+9nebQqPpjZu6wF3c00SuEqdYHzVtVFWklCS6LPUeN0ow7C6ARjUIoLRPsNrw/TbZESxexxyTUc9sVo8= 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 TYCPR01MB12022.jpnprd01.prod.outlook.com (2603:1096:400:37b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Thu, 23 Mar 2023 22:53:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e03e:1938:695b:f472]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e03e:1938:695b:f472%7]) with mapi id 15.20.6178.038; Thu, 23 Mar 2023 22:53:29 +0000 Message-ID: <87o7ojjd06.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 1/4] ASoC: fsl: remove unnecessary dai_link->platform User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87pm8zjd0t.wl-kuninori.morimoto.gx@renesas.com> References: <87pm8zjd0t.wl-kuninori.morimoto.gx@renesas.com> Content-Type: text/plain; charset=US-ASCII Date: Thu, 23 Mar 2023 22:53:29 +0000 X-ClientProxiedBy: TYCP286CA0086.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::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_|TYCPR01MB12022:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b5d5842-a1d4-4b8d-8829-08db2bf16b94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tM949eWi8yj1kaezgAJLYQRLUSSB4UIt77fQ3BgFI14ZBgI/cpQYTlIcjrSwhHkuem+ggoVZ1pq7T2OSFz13AY6VLdi/4JQD3Tcyg8q6ies+bK6XhOKxy/Qug/A+I4giP+OO8n/o41hyIFPnGGwvStX2WZkFeOZNuT2jTU6gbIyPdOoaJopQQCUskRAx58Qf+ZjGPgHEN4ltZJerS4Ziaeh0MH1HLB45K7T3f5wkALZY5uybZX1PtgA0/a4+m7+QwxutSbL9t//bQ+J3EoYF7r0ougQzEXRQgKDKQYe6sGVhILhd4Eu6Xifezt2gBoqO9vYvnUhtO9BDHzSjE10RpBwKQ2F74wNaDbgYEZmMwtHi1QHNL0K96xOk+iPoQiRvbKmvTndB1uixbaiIrfpigBVkd05n6DjIGiFWIjAjd0yoR7VSLlNWLNpQvfbylQGConAcvMFEpl7CSIvtwXWBhk1PcG7xrh2AXfWs+gbDu3+VIvIou5knuIUZ+RSphFeWB7MEwvBqvwm5sVbjHjfvJsZjx3mEf02HB8uA12A4kxhwFQFFZHi1pVjpWxmZuAgWakxcTy04OTj/DCCl6oXiOF4nqlTJuJRRStvdNiwTLG0J1L+/wUiPpjYQ2DP2iMHNXHDaiAYm5KW/1B/wgMWfin4CovVBZAiBN3tFwZKeSSXOlKXD5rlh1Wn2cqEh+7h0neQBc+ekAYgRXLoasKLW4Q== 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:(13230025)(4636009)(366004)(346002)(396003)(39860400002)(376002)(136003)(451199018)(316002)(478600001)(41300700001)(2906002)(8936002)(5660300002)(36756003)(38350700002)(66946007)(6916009)(4326008)(66556008)(66476007)(8676002)(38100700002)(6512007)(6506007)(26005)(86362001)(2616005)(6486002)(186003)(52116002)(83380400001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nuRF7TB0CtHoxQXYmZq4QYuD5YVH1m84f7uC8lqHGhKFA4eiKGWedajfKj8x?= =?us-ascii?Q?jag34hdGRh69bGcNBBRmL+FOFIpVzz9bhMyLJTfTWF6hVlB8awS8ikNoUBUD?= =?us-ascii?Q?vJdMs1x/bCnUIBBQrntWjMljQInsfGkbI3twQwxvunb8eRu8dJ8PQy8KcWRS?= =?us-ascii?Q?l7b6snpYDd6RUMuUj/b1FYGiZ4cm4HqsSJqzbbxcHEeNbenMLF6vsLBPLvGm?= =?us-ascii?Q?WnzT8r6dZE9hEcKIyAa9408pyFqIAe12zcdcOAIdyOwuZf4Xk+8xrvZkP09Y?= =?us-ascii?Q?+GpQ77zWx0U5qoD4kcWJ0mgGrV4BYP+w6MKojFNGCw7SpVIc/DVQnfK+vdWB?= =?us-ascii?Q?Nm5uKPNdYW5rzJU7c3/5xps8AOp6T5skIh6NpgQ82BvS8Bjrvfb+PUUzPuQw?= =?us-ascii?Q?7bnwIkEZskcXRCT3tyjqme+2TAj3QVZ5RJO/aQ3em+OwrkC2TZVTA1SpAIN/?= =?us-ascii?Q?YIILxR/MRXnL2KqExtly2T0nh9bNNuoSi5PMjeL5QfB4IFAUTuOgWtfewUMv?= =?us-ascii?Q?dhB5YMXnFd0cnuC+gmpzCoOrtba8EGFsO/NHMNBB+3Y8B3pCvuR+YmLFveNA?= =?us-ascii?Q?2DkZmHyY1FPsFdxdhrpibV7B8FtCtReNl3jOZ41sNdFVRmroH00tNOySaULP?= =?us-ascii?Q?JbJC/wC8eMzwimO4cBcpcsEgvW0vuXI7nRZP6gmrgviFfIhulh5hzepilcUq?= =?us-ascii?Q?vBlM/WHPfc3aOUn6kruA5oRQIEBJ4b4juGq4BVLEd9LYOjVmaz6YKNyb3IXc?= =?us-ascii?Q?1W7FUjyZXJJsJ5r2Dpftt571HEwSjGeR1fUSxEp/lLxLaA1psPp24rsghuK/?= =?us-ascii?Q?ZUp7fX0181dQiLEHewa/yrOiANlGQPHHPVP0Bju5k1x8IzE8As0bWB+qgTCs?= =?us-ascii?Q?DWEDqT5qVpFdY7eSK2rQtEP87v2ysr8gKvOkBViWEB5NuWX3/7I06FZzHVAy?= =?us-ascii?Q?ffuSM8R3csi8w9IAGlCfuOraRoSVYki0PU2uwe2rV0avFCJQedKhEVmtx402?= =?us-ascii?Q?own2y3Zek57XN4p0zk62XKfY4jamox++dFvtjZ+OG9qAb0mve8gnrq5dMwIG?= =?us-ascii?Q?5CvHf592WmgPYg7faSiU4Bq8jiFHrujOft0imbRSstlp2dIFo0OJ6T8n1bO5?= =?us-ascii?Q?6zlhcxQ0R1IDPYHvs8yk4ET+VH2gwglSkxnQVceJGt1M+O5+QKLwdckMqtRy?= =?us-ascii?Q?pCTTacGIof3P2mOskT0FPZuG9azqiks9gm+VrSdNc6r6lTRAaqp9o9UWDksJ?= =?us-ascii?Q?kGnvGym6dOz/MROOIQ/zqpidkw+4yvH1MveoXVL6CHD/UuNqhoJyJavCP348?= =?us-ascii?Q?voGrmWL1M3p6VSNAeEWKOICmcIOSHNxXDY95pfcNzHFW4sxtTNcDC3/oRgGP?= =?us-ascii?Q?xWbd04VbO0/YC+2Sm9ErwYUd1Kf9APA+BJSccJ0YjefkMeMTuub8QkVUGI3e?= =?us-ascii?Q?vXR+gl6wUs1aAfF6m904ZzPSzwFgwRJZ+zV04ZoAZIjE1aP7C8uVDglKrJeu?= =?us-ascii?Q?uIjGVT+Zz7mBYgC0+POa57DcgYkPL+DdTQXbNCVvrgzHoLxoyOVuxM3lDthU?= =?us-ascii?Q?ecxhMz63Dvgwi1zzCVESn9fZSwGItM1exiZcFth9xqZ7sruI2BMgwyvgtqOq?= =?us-ascii?Q?jVGz9+sI6DTgLuTIZdEvpw4=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b5d5842-a1d4-4b8d-8829-08db2bf16b94 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2023 22:53:29.6485 (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: 8qMhuW/EDSZnJRa/+n/5LR7QBpbca/8lo2TUzJ/05X7SUOrjO15FkbFrW3PE45WrPLhlFKc7SNjV2LaXzwQS24+kDE+3gh16r9Us65hsUbrh41+KEuqBx5FsdNu8qM/9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB12022 Message-ID-Hash: UXZMQXJZP43KMOPJJKVJYEVFUA4UJ4Q7 X-Message-ID-Hash: UXZMQXJZP43KMOPJJKVJYEVFUA4UJ4Q7 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Linux-ALSA X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dai_link->platform is no longer needed if CPU and Platform are same Component. This patch removes unnecessary dai_link->platform. Dummy Platform is also not necessary. Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/imx-audmix.c | 14 ++++---------- sound/soc/fsl/imx-spdif.c | 5 +---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index 1292a845c424..2c57fe9d2d08 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev) for (i = 0; i < num_dai; i++) { struct snd_soc_dai_link_component *dlc; - /* for CPU/Codec/Platform x 2 */ - dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL); + /* for CPU/Codec x 2 */ + dlc = devm_kcalloc(&pdev->dev, 4, sizeof(*dlc), GFP_KERNEL); if (!dlc) return -ENOMEM; @@ -240,11 +240,9 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[i].cpus = &dlc[0]; priv->dai[i].codecs = &dlc[1]; - priv->dai[i].platforms = &dlc[2]; priv->dai[i].num_cpus = 1; priv->dai[i].num_codecs = 1; - priv->dai[i].num_platforms = 1; priv->dai[i].name = dai_name; priv->dai[i].stream_name = "HiFi-AUDMIX-FE"; @@ -252,7 +250,6 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[i].codecs->name = "snd-soc-dummy"; priv->dai[i].cpus->of_node = args.np; priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev); - priv->dai[i].platforms->of_node = args.np; priv->dai[i].dynamic = 1; priv->dai[i].dpcm_playback = 1; priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0); @@ -267,20 +264,17 @@ static int imx_audmix_probe(struct platform_device *pdev) be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL, "AUDMIX-Capture-%d", i); - priv->dai[num_dai + i].cpus = &dlc[3]; - priv->dai[num_dai + i].codecs = &dlc[4]; - priv->dai[num_dai + i].platforms = &dlc[5]; + priv->dai[num_dai + i].cpus = &dlc[2]; + priv->dai[num_dai + i].codecs = &dlc[3]; priv->dai[num_dai + i].num_cpus = 1; priv->dai[num_dai + i].num_codecs = 1; - priv->dai[num_dai + i].num_platforms = 1; priv->dai[num_dai + i].name = be_name; priv->dai[num_dai + i].codecs->dai_name = "snd-soc-dummy-dai"; priv->dai[num_dai + i].codecs->name = "snd-soc-dummy"; priv->dai[num_dai + i].cpus->of_node = audmix_np; priv->dai[num_dai + i].cpus->dai_name = be_name; - priv->dai[num_dai + i].platforms->name = "snd-soc-dummy"; priv->dai[num_dai + i].no_pcm = 1; priv->dai[num_dai + i].dpcm_playback = 1; priv->dai[num_dai + i].dpcm_capture = 1; diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 4446fba755b9..114b49660193 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -26,7 +26,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) } data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL); + comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL); if (!data || !comp) { ret = -ENOMEM; goto end; @@ -34,18 +34,15 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) data->dai.cpus = &comp[0]; data->dai.codecs = &comp[1]; - data->dai.platforms = &comp[2]; data->dai.num_cpus = 1; data->dai.num_codecs = 1; - data->dai.num_platforms = 1; data->dai.name = "S/PDIF PCM"; data->dai.stream_name = "S/PDIF PCM"; data->dai.codecs->dai_name = "snd-soc-dummy-dai"; data->dai.codecs->name = "snd-soc-dummy"; data->dai.cpus->of_node = spdif_np; - data->dai.platforms->of_node = spdif_np; data->dai.playback_only = true; data->dai.capture_only = true; -- 2.25.1