From patchwork Wed Sep 25 23:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13812561 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011045.outbound.protection.outlook.com [52.101.125.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FF1F1A4E74 for ; Wed, 25 Sep 2024 23:39:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727307573; cv=fail; b=Pisrg82z14WmSWivdu5teYdNqovCpiH7iIxu5QDyxruSo573rLyQ0fJ9gFB2a43kbjQi1/Ho3+O0m9ye78EQnsfQ6yfEFjdZrZF6yFfL5TXfCiJUNtBBRky98EbfMNf2EhydUkSC+w+oR1Id3o8XnIoJ9X0fVTOj2AYsOfu4O38= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727307573; c=relaxed/simple; bh=dWJ9aiL0KPdEdwUWlUtMQzWpBBRw5tjhFlKXxKwqj90=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=gaTBqtxI3xWYplMXPtgr7ooBzTh7gTSMgEPWzzP7uPOt0txcMyRxFKvHkzEw17YOMLLR5/84zTKDFgOui3+k1tHcpALx+k+X8r8yB4ucmKRZSM3Mygs8uT39sjoYqhjR3I9hEfpDk0J0aXu214dumtizehBPmTvlYxiT6KuH6j4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=me2ojohv; arc=fail smtp.client-ip=52.101.125.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="me2ojohv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K14QpK5TjHQFfmMTDlGYUoX5HH2U+09CpaTe6NyEh1ybQtjX07K0HCaand7EHIEGpdMumR3iL+MZGAJePP6aPsC2ha3UT3lO2RN5V/deTsbEp+i9zjYjknhzVDkeLesnjIaC71pulEMFmI1yb2aJ0rSCNeqvSnh7pPhke40Loi35ZxImuwDDY4YcGyDgvdM0Dm2/9U/vxJ/oXWS5IMDbmkDPKCIH3ElyxL3ACyYBGKPGs42MDn5krCTtTEHQpRF+fi9Tx2uRnQh5tzTKoiuXrTkkkLMizlWaWYzIEhW6a8foMrjyJOf8OUQfqCiff2bJatLzhWfjosYzDSeVnASGsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ipWWxJjMu/EVkBUzGA8d5t1ousLvweYqHA9t/geTqS8=; b=dnjM3IVV8qCL8Bzbpb73mA2QAioCy3b3q/loPYHkNU/j8di2/R89h24Vga5y8OdEv3lV+CEUJfieriX7HeVvquhj0bs5bmPnYJhZGhtkletRkR3zb5AR9z+MR3RTsJRsZnlThPIUAsQj1UWT9oWx0c74Suj4xdbdQ1m4Zzgc0xQV5h8iP9qJoC0rFvpOf03ItDM/jq/w4L3f7YlAB9tBvKSW09gjUjeBrOa4hF+BjAwF/cB3LuoZyqw1yYU/ZDCKMTgeOywNRyIBiqHCaQSICTiVij2CtWXonf8ErLjvIQExbV9bjI12mjd/njYyczwEOUezBVqy4F10sUjzQH7pyw== 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=ipWWxJjMu/EVkBUzGA8d5t1ousLvweYqHA9t/geTqS8=; b=me2ojohvCbo7jni4sMRm0psGCqzX7Hv3KRwcO4/U5x3xF3ECSxBAnZ1LGd4Jt2x898lsXlmW8wiemKWH7yxrhD27tSAam0rh9vGCZ1q7pC2n1tfKVZb6Upswe1XUpvP5veEPLhL/fNVnj20atODnFFWw8VOkPKD8leR2icI+Q9M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by TYCPR01MB10634.jpnprd01.prod.outlook.com (2603:1096:400:292::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.25; Wed, 25 Sep 2024 23:39:27 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.017; Wed, 25 Sep 2024 23:39:27 +0000 Message-ID: <87frpn9uc1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 08/13] ASoC: soc-compress: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r0979uhx.wl-kuninori.morimoto.gx@renesas.com> References: <87r0979uhx.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 25 Sep 2024 23:39:26 +0000 X-ClientProxiedBy: TY2PR0101CA0039.apcprd01.prod.exchangelabs.com (2603:1096:404:8000::25) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|TYCPR01MB10634:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f61af7e-4b6c-4007-9586-08dcddbb4b35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: xbSipLqRRR7CC1VRABYXauTnRf8Ffy8psxjCv1MSDQeeagEFyCm1oQGjXcbOEuK8EMHin0j2BOFXd9i2g3YpPlRLSUn+3H/qxJIdfQce/BtsB2toZ8MDjqpE4IQnptPEiRnSKM/ZBhPXCDZZBXRgWUPW0gC+BoMqTM4TBFo4tqfq3jkDU1Va1lzSYLYEsiHIEuLAl4uWvqkyAAD/TcaS+gM8yl6ivio5wY+poEeqgBHGzFbexPxyfPbnNK7MBJ9dpxofFjJxWlUKPhWMtCRTLluK9DMnce1kCynVOK5KqKQI4fXwoZRsqIS3OQWWKRGurnA4O1Ec1P13bEniDb0gXG+zdFwpYh4vrvV+rdt7VUM1MQOO3EjsASpt2Tzj6gbpDRg+tezCuImdDmhNitfQ1/JDIxATZ24nNlEtRkiK229GjWg9ZmygoQx6RZMSKPVTAxAHpSzyCjFV/D1VEmb7mJKzBYjQmqVs7BzEwcLlbSRYUbKiwCgYXI+6uwU+DU3L7T70LAZQqk5NsETWlTsdguHPvsRQg90cleYYyiOW+TeU39bH5R8YkxZ6c5tNb8ZYUlQ6d71mqDWzaPk1S1+Bkv2ELr7eILNS0zsyXpBeTF1hqlF+4grZ0HmMEdxtPVm05DkHmvd5XrBf3uAqK3szXb2dHzZ5A+DW3PP2GIWWUjIQ1byZUSSupI1cbkO3WhAuGb3Vaw6b7+Y1ghhM3gusdlTJYggVRxQI4EiRaM5ZxEZwOCBbcJY2/WQkBps8Y8C/b//Liq3rKUsCLDwdT8CAqrlBMj62+s98KtynUMSQWJpQJIUa/DLA+BokKdxuVJOAH6ly/NJX4vyOIMQAglBkigYLmelF7MRDe9sZNurcCy0s6j32AxRNur/pE5ETjtwfr0ouC2AydFba1zVZBUuHkmsezuvW7QD0r6KilYOAQTw3V39k/d9dJlmvHXCNWFvT6Q7mQF9YmwadweeBHBBhCmHJNTww8HdRA5w9e9e+rVbz5VqBymmbQzi0GgL7L4vVn9XVsDNWoxhaFM9Gh8Et0etZdUbXhK4BTqW6HZgB8Lr+7+Psid+GyubTNocQgC5oDigtRoUpskw8cDlHDZA4pSehdTz6mM8Y7qaUC7mUdZL5AObpgifBZveq84msRN2+aYlLTDOsTe9RBMYglVp8qH2z++aRrGcxqSEpjr+X8PGimGDezt16dk5OXx0FNrsIo43WPyfp1Y4v4M+VWwWPhxbsv2zKVUn628n/wUdH7v3Yb/SzZNttri3pU4XgL2TGyi5AMxeSHvtgt+gUVFTktMP7vhD13DHT8BwQ3kz6oDDnlCWM4HuIJb7y8syp8AiQ39oeFZwhgydU4IsnYEjt+w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uhdQ0CBb9ugxphcYKzcsWbGTIe0e2r2p/0QNHv/+NMdnQ7rdO4yYbrPxxIxPU5jc/7oRbBtxywagMrvFs3cMRdM4io9QusEynan9vCOKMrASNUEapVVBylB15bnexA1wnRt3gYZ55gHoukMyaxSBjiqsdn/9cs3S8s4SsvFqbZ3+hO+wvn5RnyN/j0hY0uFF0OYMBLlC4PRHV8iASqCkM6U2gfNqi1/WwyoML2EsRzmIqXPtBrYR+YP/4hMsEpj3yWSoKb9wImRpISqyWsz0BI37yAoecsBoWaR1MdLOqovv3Bv6Lh/jtzK2e4Jvq8x861pIBzgtFX4DPAlQiCKLYPp/CckmVkIyRB54kdMZadwiFSkFeNREq5ropy1+hi9+92/fXl5lmKwNDnM6tzbRarnv+Z0Pqn9T16Rp0wtgtADcXaDgr7/fYS1z84E2ASFIUjCAvZbhnEC5YX1goYcPMcnV8ypabnPAK7y6e4mM1Gh+99BVDfecyFqexcZua0DpcOFa7f9Cf102Z30ILz0l/6a7FZJXpoDD/be4M4NdFybRANdlmuAD7Hr/UmPm9BR7O8IZnf6ZJOFlYB3A0x6s5Vd6NFwNjGN5u7pQb637RGFmpdaraqJIHcj6f4873/+wtn5tUhAF1Me4kEy36ABzHoq1ucW8giYyyV6G6WVsfwQnGJr5OvJWYh9Jz4fKUk5SvfCCRy9itLImyDm1JCsVica3ZIcel+DmNB4iBz/Hc3dO8ARwnqLBzpL2ev/kRU2LTDHF0BVu69BjYSndCvCJJ4e7YF2Jm6aYXXmn2CpyOdi7iUegZgylOLCiJ+cNrP2T1X5ilMeWA1ReyIPB73NkgWSX84bIP3zHsGTHypjwOYxkET5xSZ1HETcg6YZ5QYo9ae5IfjD91Ao+M+wG/OjZjIokz1+w0K3zpic9Gf+CLZ3GNGHpodSZ9gXWXqKuDQBAaGVpAOBl5CZUhLMYdYwnEWgslCgDOTB5Wey4w7SdT3OuTMHif1rn+q19PWD8cv/3KcqfB3c9gVPAd6kWFRRoW51dR6Uy6ZBtmak8an2oJH2Dz9aceGsIAVvbeD3vl6SRBQTWy+8tIz0j7/HWi420FAhebtyXRL482PJLVhM7EKbjfeSizvrMrJIbW/EaQCA1rLssues1QNxnHDmu3h+qOx7SDX5J75e101+90k9h+HnJvXD0A901ser3PUdKgDHHP4tujcHdZCnkVE3TJkt8hvUtIGBe0q773XgMrKWZDBVqGcCzwPqdMVniRkjCcWTefcZiXX+rAplXPE/4H+gZS+gSZO3/pUc3IDGoVBJkcbQORSOEYWrGQ88eaFWRsPUUaFvmEJKMljcAyGP72Kjr197UTzVOCtZCXm1egE1f5swpnS4U5yNzZyZAgbmy5CwVnhIPBLyXEwx9bocXeahfAmRIiq08ZZf6cW/nW4b8iU1+um6GQF1rkk2CWt6ja/aXzEHXjSzhT/6L9RQ/qXntpxoneqgYeHtOwgoegJf8FusAgqEU3x1Lyv8nfgM4peHJD9ohBjOntxHKGa9QNmLO5nigiskHmKlh/A8QrMhBrHwclZ/yJzgGl1TamnRZ7/hbnA5dZRJAR0g4iC4ZHiwShqJcNjiso+wLIWRtZkoEwLA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f61af7e-4b6c-4007-9586-08dcddbb4b35 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2024 23:39:27.1237 (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: y9lCDoikfAKqCdi0udcKJgmuMx8Ah+8Y6xREcSMi6WWE1fO4ESGmQHAla7oK1tXYq9sE7VFrMBt+SowM4nWBzSit3dCT6dmtXQAPtYeEr5THFE0VOk459mcwpY4eFhz/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10634 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-compress.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index e692aa3b8b22f..a0c55246f424b 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -606,12 +606,19 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) return -ENOMEM; if (rtd->dai_link->dynamic) { + int playback = 1; + int capture = 1; + + if (rtd->dai_link->capture_only) + playback = 0; + if (rtd->dai_link->playback_only) + capture = 0; + snprintf(new_name, sizeof(new_name), "(%s)", rtd->dai_link->stream_name); ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, num, - rtd->dai_link->dpcm_playback, - rtd->dai_link->dpcm_capture, &be_pcm); + playback, capture, &be_pcm); if (ret < 0) { dev_err(rtd->card->dev, "Compress ASoC: can't create compressed for %s: %d\n", @@ -624,9 +631,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->pcm = be_pcm; rtd->fe_compr = 1; - if (rtd->dai_link->dpcm_playback) + if (playback) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd; - if (rtd->dai_link->dpcm_capture) + if (capture) be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd; memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops)); } else {