From patchwork Sun Oct 20 23:59:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843347 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011040.outbound.protection.outlook.com [40.107.74.40]) (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 A36C9198A25 for ; Sun, 20 Oct 2024 23:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468781; cv=fail; b=DtajM5AjEPhWLraeeZDxYrNp7cW9DWN4qcoOMwRuwV7SbKYiE3D035D5Q+hwp7nPRArLX3mnkz6RP6jaYnar1OG0VpcxmuHDVqmou+OjDtldr5O8LdFR+sgIhIT2pwWhkfBaDwR76ZVAVGYPFQVsp8ZzwebaxO2csky+qQmftLE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468781; c=relaxed/simple; bh=xP2X8aAnobhEdyDs795dU/bWbG6tfLueL6B8Rgx0VK8=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=OcHubAoV19DNMTmd8ZmeFjuvO/1AgK4yKm/1ddHOwK5OViu4yHwJP0ttPwTC5iTueL0GVEFIZBTcnzkChnAXa+U/fc/2rH+3oVlrhydjDHyXM5CY9Y8/EL/Mzv4cKWEPm0I+pb7gnbIzLbGMAVvi1rXYZ2aa82d28yYyZyI0gpA= 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=mmJzrJ7v; arc=fail smtp.client-ip=40.107.74.40 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="mmJzrJ7v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YBK/YfTtLpEwa1mXV46xFembEDFkBG3jdL7QQ8EUwayrn6zEo9nC4f8Bsi37blqaAVfca8XtBInvkiDXJo4Kwx3IuHAH8Rmkixrm6GwY52YNrWDNrvSOepJ2CVBS8MopCTkV11flc5GXLEFtUf+kzjtF0XrMUKpwR+W4zmPl+p4Bety/VFOkrkEqWa7WqMAnesEsT884XiZKqEwGF4NP9dedYZGFFsKdBfdnkVhfpf6/EsrcfftcbpDZ3Ym1j3HVsJ4uPT6pZ/l9GGRo5/W6Jtfypnbqr2Wc96uDnRTxycAk3n5xIBa4I3TWpv6dTxb7f7HlJ+X/aENsW6g69VHFzg== 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=ipkSOmeON/ZiCVwUItpOj0MUDy//xaN1naeVDuNPPJE=; b=BQ2fdSZig61qUwl9kd1rZdO02qKxhvvy6Y1TbVLWEH0Z/0D53iGY/LqQhtwvQo57pIfjYUSEVgWTnoLZEBPybq9cwn9MJurZtKASHz/696sDdIbOzvuDKtkDNIZHXJi7IF33wib4JHieVdOHBPyI2B9H2+yDBm0imWItcs1IGJvvCm7SGHeHY1z61c3bzLBPNNYclhKJ5CtyLhrZ7pArtxuwdI6znvXYUnTNemcnJB0OvVeYqrJcuSYJTtOxMw1SM2JY26MwE58yrQg+R36eglqjCtBz7Ef/Y/xcDGKJy4hoNKWhr132r8cfxffgnrHeqP4kFc9B33FaeZJJTJa2Iw== 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=ipkSOmeON/ZiCVwUItpOj0MUDy//xaN1naeVDuNPPJE=; b=mmJzrJ7v9ugIrbe26q2+HmHa+Lu7Jbj6DWFshceT3tMJAbVYkfe2VGfhqAoMHBQEw+5lUZuUMEQy02dZfidaOqA8qyaRLJUi4bYhduIuwy1doKFp1XsqMJ23x8GjryR4Kp9F6rVQk+H0ApOf31DJ44T/7sU8ylsSEuhL4gRUYro= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:36 +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.8069.027; Sun, 20 Oct 2024 23:59:36 +0000 Message-ID: <875xpm9vh3.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 11/13] ASoC: soc-pcm: 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: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:36 +0000 X-ClientProxiedBy: TYAPR01CA0195.jpnprd01.prod.outlook.com (2603:1096:404:29::15) 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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: c67cfd80-07bd-4975-e3bb-08dcf163409b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 0XQBITJD1/vgvRFV36C6zdx5bUKmTmzXYJVYpP+mPFEJZdnDrfcHr99rkPyExJbuI0OO4+tAVDGeypke6o3oF3bS+f+tcXElOGNt10A5GkXBIgLE+4fGDUrDZ73tsDDnsfwQ8Yne4k96ty4F4n3X+e5oG9AY9Ianc488AlGXR61ScGj+hzW3EFhzjJB82yqvDWGjioGaLylZPSVdnzlTOy4krdcLgw79Fz0oU+UMNazdFKGdgcccTlYs3w2qT3kuiWYz5NtZ9gKQi5uXRRjENWH/iPMCcNxxzfnRlO62bnGH45XxXrZn2mS0H6FW7t9y2BH/Ou2Of3kcmgYD6QMPibxlnelMtlmGmgp9bLd3sKnZi1Z/EBWoBK7KEeBQKHqnHSdt4NPUltNUVoCOLLEz6fJHKKeoEL6dDFteEduoHFZcsyNAVbcNl4d6kmTLatNuYky8eTviG/i9hP4Rq/MhOkFu9grxQjbnWgOmDZmgNMYaM4cnoT1vaEPQzZ++um7xIihCE3uzrsTA9S7JOylGV+xe+YlKi6fZiICjY1Ujxfb6Gaqi+3NRfs2VcMP84LNjdEV+zNE9tsRy6C6FeZzGDIRfBdSnKVGxhMJJKXQVUx7zOSHISno5hK2iL9wbwWiZ8/SpyXXYPA2zctxevUpmoN4P41J5oDlPjTP9L0NXn5ZQAeBYdMWvFKRuzOjqj1eQH00qI0a4DNo66xFdx2Okoq1UKXYGSZwMW594RtshTBQPQ8RbYivcPIWllDbrB1iKdKbeHw1JncdmCrCaUNuvmHY20Z/Os2qkrA5LlvFHt1HiHSDFjrF+KRofY6qFWSmchcqqL8cSIwqypUmdWmtUmE0zSAzCyA+GjddtzJuGVKF8NL+9LbT1Qb+KCkg53E0z3Lz9gTPVz4lN1dW1uszxnqG0mXpq58o8nl0qOAuZECnduuCHpbDeDd0yQfYiY36J/mtoKhu+G+kAuYfs9ggKonBonRmfS5CFOVO3gkLqfppJDxBbMG1kTJKAbSjGyRx76nCI198Ssm6GDeM2Rxkmrj+fLAdcmH8/GfDv8atMpjjFYsK9c8VBrMzSY7e6TZSI7nZFMZRPowlaz0PACywxBOgQLh/R03C21meKvOQ7mtNixVLjX5G0W4EKDel01ghzzi1ysPuZ5leEXCof+2+Ydd00I7LrLXR0MbR3fGxbfl7SFfya0YaGGfcxKqRH3KPLfE9yKdbDKiLRajryjrVWur4rFTMtlF3aGiyLoUgw6yo0woHE9Euc5zST24/bmE3F/0RRV7eVVfemaXSo1U4keFuf1pfcjeZli9coY7afI7Y2tdgWyqOZIUeoK+hkILxe5f9XUy6Y90wmBa0d7F+WxsEFD6bgiTfEAhn5qK6gsxE= 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)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gwM5RIpK6DhzPHspx4OiE08Oe6miiUE8IWGlz7aNrKsHZ1F67eEMfavGOB7xDbDXnuRn/bhOWBgiRXnV/QW29davnZ5ZQF9kETN57JJMcLSLgp7nhCsulzhu24gg0UoKIU5JHNtt1ngQ8VApID8kBRgsWordM29vxv6DnEBD0kB0EWGlfkC5te6fmRf5YVZrbbDOcA56ZH8Uw6OGQvdGymeNay8pYvz+voYXeaytQ3ynHDTuCNsHmHDvg4gRgFqoxfNxbw9R/zFKvhZffeiCfAbOImpvOePjGvCb+YelunHHX4veiboiyYHs6fGPUorK6bv/G4GoK/5ukGZUXxT/EbWz3UelLG63N+0gMrF+7sxwO+yXXGdE+5tNAVZcT06iUPkOzrHNLnGdUVX+EWo1HVsV4k+dJicTKqV2CzPTZpd0Mn9naWAe/QL25tVcVajGUQww1n6Jh0c14ijOkd0yDM1J8mEByKp7uvX9fNYHnpcE4KXk+Wh13o3dZ5kvmBxKkiA8tQM+31VBC49PcAoKHsw2po7vnpISYfI4T/9PTNKo5Hl/1cSD6T3CWX/l74U6vJysXO7jpQpZU+MRaxjc48mqFbGs2evS8/XxA2dnR28fXMPP0tMSpIx0NTEwgcOQkT7ukQLpvi0hSqy+KqbkuW2bp+NxzbWJ1bP/R3U31Vhju0jpDbwjGsN4MV34KYDd74Sh0s+CcXOA8JuIxAsxnqvBmMuVUH5Ue27i68bCr5FQ+B+ac0gPMNE/027FHqqzc4YgvcdZNupNbdjakorJ6XAOfPm6E7C+MyRKSTcoYD3T5FIZJpnuumsEgao42Ov2fkECB/ej2Dlo51DSW1TF3PMplHMoBZPL9d5DLydBfvhBMmxQSxQuVjiaPwbcr16K4iYFy0jtPRUMgFWDg0h3TDK4u5BrC4QJdPaHvBvbBBPxodAveWkTsKvqs/NrKB2AHO/pISfMfw1Yvw4Amq5jNy+WAeMeR/qm0qKY+tWc9zHtQRXvvivFHhBQJZBVdHr3EyJ2HEh9u1Z6/Z8Rszd3FR+AHLJVq7kMFTZorMLm0nD1DNo/7Iz5+tc7Rf4d7Y7+WaiObD1BthKmo+LxTsBFUfDg1191DPLMec7LLsZyHqoZ8ueczBlbbBLkmPRs4kwbp0zuApS+RAJ8IWj8+6rsLmrMwYvI4PisJSnuwwH8OlsFJAUXokdn5ffgHSaY0p9uRqzSDQe8qou6NyD8ZXYWAiciItim4MKG2BdIaQEs/TNWtg9voNWxmq+tuzYReiTRuF4BXTohhhc/NCbcu2ubt6h2M8gOQNhqrtXkCS4j2KjC4wi3UlrRJJ070aghLBVvDzPGFo5rTy3X1fQ7a3NiPiKet+GTnBquzilX3QBaaZDEMv4MaYRv1h4JM6ndV8VKyIxmm5jdFHOJmCIWXU3GnIC4EASUvYuU3p14Cbivo6fQVQwp7an7AaLMVU/i5XpMfdwL1v/HnlpFqtfL0gNaPv8HhSFEzr780jHUJK4RPWomEpSNBp615alNsvK/ghPJaYh/PzNJf9/HP/Hmi9y94xhUKMeNue8Y5lIGxSK5PLmOOhXaU9D1Ju2KhwFUOTj6DvdbkvPsuIaCpNRgP77sOaTMexXIEEzggnNleUOgwTU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c67cfd80-07bd-4975-e3bb-08dcf163409b X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:36.8500 (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: Y16Ej4ikkkcrhfYIKNdJQRa/eTJro5XoYnkyYm04HZfZ425g8SL5SXCpJSZgz4Zy3lu6WKYsdDfsJ0svK27/byjqtK41oc3tZpY+MRrizixlzZhkvI/tCAb41ydppo4P X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 5 ----- sound/soc/soc-pcm.c | 33 --------------------------------- 2 files changed, 38 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 8a1db45988ba6..3e72317e2c20f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -820,11 +820,6 @@ struct snd_soc_dai_link { /* This DAI link can route to other DAI links at runtime (Frontend)*/ unsigned int dynamic:1; - /* REMOVE ME */ - /* DPCM capture and Playback support */ - unsigned int dpcm_capture:1; - unsigned int dpcm_playback:1; - /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; /* DPCM used FE & BE merged channel */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e2c5300df0f25..5142d1abbc7b0 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2844,39 +2844,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, has_capture = 1; } - /* - * REMOVE ME - * - * dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used - * as availability limitation - */ - if (has_playback && has_capture) { - if ( dai_link->dpcm_playback && - !dai_link->dpcm_capture && - !dai_link->playback_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using playback_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_capture = 0; - } - - if (!dai_link->dpcm_playback && - dai_link->dpcm_capture && - !dai_link->capture_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using capture_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_playback = 0; - } - } } else { struct snd_soc_dai *codec_dai;