From patchwork Tue Oct 15 00:56:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13835590 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010039.outbound.protection.outlook.com [52.101.229.39]) (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 D37C84B5C1 for ; Tue, 15 Oct 2024 00:56:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.39 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728953806; cv=fail; b=ZbP2A1UcLV1su3pO/u5nq6DKXzgLDts1HagthlO0bMOBGWhq8pB5zqWNhTFhBopF0gCTs4Bu+TovS5ueHB7dSxC+20gJa7BQNLLVKhiiKFmKlVh0NWInQ1f8d5rnK8OtMMgPtAtDtaTmMSs1Ghtl4eKLFQ0YDHUbFp1otaTGcrY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728953806; c=relaxed/simple; bh=G6O3FbFLkZiAkNzy3cz47yXID6ka4yLo1YV64oO7Gw0=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=M1hhRQMVIs81lw4z8kzOO/P9bdxuHWht0zmuWxD9yUgz7plyyd71ydJVZPSIgbLCizGhLFiP9ymAEOKNBVh+D+NrtnJ9qF8ocj5fmt3jBSCX2XCKgPw68JCI/W3uvL+uuM1fv+RwZIXBq0zqWxN2feVfiioQn9fjENXaxaQX0QE= 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=RN+SyX0b; arc=fail smtp.client-ip=52.101.229.39 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="RN+SyX0b" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=blJPbmqSSZEvDT/mAH1IomOGdBE3LpHF5tDQLLFPApbQbHF07M01IO5Z04/3E0FjFAY78PwGUyTvBiV57a5+ekt2hlTtWDt3xNZqGUY82z/BlZ6X7xgYAwDE0l/mjo3GyqnZ7caRLJUU+y1r73ys1pWRKIdm9eQllkjwa8FwQ5AuOnmgN1NRwnAWGmmcNRFOBWmPZjteBfaxCMvUZNx3eLX0Mdf0CihARthHAO1Eh9tpCMUw98PNxgUOwF7BKINHKTh57YkHB6OUefsSnbkaZsC1ldi0MahOzwABN0xPN/OKGLQk+ht/cb2y6HyHnREhABBZyTiOv+Bo2rtkBsuO5A== 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=CFI9/tZ+iCX79zEhF0xVSCFczVQqTc/RxNEUXk7rTOM=; b=tgatlH6/TqzQto9oyPf9wUCOGsKW26uf+ZNEz2EOI6j6srcJ/AO3ZAq/NlwALveFim892XPLAo2MkpFSP2IUfCa4CUB+N+G7fV4sWtfUmnHCi0BhWTpTHIluHHRCbyYXS6kszbeZdCwMZWrVS2MGlGE/GvPV4C7IKQuluGBU3/kgw0d4tDeWoTRb2Kd487z3F0MTHWbLIsQXvGYbjYeUc7Voz0McDWj/fdvJ5sY1CYUfKx+esbw4PbwCXe2mhyu/bx8foGEU30d0AiCGUTVuYxKFN17Z/uBdPE7g9mijZU0/xPMGJfoNv4Agkp5xGndM8LjqBCcbQir+laBvdegS+Q== 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=CFI9/tZ+iCX79zEhF0xVSCFczVQqTc/RxNEUXk7rTOM=; b=RN+SyX0bI947lIrsQvSVS3YRuvogU9vIIuPnrHDTtT4pyRu98RZEULlV8XNezkbI/cX0zOfobM0ilZlXFpGCsEQv3qmW0ebVGskTcepI6491rb3to99H9b+B4Gx+Ia3A7H7Dyc8lFnvPgMLBWlg1dOtGprmZagDEHT/k2U/qXfI= 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 TYCPR01MB7121.jpnprd01.prod.outlook.com (2603:1096:400:c0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct 2024 00:56:41 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%4]) with mapi id 15.20.8048.020; Tue, 15 Oct 2024 00:56:41 +0000 Message-ID: <878quqqj3q.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v4 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: <87o73mqj5b.wl-kuninori.morimoto.gx@renesas.com> References: <87o73mqj5b.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 15 Oct 2024 00:56:41 +0000 X-ClientProxiedBy: TYWPR01CA0019.jpnprd01.prod.outlook.com (2603:1096:400:aa::6) 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_|TYCPR01MB7121:EE_ X-MS-Office365-Filtering-Correlation-Id: c6d115f8-f9c7-42f5-e3bd-08dcecb43b88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 039y37YdxdEIDSXmaTprqyQVADOlFdDsCdQ9b5IlJIj8OvcKDOMuwpYf0aYvXXPe/F13inbDT/FKr/LKNIsjTt0pkfm1BzCCi/Go8J2zF6+ljiDk0uUmQwlHg0evm25IsokFu7EDv6waclKIxnMr4Wkik58Ws+hGKdVlNYvtxSZkxt/WWdsGtVKUMYzR3hWusxShRmUSwlu4W68FMeYT0towoMnH3rgwx3u8qw3lOzMkjTEO0AMD+w7pIjK9pY823F7037S6fYmhn3aypotHtmwG7JoldzNPLJwzyZdGYjl6Q7uZ6Ugz7YRRMzav83vqKVGgQig1HtyHN4b1w+YdMqoBmJOp3DheocXmoOaYrvPtVLXz/nq6MpJ31OMqkKbGJmG4naLBrPa1dxhw8ENFs2JKmvPJF67up/7FuDHcS1vtnwjPk9I1JNy8Rn6tu4E0vJKYqpK2mIsLQqbuMR9QHa+41tFrQfgbB0MwDrDP3sYx0g1m5zzLFv1X/U03ce9DRg3TIZN5qUBlW61TpIoweZh2eND9kf8DVZ7g0Mr4Fkq0rapF4n3haWgt1WL6j0wgatgPMbltogUi9yufC+IcxA3Zt4joW97kgioZyUpD1OWl5fu8QtnbAQ8/6yjreG4PSkqxde146RrLHzI6QRQsa+z4Ek14BGqC09pdk6q5qcWJJ/YEoMHPLLT1/fRq8sI1NCvneg2C59do15ICyN70NZIrN78PvSkXmd5Xn3XrBl1AcibxHhoA+5aUjQEZNAIHxtxAcmqKcB/SwOwHWrkBBDmnTav5j7FFJcjheab8skebhuUsYzbSPAtlgQ3O+FATYV3VCtIbe4GsIrSmesLSrkxKN6RBo75N3zwPFxL9eEoWUSMFvkb5CXTWhhqYFoCgreMa8xV6cQkvYj7w+urZUokrUlRtXALRezyDcBGNo8tV//ChQ0TATTbnYL3nmq/25GepfpPzwbT4dUx/vlRYT6rKs+iMqLq1ehYpEm/GUa7D8t77VrBvqY7qmX1O6OaAtUtNNc+2uuht8qlhme/ZrPTjBjex9uq1VKa7xCtJYlg4jA73GwMTQ7AswCEug1KY/l419dajuqdLB6JuTZHNYZeUIwj5udrDmFAL/7NMYDssOAM6vdZbPj4HdjboigFIRVdvkDRIFnIKLE2MBVLXmkcJk1FmuXWT9mWctfGqI9HoKN9pE29VIdIkU64HtX3t2EEGzrV8lDMGFbjYFnl5Sj9EGHlAuRZ3qzYdPpDYD9gZmXe3FGJkLY6NjsZdXNidmZe9jh0XA1bn7iTq8NqDUfV5MDLssKBcekhkjEh67WUxODzZ0uvwRk/8lBFSKW5veZn1hnHANTWCNfY2SjujEQ== 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)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R3Ou4YWjBotOikSI/CZSmd2OSwf/FhWc+s/7pFVJqB9YmNe86emHk96V8EWUcH/ESeaTVO/Z6in5gc3934G9991xCpQxnXufCmbCflQLMBvadDkKXAuBx5tklur99WVrq6py56lvUkaChJkF8xLKNMKzIIxLukssbQa99lJEUhZmBk5MICdtIBWaonApIg/SsNblseP7sPza9WHpH+VnHoImmoulfp2mUnY418XIWiYZWJmp9RK/l/87F2AxxW+tL8BMQOxCQTA2YECx7nHhITPOOVZGUzzEZQQ4VomNOchklcxY+01ZcAzovZ6uIF34uBye30A7OF8iLj9ZAtf2kcGpdVlD3ppU5hS51lOIXt61sF2iA5jOfZhiHH3whMGsD32lqlrHI9WSoht0MsrL6TB2ccnHsQG0sulV885s69jVpvv5KnZQSl95cib8MKZpvBFYwpW+0yeEjOz9VlgrODJ8WYmb0/R5rWRj32Qh+KM9f7yu+3JMqvICQYSBVmziL5XsYNQm++Y2thvXOgadBpkTXulwAlyJd8duxosqr/l7jdkDWzZVjxtOh+lrD0obKl2KNcn1DOe4PVlds1o6oBwVdlDBLj4DwLy7y+5C1u0UMILYr2mrqcLX3eWPn6/JAtE/vtawsJATJoigxzNVbf8pHuC7jMCx6S+qAEB3t0+KCSfEeXnfQ0fIUsEgaEMueBHd2aleFqR3ZU3xxDRNc8mH1Ad0O8X9M99A3BTgLkGymzu19l3H2MYbJbCKy4Dy+DzgU7UZ7wyppZrQBVsumjMn4Erkw7szMp6flAfRlRgKl1BHZvNzpRP1vlQKv6Bes09GCeCQ0N6CcEO1Hl7h0lwR/3o93myWbN4cT4OVPvy9HnYABCF6qMTDqqdMy0ZhIrQAFbDJWYVQVrXSCcn4YnyQ+XNWB6uQSkhKcoKPppi7VXYOEn8y44pAwCE1OXT+IiyRjGvqz8ExYH2NiNAcmpyUqHTQMEqMzpMI9eKwYJiXTPBz8ZdgXBMzlaaIf8r6QrGUnau8c0GdrOYB92MjpXcqHWpuw3FpB/jV0PK3z/VWM+AQCCjoyPzMLa02jm6UYIRMG9FvK8leKOL0kLTV2cHicckXE5YzyWI7Pgc1ielMXqCobjsWaM6+c6nOfK3Ym8qb0dLeY3eAO41L60sNsLTwNaVIQ/3qcLefWz6W4vhwBZblxZksRqPKZ39n4zQPlpGKXZz6+ZcHhPb4JsQ+bYDmExgd/VOUrS9dUF+LD4NsRiGr4ueZJ/EzwUwjEASS502K8sOR9XmQ9vmqqCE2gk5OtDTF7T5WkwNK1LngtSo1eGrGSgqiM9HNX/ySf8cPIgkKNmU0SrgEvAI7xy78evYHr21TvBOD5TR53X2Lwx1DXVAkHaBIdquSPGyIM3DLesY/H6BVNmJaV51ru3bhRSU25hbmo48sJqAptOI0LemVGt6aI8KEGx/Fov1L+MUHfa/FZC6H2OqJ8qm5Rkp1EYyv8KMyuzBy7Eplv+ONVtL8xgf2QeJfLascfw2nLKgLdz58BGllkb/4EY92kY16Esaw078bGO06RE8tPOPxoLXY4d5rmls3w2T5BKG8hdjU5UE8etsTmpwN+Rlyiv2lVXp8aRCZm/gZazV0fUwHuPI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6d115f8-f9c7-42f5-e3bd-08dcecb43b88 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 00:56:41.7593 (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: W4nx857k0645aPqXi/4XQmsuhXV5kDkGNBXMeIpO9p8+7NGTQ4YWNO/mi6ucDMYD35/MuWvkdwnEAqbH8fSGkbNlR7L4UtwK0a0s6Ywn6KRa2Gp9lJT3XJTkB+szLbaX X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7121 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 e6e359c1a2ac4..123a0140a23cf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -815,11 +815,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 7a59121fc323c..27810f6f86302 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2860,39 +2860,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;