From patchwork Mon May 29 01:05:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 686957 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 9FE11C77B7E for ; Mon, 29 May 2023 01:09: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 9512FA4C; Mon, 29 May 2023 03:08:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9512FA4C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322576; bh=6xB7EQYzattNpDgPEkkaA5Rf27rpG9qFS5ykOi1y318=; 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=ECK6beRCrsIN/Cr8RnroT1GbYN8OC6NL3+kHdv8OWpVOybd3atHQR7p1RjL0tSqiW k3w0wZztS5YZXgiDHqtrs3P9MWG9Mr3SgzqYidRz9n5aYaKOtOozLQA9gywV7MaPJL Cjx/D1Vc/Pfs6uk0NSCaeFnDwBcYsA0zr3b9GO6g= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5C8F3F80588; Mon, 29 May 2023 03:06:14 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id AE73BF80510; Mon, 29 May 2023 03:06:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6F2E7F80612; Mon, 29 May 2023 03:06:08 +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 8C4C7F8026A for ; Mon, 29 May 2023 03:05:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8C4C7F8026A 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=hYe8QOz0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AU/2lPZGD4NotSQIiELzUb3kVCOUBFw5kYzZndTKye8KLDpECo108k8JUPTY2SEmTkTJNiwB9/67a8turfwlosKmEJylGpwNOVD2uO4avHpZrYvNLmTNqTyFEfXkSxfnLN/zIzSncRmmMzPmz1N8Ykqx8tJiWgp9KmsQHFiYz3hwP52b6Sov284uYyewoIU5e/no8hn/I5gmAT9X6mbWU6l4j/wca7YkIwHzspz2f9m6lGjonW+4/o8W5TxEz83wXgIf6Zzmm88OoXqirsW08yUlFdXUm3qfNiE8nHL+gIsXd/oVkFmhh8m4oj+RjOmMYhghcHUzGl4ZA1DN0vQPNg== 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=UEa9MSp/pEhMaa4tNifWlD+mJo+k1OHTpkFn9Br8cNM=; b=iTGd6wRyvpEUuNGqVRiLmvwiUaMdw5VJC0s3yXtmhvBOK2DuoO2vXBE82CBe0WsQKpGmmqjFXmQwj3UjYQMkTLLEz5UmD8YRt7NpoLeuGpfCzu3Lnmw3RthA97OmNRD6rLh3BQFMf4/eZVUo9JyKuAz7emwnXe0K2HSmbin+gJtC69tYW6Qm0EXpGR89S1L+ApJdwdd3LxN+i1E/ecyK4tinaxLIiAf4p9hRJY7s7FwfkOQzLdRjrOWh3zHEpPnUgPh8lEOPTT0JSKDzt2Mmdxv3RsOH/TWvj5QeoAvOaG6oVoJP9bAfHW42BTXWgz6/V65ftwnZYe6X0+64BQBcag== 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=UEa9MSp/pEhMaa4tNifWlD+mJo+k1OHTpkFn9Br8cNM=; b=hYe8QOz0MSCzrdrX6kplSE48b86FM5OLy2Nt2oli9QuMtoComkocFb7PWXqMb9PL5onn79XvyWssIiAoch/y8pe4OfYN9fO9F9S+uY9JWjCeviw2uoJBvnmHT4K5o8MZ5cNDk6ArEy1sUM87ojSFnZVwg2vBmvZ/NgDX6kfQm/0= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05:50 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:50 +0000 Message-ID: <87v8gckkup.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 20/21] ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:05:50 +0000 X-ClientProxiedBy: TY2PR01CA0009.jpnprd01.prod.outlook.com (2603:1096:404:a::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: ab4e18ff-d2ae-404b-ffef-08db5fe0d80a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ty3aGlzgCJswppBBGnv0Eg8qFVvFFVGq8VxZ2KsjsBRYjcHH7sZXzX+rJ0f9Pe4x9ZrLJ3W0Psj8hTOQY669GinCZp8IhIcpVFmFFECOK+kZSa3JbHX9WyMoDCX1U2Ez6VWuTB3ri1wqqpQEx4MFSLc3XwOQChN50/mhPL+0EPg49SD6cFs+lCge0WB4+Rt73D8LmFjWeHrHHzbJctMUSTCDWHXEcj8+6Sdsh2q9v1tyFGozJvdiQkhdWJoepwYZb2N8dnk+3sWgYzy77NySyPjpeFxaNpH4ynBMhCW7bLB4VxMJv2BQ0yxEgbdcBJyusLyNS/UMdzMThv83x+RHA6WOTJtSXfsW2YfdpdysET0nqsCLE8iNm8bC5R+kA04pFZhH61xo97nhRyCCyaOUScWv8hdcEkiEPUNtwLVLS5YfjORFj3dBF7ktRdsc12p36FshIjh0irlSOzUhaR+xHAND5l9iFWDENW+1jnv9F6q38xHT/qJV91RM7qEevajH4TryTJg8R2P+OvWeSdzV4LhbgB28ACsukvWUVG58jjDF9mkvz1ws+a7ZzSQhaDS0ElXLujGGq/rm3uWracgvPvUUKLtUYw5DUgcgzLt0pxmkF9KVbtRCUDPMgqBHsbrm 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:(13230028)(4636009)(366004)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?9vY2sFDf/mbsAJOlAGUF1kc?= =?iso-8859-2?q?XUyjU9ZuBnimkjJdiBEnIkx773JVTQQElXUenNrlpdOP6bCDiq9Teny//SlM?= =?iso-8859-2?q?0C6/EcKf314VGfj+jSe7BNiJLCHWwz3HDxudIofxlakAiLSWLAdXDS3J+fmQ?= =?iso-8859-2?q?4VabQXtCNaA2GCTe0MMX/3095IjuepKIgkLibdhFnVSndeZImrBjdo2STBIm?= =?iso-8859-2?q?iQvSnAIe58XsfjQKCFqfi0u9Pw3ry1hP3R2bSoq0uLZoAmK7mhSPIR7h9Lmv?= =?iso-8859-2?q?SbY6E72iCttdzK6OVRRAKdJ60TzgLha7EEbDXs0A0VhbTeKCzc6Iu2OXT+64?= =?iso-8859-2?q?ksiG3juY0pEpsxoCFX/ucdOov4ppo5Q19MGOdalmPsz54fP7OSSkvc53h73R?= =?iso-8859-2?q?pP9boydCHv2/39/LVuDNfHUbYiJ+2QhrqfeSkbH0obKN6Cukb1TsilgZFUcZ?= =?iso-8859-2?q?XFPhvCQ4EZ01mU+rrYkWv8QUBMsgffD4z7RfPSvbBDPmXlEwS7wN5RFun45G?= =?iso-8859-2?q?NpsMJQt4Ke/t0MP+XrRjyedt73FJGDNFoG1/QnTuoT80QU/beTfkItthSaCA?= =?iso-8859-2?q?D1B+LiVs4/IiKLVNOFugJPKH6WT424YiFAwZYpu6unuHKzZdmb5gi2JeCOQK?= =?iso-8859-2?q?561VPmi2dAEej0TONrVKXwm8mmIKnpsY2/IHeOSTpEzUfUtcJKybn+ZJOpaR?= =?iso-8859-2?q?sNjh5RZ3O8AcUbgEq1EMcW7/0jM4rR1ZO0fncz/vdKG2riGgi4RpnxexB4wl?= =?iso-8859-2?q?LNHs30QweWVnGDTyrP1xlKwkvSlE4ena/qHu2kCcZBK+o0CjK8SRRx7WIKMq?= =?iso-8859-2?q?ua2Padmvo/1qK77lNNbo/nLwXxF57HHTUAXggYsbVG6giDuoQwenT5NyMxEp?= =?iso-8859-2?q?3YiMMC6wiM0xCecQmuAFPtqs/3NV1QrcgyPd0IV4PMV0e5Ad/c7LiBJU3KNy?= =?iso-8859-2?q?AtPlCHuR/fqbVmx+xcpD9UvP4FAvoKqVmdsQ4JFxp4bzeo+/96+0K0wDAvC5?= =?iso-8859-2?q?o+UVXDeepkOBEk7TvafG79/ckIJXT77maDs9SwlZc4kbJfyGBfB2uwPl6meo?= =?iso-8859-2?q?vcOwC3jSsS3cZBsFGM1v488Y9kaSMeFbXhOyD6nmNuok2+Diwbc8WeZEvZ5i?= =?iso-8859-2?q?ZQbi8Jqz8ovcRRQgCKOTaQEBgaHNPPjvDOXjOw6kbJAkb0WMUptjQbZxUOju?= =?iso-8859-2?q?lIECEksQx+ajSgaPY01h07BmFZZXQsAJmnnSwlhRls/bEr8cxiDTVqhecDa2?= =?iso-8859-2?q?gLisXR6i+WytS/kfD45b9O1PY0eOZmxE9OsOgtc0hWtmO4BmyFNGSWl/3Lq4?= =?iso-8859-2?q?kwdXh8r/dG3vEkINdToAl8hp67MC6y2ZcFPvN4MX5T1hUk+zojVebyJGQhAu?= =?iso-8859-2?q?0Muc6ROeV66pjSTIqeT9R4bIeNUfXOEl6OuLv2A2Hm7wc4pi6qRCwLiDyGzy?= =?iso-8859-2?q?tR4ehu4s1RFsG5nW63AFqInvSpLvWYh9gg/ZFBCTodhBePr0mZNv/+sWlaFL?= =?iso-8859-2?q?JGTP8DeM8ctHYy5ot616CE1c52Idv95+CQg/CJMdZhg1ZmN/tqXSgoqCDZsX?= =?iso-8859-2?q?rnHASktFukHx8Bn6cfHc7lvMj+JImiLBY0llTAGX4jGZgsE0V06CETrqADD+?= =?iso-8859-2?q?zsz1O2Gl7h7PYNf8xDx6IWbc1YLAxg2r0tRQqOyuRFhzI0ulbGUn0+HBALyM?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab4e18ff-d2ae-404b-ffef-08db5fe0d80a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:50.5796 (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: fqRIdnsqucfrCIkg2JlTaHDlFt6Ns9AW3LDaPL0mdetZGqwPwsLopKMtXfyW9BxQVyyRR9RLG4WaKBMMJ6MycYMN8M3X/VOGDk8W0rDEBVca3biLn9roiRsogBSl+TWb X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: H6FBD6HI6HDBYCFPKWV5JLXKCQRLON43 X-Message-ID-Hash: H6FBD6HI6HDBYCFPKWV5JLXKCQRLON43 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: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto Reviewed-by: Amadeusz Sławiński --- sound/soc/soc-compress.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index d8715db5e415..cf3cab7a648f 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -602,12 +602,15 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) return -ENOMEM; if (rtd->dai_link->dynamic) { + int playback = !rtd->dai_link->capture_only; + int capture = !rtd->dai_link->playback_only; + 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", @@ -620,9 +623,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 {