From patchwork Wed Feb 12 02:23:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970948 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010037.outbound.protection.outlook.com [52.101.228.37]) (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 2A86113C81B for ; Wed, 12 Feb 2025 02:23:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327005; cv=fail; b=JiwT9z8gaUFzXV1NLwZbmr9fqojgoLAffqW2SbfT6JMRYn4L4Txyns+2LUu4eFWPx/e0VMqyZnbYyWQFfDZpig7zuFwyWidMaOwR5ewpdJh/xTF1Yir6ZXVyzNQlnFmLSNhpNjQc9nQL9rD8e2LJNk+sVE6BzbXwZ8xpAA+tHs0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327005; c=relaxed/simple; bh=DQID7BZyDnTMvcblmrS7s8qlYDF6i8aGZFERAWol2ds=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=pXWqEahlTCReFWxsx2iq3Ui9fI9ZL4ucZKJfgbXKY/R3pl1RiPYho1YiraTWmDS1iyD+bWn9Po8V6pUDEyxdZ6/YF2VEoE6ABtwAuSRe/BSFZfH+/7l9FJDdrywmiVaGT0K+Xi1GYL0xn1HI6jJP3T2qn0RgtL/x1qSyJX93Om0= 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=UDDBrDDy; arc=fail smtp.client-ip=52.101.228.37 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="UDDBrDDy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VbPZjGH1gCsuw3sr4ZUEVkttVKTyNt39qgVBKCiABHQX+lQWWVsPvJQW0wpaFpIgaKHru+JlraeazIrpkj6mVRiepLRYnL/CNKfw/VsOTSUDsXmkJji+3eo3/SoFJNf+cNSrxYI6xJz5XngSIyoN48CcaEGslwS2d6KdHLs8rnRx17jPAd/O+4yw6sSHqrFGIhsZHUaMMJ8c3Z1qzNG5SvQ9mrOKMfBr+PfCkIdyKN/XkPUpWRoc05MHq/aEeDF4e82K7rgnjWkNTTRXTCFRuKPNbOsnHVTNNgniVs+OCPqYo1egq2oIv0tb8lXmY+CsXIU96XA5ywCrEyVCeI9z3Q== 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=UCDlbOUVKWTXbknH5XsewLnBhT9qpOL0rYEe1xCECAY=; b=sdoofvX0YtbjCyGj1qGrAWte46UhjPP4YJDmqYJpCATW3fJ/jVdrzAErg6zdRr11QG1A3DpnojSEV7W1aHh/tvIETUGG2z4NPmQSBPEEj/4PvUxmZk5eVGtyC8cYGKpPfNsfdFnXQ7eevO2NCSmBSB0KLyVv5bBOeR/vjh+lhasNOHiKAbvjz08WoVtFP+1lUQdlmXjdzOL/VTLLtqJln7b6CN6+h/VFSz12glsScznrZmoshxq5fmSX87zi1i40RnHvsMhJjIBNqRSPjJNK+vou5b8vgZ+YEis9iRw64NrRhZsTHhxbhtggMSr3uZFvDQPq4sFV+sR72D0zVIsC/A== 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=UCDlbOUVKWTXbknH5XsewLnBhT9qpOL0rYEe1xCECAY=; b=UDDBrDDygQzjuA8JPovNGp5VvayVGpEwtD5O/iTlIHivStGzdrr+l04DICa1PxxbZKCNq2ax9sA/CGn4XwPp39Xa6AbsY95khzgN0FGiJddMl4X4M+FLIWoKQESndSWhhLFsHyNn8aPyNeKCZR/o0AjsIPVzSB+ORPK6f/cmANc= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:23:21 +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.8422.015; Wed, 12 Feb 2025 02:23:20 +0000 Message-ID: <87wmdvyk87.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 01/12] ASoC: soc-pcm: no need to check dpcm->fe on dpcm_be_connect() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:23:20 +0000 X-ClientProxiedBy: TYAPR01CA0099.jpnprd01.prod.outlook.com (2603:1096:404:2a::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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: afe31c82-cee2-4800-4604-08dd4b0c3804 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: nfhLRLhllPMvl4qJ53mhsqi+30atrZdhUffucKfEIQgpDQu8H2pcg29z8tUW2QV2smq+t0P4kTVYTSMs70o3/krr96C51yf+v7GoxsquuFidwvgWkqCPuupMq4qIMxToHG+uFKnlA7UIgRB1NRiK3kkLwK1bDOxjgu3wcqHFqzIvLxZY+dRPw2lSxW0tqqBHLOAq+9rSYswYFANRQcy84b7DoEQvjjdlZCgxBhiDageYbiC0fopyYtEVR9YFPjRL3izHJPmn6ubHN/VZu+Tk73LGiZZ3MJS93xmhI5vmiPcktAjDaBptfgTvQESGNAZCOPKdhY0MQ8e8FC1i1y8C5z8WvkiKkIhckaFEjMHOxCQU+Ig7cwlIaRmpkvyOGVz7s/GZCSDnVgHixYTJCjhOGGjrpFO43eexSAq3IPBzSOWAeMARqO4aAk7KEzStiWZ0GWOKy/act4S6lELa/upj33g2sVEmNeB+uXunTKuXHYl5+cT8ecHpgQFgmDqTM3oZIyNDaObGLNdMc7xi8Wb3BcfUjNEWv1xHGxCpkt7bCEu7AtCsG2oWKceudy1YF2ShipTfPJMpCZVv41QFYIAsDINVKyJYxsNc0wgu+6pKE4k/zyxJQ7LpSRgcMfpP3vgoUpXeInVdNCTa50coi6S+JPs3LU6UMbOjuFNCofqRYv9xcLPpnaciWo9OjmYSoJbdVCbxKeZzEDqAyUbe7fvat9c3893hgqJUp945a1aM9aWyR5odj4BH421XK/kHbfy9czPoHYmfIMhXlf0a50c/1hZrQlmfZDI9E7KB0jmx97sJeGj+CSsgSzOBwp1tB20qt60V3JHbQFZM93mMNYR/AC3r0azi1cIZDEjo8Q7F9q4UrSIzpl1TbikOsXvFKuM+JDetsVZkWDy5KYLg5loNR7RRJ2BSrCtCr83wM5Dut8rjUXWbztw+zGubaBoLBMQUrUetLWrYdrfl1LROFTFMSbl9Q3F8yjYFIYdNlF4hE5KCydV6yi7aI6A+AulLIrSgI0O/Jc73JN2NCB1aAzYRofXC02eyXKlTfbk7R4zcnJl+XTYAJiWAsdnivabhIhsCSieGSE5MpXdZcVI5dC+08nsGxmyuP6jsJKdH8RMO+FpoqBBxyN1Y1D60AlU2CV4+4QxYd5zWeEDz73nJVWixqOSljvOp8QJEjiVrBFcG8Md4hFBnpStcDaoZ7xHho6XsyzW9ohRWJOOmdngSW2tSiFv87DzNRdJpiPEVD6YxKMMQ200Trv3XUbOL/fpfqZ5p7kxj50H4hsuQd2+shUVGRH789PnYgKJ0F5c5QH0lUq6um6NAFqg6FEyh59AMIR6Xf4nE6Ggmbe14ut3qzAuMsA8zcmoEOHJotMV5uCbdNwLW2PZ91ib8JbXtEvyyyOwd3Zk20Go9tMhHxz4ZWGkvAnYuf5eXbrGNIorPAOGeeNZ8woAYdpX3y0yxgnhID2Yb 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: uHDOQoRwBtFO5xd7rJGj8DpMLz2fQ+Nu1IQ1obXOhFMBJM19SGgpKSIb0JKacqXIYPIGVFWxD6g/xH1l21Eoi4/Mh56BHXJ3J7zQoF1iLLFtJRJRRNxVh43vzt68zL00PskTMwVbTaftlNVYmbQTY6CUzf6xGOipmSdvBQhFcJGyOw4w+87GeR2r2DF+YKMC+mio8dBEywxHxVy1C6o+551dyQFl6/ntgqRetsTABAoEh/CScNdo9MHV1+OOMAnX23ke/VF+i/Wq+965QGpn2I+fSajnac8QRWrZBXmtYR/E7nZqFVJeb9bdE2yvDNE9t9ignkMyZbBBzAS5TAHsVKFTO5xKeVLtWi8wzBTOwQ3aNnhcOQf0petOM7QBsQMZwLO1stQiDKTDBvtfPab1pc3/0HAhrC0GaoKx4Gl1wqalnNbdaPwD2zKH5QSvicYt7/cXCFuOlKxBFjt20aEUp42QANpGt2ie3a2Ll+ZgQU4ZsAyGicedXko/YFQJhsBmaG7lyYzWuVJkQPDVrcTyFDqwdnOWz5W0iWxXZ7yQ/+6LiEtH1WvW/hN2Z9CkZtwp6oGQjYgJVd+0n9SubvpPljc5gitsZn5ZdY9BkW1nY5lUoLY5sLe0T3+XFjddswjY3viGDBTRRF8488/+YwCylazJ34hY4sQZRakZFsWDZ1rlGtb/NVSIGSmTQlLSiAv2jaQbKXU+acTJFUqaiLUW6gqREL3UKXan07DE6GOMy/0mPe66uyWfbP+KFfGUBX0DUQI/F+nt7FtOVOrcXKbaLsAxTNyn0QsmBBFeseYvvesHa6DxbUFklx/zCybUF1Y4h4ujFVRdRaUbk0YjFU8Cp9x+BvAojGCa+05FPPgHW5q7I7V/eBdZ3E0QFOFhjbgIBgIyFc+dKXO0mMZeodm6cVO9JUsQHrp336VC7Op7c9PPNn5T/ooToieNlutv2OWutxQZwMzjMSqJY1orh5j12CIM6ZkzXHfYQ5wKwLGX0GUm64aiQb6LojZnfeFxlnHCWiz5d0vCtLixj5eplXt7u9bZgCdK4CEeT09/mf5OqC6VykLXiehnMIIdD+D8qkPKXsAP3a0YWSmQs5bLWsTw17i7k8gKNe/VLKqGk0bJJhkQh6/9N+YDp9xpKTXKWkGtyksQw4FU8sgedfvFHCx9Sf0QKbu54nAc5lB9fj77U8lA3Pu+cczH6NMh8xQSNg+8fKzCqluoscbnLzcgAi4r/cqeHNvkpcPxBnpI3gkPFpveNHQ83pC4u2yG4HrFaDF54sVQqiW/tIat05FGheZLxmh2Q9fKERUr0RQxqNOeg7jPZmluLJMSodXnDeAyWc024FZDcBb4WHXx9yzTQIC4qYPorZK3oP1quGcS+zS7oR3Jp1vzdqZM28WMPV07X+muw0mtMrrr1p59a4SkS1g2Oq4x8vIg/pRecqKeBIDp/WnKVyYGAGLsbXfjKRz81b8qvoK13lfGJLW2xNgm2nBEXnv98wSbyX8FlWOsLfneKVeLuLLT1y/WCW4FZHEIqkS+GceXCxKlNFexh8tsb7dCJbOkWZDL0NTgfjk5wPSAFfazb6QNOj2w+rxK3IM7WFjev6XKAeY6kGcoutNtKkuGygqA6Fm/3xNnKlD+Dv5XL7c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: afe31c82-cee2-4800-4604-08dd4b0c3804 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:23:20.8999 (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: l2BGcznuJothUcCn6Cks/hCf7ah0VaDsHdRoy6itahLQwWoTjf9y5lXvsKehck2KGor9uK9uXN6AQf14vjv/e1TbxSl37tWXNMth/Nb2Ru03caSXzg8HA5VW17tz4seg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 All dpcm from for_each_dpcm_be(fe, ...) loop has same fe (that is the reason to connected to this list). We don't need to check (dpcm->fe == fe) in this loop. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index ebe99d369ca9e..0d556d3505602 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1304,10 +1304,9 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, snd_soc_dpcm_mutex_assert_held(fe); /* only add new dpcms */ - for_each_dpcm_be(fe, stream, dpcm) { - if (dpcm->be == be && dpcm->fe == fe) + for_each_dpcm_be(fe, stream, dpcm) + if (dpcm->be == be) return 0; - } fe_substream = snd_soc_dpcm_get_substream(fe, stream); be_substream = snd_soc_dpcm_get_substream(be, stream); From patchwork Wed Feb 12 02:23:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970949 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011039.outbound.protection.outlook.com [40.107.74.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 B11E518D65E for ; Wed, 12 Feb 2025 02:23:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.39 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327037; cv=fail; b=NaMmXIRjSAn9hBzx4pz8V8BPDl3tVHXqlc9gsv04yqNB0EQmyIyw/74Zpc47fHkgHAHU8TDD7CeIfdAjp8YnmcGNV4X/xzBZ4+39Uks0ncenhcNO+uIjtGsTdTqVlHun0smWgQ0hLm2y7XaO85bI5yeWyfuEFUQTq01C8kjOCGU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327037; c=relaxed/simple; bh=dRZs0azUVxOQzndpgmglintx10IUHFnZIPHIFTO3R4E=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=sM+Nna3cG/1zUepVEwZSGu7qVcm4VGMiWmfv1WbDGF9IBaqhsuLewtzjjlG3XEj59+cjtZUqpApJ4C55/Bu55nDC8BjLV1tZF7GS8j/cllmqeFF46xr56uyHJlOogA6M361SqADm5jdgoI3ajkmBMh02wtpz8MkXr1+8r7iMEag= 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=bqC47f3T; arc=fail smtp.client-ip=40.107.74.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="bqC47f3T" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HCDN5/oNKPaHdmKVlE4g2YmDvNetF7c+X59lrM+ZvXf5QcRU4izo+j/+y4r78iEQGwg42peGLT8MF8GBxYy/AVa8jbMCUCq2Uqhp8roqmiTV7zAZMybe03d7VWcvqiAJGVF5DjAWGQaCX6c7dTiw0wa83h23xoMxoeiiRulMFH5iZqfELTupSkiDku5yApXz+TUqFvgPLlAL4ci53wBh94RMPA1jvckGwQjAH0NuzoeOWgLZI9+5S2p6VUWdTXStJHrCzGwysHdlJOtWD3lFfsDwsMFFU4TSg33iayIIiwaOklaR/xERCSTYkdsNCcImoOCqRnSo9bI72XkWLohdyg== 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=VJQ+nom6oovn7JIoXv58gg9WGN12dqsZGRPRA1CmIpA=; b=L7v8WOOfi112PC4Af0iy4iIbLXkn0XdL1BRLBCKsB4R2+QOuu8UQiE0Vf1I27Yb51dhwABWJnQIFM2jJ63r82MIgJCZBAs2umILcXmEWsl+bx2VLo4KV37izmrnaiva0yTWxLAKCYJgbJM+TLx6VcY3gN6ZZBFz5O/ZPZYL4kGMYjpymz1u2CGGrZtjWTo27rEL9UaqP8472Hb1U0bfejNkh8n1P/ReaxU/Wvpf5jVfYnUg+M54zf3O02esYO3eGkyT1+Pt559oR/pS/LKFHEJhG9LEqN5IrokOJcTGfz/tn4PLT1kDoWA7Ku5pxmVGqBvPbZHBnMJKy7T3C/ZATAg== 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=VJQ+nom6oovn7JIoXv58gg9WGN12dqsZGRPRA1CmIpA=; b=bqC47f3TRbu5nqF6aKdMKjWmfufjIjx4nXQM1TGno2yfw0lrPNwwMa/sUPjIOBo1p2AYh57MUqVfGrrtnVOYuOMqeHkvCI6VRzUZ04V/1bbakZzvOsOHfKfQZf5F0/jMMnlLNp1SOBrCkfdPCSNL5NFoBve70kOmOySH9wsf0hY= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:23:52 +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.8422.015; Wed, 12 Feb 2025 02:23:52 +0000 Message-ID: <87v7tfyk7b.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 02/12] ASoC: soc-core: makes snd_soc_set_dmi_name() local User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:23:52 +0000 X-ClientProxiedBy: TY2PR04CA0019.apcprd04.prod.outlook.com (2603:1096:404:f6::31) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: e9127605-f5e6-4a42-9281-08dd4b0c4ad9 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: 9JMghnYFM6jZeQNNtrmWwo7kxmAYSCDXaUTi3Mblar7va6HLjXOQg8XtaEMyorrnCivRGw34ke8xpSDAh18L0pw5/cweRCN9U/RmFPOvMphLUDKcf2N0vKoeWBIEOZZbgIly3qJE/icfDzZZrT5rUV7y4bWd4BpQRjjgSibwIYLveMHB7jqm0Llw19aHY46dIt7kMLOWZzJ12oleqoFs++Lmlty/X9uLnRb4DM9d/y36tNUGlaZn6uAeVh7C6bKmv1Z6dQWu5oyPfJih1Vn9BsvxqvPg6u5KfmVldFRhA4RB+bmgz/hFZa/yt65R/9a7+Byrb6Rl3UwHSgOt5YzJwhD8+fPkXBihu+qPrBNWMc0bwMaA1g6NGbC9qlFvB+neGDqHGcspIiq6DNg671WIv5bYgNJrZAy24Zo2jtOL38JbXXzyPcZRcA9DxX0d4NjM+Lux3JeddxlvrWv6e89QNPUUN/QPKEC56bc1eKvv3Rh3xDN3y5H0IilEBsvSO+ob119WXMxtZuJESqsaFPkUbS7ym8Ol65fHRgTXNecGY9mCYg1ku4pDz4tKxFmsyxTH5ump888S5E/LRekosF2UTZEDYVOAQLFha97Q2c6n001w3u5pb691xe1wu+E2nAcHpeoG+/BH1VEt/G2g+Cx76QtbV1C7u4dv8ov1YESqPGhE7bPDhOprOTmf3gfEhclHOCtpEYtx+1wio1zAxATO0m97vLfZ6TaCWCp8mY5D/SBKGg9UiX9eFXBeycS63JC6KlcTFF/9IoXqPeIM6a9hyptx+sALZNZkpYUvBOJQPKnp2r8P7M7Q4/lz3NFE2nOJwb38kluXRufIGO8vltMaHEVRZUx0Q+oo/Zeio06K+PIa8DllRps6Zqq5Va2pwBvh3N/mLZC9mlAvhFa6CwM/YfegbMc1DV28rC6jRcncMoueSN/Mgh6St/hMOUGEZ6lhEtYyavBS/56T/8ASnpj4HzixCjsUncp6yVm9vbytuxI2k/mrtDymv0hThbl7SsyPY6PgF3v0MJX3vx8V2XmU97H8FPZdoKjCld5q0XOg4V/naFTIM4Xd6FeAwIo9i7h0zhisTnxSCUk59hjHEmGQ2+3Fnow2O+iqVUVuQUKXiyqCAl5+fvx6HvaCHXkln2TgQrC8cVZkrBVhFn36vRt1rNOlghrCO/D5MfP4UmGT1HhJRoXbQ8DI+MrbdaS+G94j98PaTkr9LVByviOOfdIdVi7tzdG2bTUaVx96IbxjUko8uuoM5Hqqr669t/47CN2sJSPS/hIsRnWnxOcvlb0AheNZLd6LYKlY/fZW72HTguOJZ3Z+XWjRpqtQ2ungmrVnzvCkfE24Bz6ruHhlRlyYw0cbezzkNtRtbnpllPKjkxuYdIga1vOAw5oElWRzOYKBcNSAk8X9+loxNyI6RTqdK4Ylz0Chl1UzNzeDcioUG57gwcwcODxah/0bdD2YzpvP 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: EX/651x50A9MHfN2NuYYcJALFSs5dxe9GPCLzpbaHmSWCqAY8nIbXCpThkDr2a4EcxnFzLmAI1TPaPsobf2pt2ubQZ+CAd9cQqcql3A7HrhsqSQyQWTwSogny/MsqG5QDiks+/870UanjLsJZ02WJcIuK+vC4npbVyUfSxd+ZFXBX070QTQv/PAyMEglHSY+g+QmyFW9UJy+tAqgljXf3/jd7oz7QOjqcpQ70aKh3KedUpKf6uRKASAU1/MiZLXPiLoL0YYcna3jrU9XISGDckehWV/QHPl05fuXxKEjbBXPZADxdJlLMkY4/JLNzuC/kuoqOcbk2ERkNXZA2UeqCS7IXd3RK/Wa/Z/Kiyo3AVdUm1+6vbGjfi0VVDcxgerUslhP/lq1p3AVWk9a2MMi1QmQUZ2RoDw0BG6Bl8kyGDLHGQ3V4F7+LLWF5q/LXWsODlrnHBYxhhwTwVwTvVu8P60o3Mntp25MHIHswpWB7KKxDUhKPEeytZNs1pjTIc83jSaFHEKuyc+3CzJPaxD3Hi12a4gqtL230x9v/h210R16FwciNcA7xRTRH6MtUXX7e5onzzRp7aq0w2J085UiYnkwX15aoLm4Lx1XBuHoZYAky+SBmWWlEDJKbxWQy/YJxOW714K5NWbmr93wkxZTbmKDlb5dgBq3aStdp9cG+HJmUTfoVx6GKyEGvTeVcJtH1TsqKl4Pl7PBYe1Ovm4IGjxPf/FfN1EPeqXgIhpErhcAwyOt0IfrhQ9YW3Z+yL/xnkAbS9E8dXrsEhuQEdEjZpb4Vl8N2GmGO7byotihxwnJk0t0zf+lQE97sab6KjXI2pb1FhBTTT07hkzcACmOHpwpQRKngAtaghOctlvsFWYhYYTsrJ0WfiCfX0VoIv1k+pNOgq0qanoAV2+S5gpzw87e2//R7Hn2r3LmHEbLvMu05cTBN1jaN6PKBbQDs6bNvQGUJXB0YarIIcLomXwoe6m+6DO/oGPsy4c7Oq2qyJTmakWnfQFEvnsmCcHBVMJYZDNr68+dUZJQssv5DwNIrRZJJ99Vj2+Itek+WSC0JjqtlIYUuC5pPmmNv6RnjstZ1TbqY/yVZzMiXZ5+oOGze20sOrHfILZ2S55EVCo6oNE/j5ZY5mLOLunBwvK0R5pdThKdt6NDCL4H5Ezz3cwZj2n9/2mYTfwzSzOZOVjWuurjpeQ7EaZsi/yLci+FFkrf5g0AIBBD+/5BF2Y/nvl7r5meCizectISn0Cmlx8mNp4L9gSnd51uvDfheyFg55ULHrhhNTBebFo1mDXSKpJMeiec/NAnfslxgXqJ3uoNyw0iCeUcG2E5IbZxB2QQNsqZvmyZgn/hGR2uUEyBqow1Hpp+HydY9XFZMblkeKYEBI7BabJM8Jh6RMG1m7uw1Wxrvs3dmGeiTA6wUFIMXkUJGSVyhEdy68IZ/Kdsl87EEXKGXtjirnFLCaON5ZDEi8qSDsyrzNfQRoqvhq92aN5PPqRQCZK+46Pk+gtNtB3KNdW5XyLtL2/nm0cyMBQLJYjSX0nI/eW7+7q+kN39UC8DlHmLURR0ZhI/GtG86NoQbRshC8tgZqkq+eY0+RltNiZJZ5mCuw3DOQFGyJJZdZH5iKDkOofuOro+tLm1Lbq3qGM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9127605-f5e6-4a42-9281-08dd4b0c4ad9 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:23:52.4885 (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: XjOMHP1YodlGO29qUg6lC9kXffqjr+hZhuLlGnRW46s9FPZgkWMgyfzwqqcWTbNglZABIfLPgnJuGdTNaNeDctJbeaWNsNDYqwDZSglF7Bd8RkCVAr5d6q+C1FSFpO7/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 soc-core.c only calls snd_soc_set_dmi_name(), so we don't need to have EXPORT_SYMBOL_GPL() for it. Let's makes it local function. No one uses *flavour parameter, let's remove it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 10 ---------- sound/soc/soc-core.c | 15 +++++++-------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 16e4e488521c0..62c90ef40f1a5 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -522,16 +522,6 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, unsigned int dai_fmt); -#ifdef CONFIG_DMI -int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour); -#else -static inline int snd_soc_set_dmi_name(struct snd_soc_card *card, - const char *flavour) -{ - return 0; -} -#endif - /* Utility functions to get clock rates from various things */ int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); int snd_soc_params_to_frame_size(const struct snd_pcm_hw_params *params); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 26b34b6885083..ae7b3e39d5ffb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1887,7 +1887,6 @@ static void append_dmi_string(struct snd_soc_card *card, const char *str) /** * snd_soc_set_dmi_name() - Register DMI names to card * @card: The card to register DMI names - * @flavour: The flavour "differentiator" for the card amongst its peers. * * An Intel machine driver may be used by many different devices but are * difficult for userspace to differentiate, since machine drivers usually @@ -1915,7 +1914,7 @@ static void append_dmi_string(struct snd_soc_card *card, const char *str) * * Returns 0 on success, otherwise a negative error code. */ -int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) +static int snd_soc_set_dmi_name(struct snd_soc_card *card) { const char *vendor, *product, *board; @@ -1959,16 +1958,16 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) return 0; } - /* Add flavour to dmi long name */ - if (flavour) - append_dmi_string(card, flavour); - /* set the card long name */ card->long_name = card->dmi_longname; return 0; } -EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name); +#else +static inline int snd_soc_set_dmi_name(struct snd_soc_card *card) +{ + return 0; +} #endif /* CONFIG_DMI */ static void soc_check_tplg_fes(struct snd_soc_card *card) @@ -2256,7 +2255,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card) goto probe_end; /* try to set some sane longname if DMI is available */ - snd_soc_set_dmi_name(card, NULL); + snd_soc_set_dmi_name(card); soc_setup_card_name(card, card->snd_card->shortname, card->name, NULL); From patchwork Wed Feb 12 02:24:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970950 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011019.outbound.protection.outlook.com [40.107.74.19]) (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 ADD8D18D65E for ; Wed, 12 Feb 2025 02:24:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327051; cv=fail; b=CysbNKEpObDZyjSLOvb5WdbeV32xN1V2BWN7gqH9TV+MECcF4ILSlLcKnrbGx6csGWVUEYPvjV5imdHI7zmeQce8n44efYkRokic1XE1SQYh/Bcs19hkfT+IyURU7XWZ+DF8uJDpYxizZbQTBbz61VMj0gdMZyUcxgYmzbz+lKc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327051; c=relaxed/simple; bh=ODo3l85NkBPNhp25qKegHi7g54DZaxDvWwbLL4YXDFE=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Mdv0XqyWDFmugbahzODEvO7ihw+p91Y8rRMZRJdsP4JRk+0Vzle4M/oUm7MQIj5iT9gDnzrBrp84UQ96g6QBvVkrvgLQzKvp3HF1KIXfyQiIj7lpSvwnHEG87RNFQL4dqWeCbGtUe3LW4rBjx46QNvAyBZGz8smaFE5ME8R+EEs= 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=lcEhJ8vq; arc=fail smtp.client-ip=40.107.74.19 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="lcEhJ8vq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ruuyi8GN8NMNHfHpVsszatiSxw4Y07brI3UlBrr3TSStwD6xneUIuGV9gSf/3U9Dv+euo6iH8XOpPqvdlJUAnNi88+AxrHynfMom4An7m+2jf5bfw9HyQJtIvgmOJJKGQxaPngHUjD1oGMakYQxhs/UPkqSKHgHBofvCB4GCOK9lFWTW0YXVTXjsmyulypd4O2lBSHZqPOb+aRz1HtdA4zHMEl9FMmAnweHrlvYF6ytcyW0ZnqzQiCqJv950QBYXyxEDBbU5+36gvyQ99u65nWwTCDdIUVYNV/OlTDqidQfntN0+J838Yhz6qj8Wq+1bL8Do8EtcpiN7W9I2A8cWiA== 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=FKYDr9b42Da7zKUqEwYXkrx4j10KhFCxpPBYrz8pcXI=; b=JuniEom2tZWLPK8nU6bZguDMzQ8OebcchEY1qEXXWWAVUA6+tIniZ4LdWwMNCd9UpteSK/GqbIGcKuKwOTv6plkigrdOuQkC//qbswzNkBO3TjZuENNueaxnfLTzk7EVu5IeijGXZqV0BiZlmVl3Iw8Ptz2z3WB+cES1AXDxbvHPJlLKcH5pcRfSDHYrLB8O/bII+b8xZLx/Mfu9ssjEavjxVj2lVnlLhUVyjrVW/7x1h3AoibrMSAF5wIjB0nBU3wtk/Vg0C1Xo1CaSpRbOusoY9qnC0yaiKtz0dy5/OqJvqIh4cCRUVCmsiFEgvzak7enrXVggEKrLwPbDJE66Qg== 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=FKYDr9b42Da7zKUqEwYXkrx4j10KhFCxpPBYrz8pcXI=; b=lcEhJ8vqzvaQu7urOE8bHcf1N56cD96OLN12h+gG/y6EwhzfJrXIPTf/MQn9FlYISKxSR0GUAYPR/i9QZ7s53vEeMtkFRmdNtk3NvSUoDwqKNjF/ArfVI4ybYR5UNgcUSt7Rk/SAE99GDCtZ+u4JpEuxOIF8FqTeM7uY/dhc+hY= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:24:06 +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.8422.015; Wed, 12 Feb 2025 02:24:06 +0000 Message-ID: <87tt8zyk6x.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 03/12] ASoC: soc-ops: makes snd_soc_read_signed() void User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:24:06 +0000 X-ClientProxiedBy: TYCP286CA0326.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3b7::10) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: ad75b9f6-5658-40a5-3177-08dd4b0c5364 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: wC1CQpKFcx6w9Yfw2zjlYVzywINePuOvZ2ho5vvbegi1AJms1gEjTzmfVTQ8QkH0osP9r+1sYXRvV5hdwJlMpqB5xCjcefSWXy27hjibHLo/BCNia3ddf5sx4hCW9DMigrF8d1eC3yvTqxOiluTuxk/Vvt+fVTkMw2XjUkfOUCiaXuxCfNTjEwJjR1mh0/TwVLroQctZIaHWhSBc/GGFjH85NlczRcy8GPPFgyx19IOmh5hIdiJQ9/Pg4eQYQHtYLH+jVCfljHQaH/eAUR0z9S2+KR9ztGbsX+Jpn3xwqWtaGaOORl48euMD8Wqd+0szojVFUaaSlEkqgb7UsXyHbnfCkxFhnMwUs+xLn6bklZ6zGYRqtLSh2o8XHTRcqssdxXRidmHCqVDC8ErDAII3XqjzbPMoNU4X/QqSlmrCLYsWlLTK5pnY7muluL74eabX4xD5iEBJLA+JJ7dC3CfAHdOq7zPyIYuH9Ad3uOW1utnbcgQLFrHCRdp5NfkC+1GReoRfIXO483QgNrbNL+fT8OCqWrRGQ+nsscOTYLWN4WYXO4oiPiYLOU5xx54L1psj6ZwyowSUtMMhIYgIqmx8O4SkXTJJ/CuUXUWynpoHSo299jt7V9rP83G6TJiqWk6Eo3pXFgsrzUoL14gu01S+2r4meKVUkcIfOYkVaeBMxm9jOQyQSfCmDHkdSK1/0BJMNBLFo7pjevczfXNvHEhVVvjl5bh5sQYtkjMTSBZ9HDePtSW7P9au1LKumtVS5NSTAt1vETxWDomlycx4n67ctjk88aCF30uxW1yY7rH7mo5MNgopeAmEFuuMVJ02ZV6LEQIs4fXiAXj/FH9jU44JXFEmH5QK9NqRQVG44x7q5pMrd9SvXQRdo8Zvf2lK7Zq8/XQl2Ei87Ulwl1WK83LqsX+owAwSiys8Axk6jNgUOTjHKhjsOJ5B1bGDk1XLO3Mb2crmWt4doTxuImqklHt08LsO9Kzew69Iyfum+IPRuzr9Hgk3MSCvHJfCOl7lET2tHQ/M5Ce1OFwzJQA7gK6neApbtsFLFYD6VKCa5jUeOTNvPbMov3lbV8Mcidnbfgk2pQGqUufl4XKvZzv5tEjwWVYTLl2nF107n5WBRSO6a4/px0hVTjDQ2Q/BIi/MVwpgstMgAYvJnxfv/jDHX3eTHgPqwCFFRgZcctpst2ZHjEzexcL/EUHLngpJVPSKJkt56LZpbaRBgTdvflOdX6T4izzq1NdZAreGY4l1BpsDONUq1ul0Yj46m2tO1IvL6/9PvuU39IQR7kTmyC87BunjBv4SihrwNYVpjpSOSgsTLknCS2lTvTcZVLDOI2Me3xR4CKXUB6XQlo6hzALiS2jm2XeHsXfQe1OBjQ/sEh/FmsxD98dT43bBEKMU0IHRJZ7/zmh8yW7CQKZtmolHksNRqbWCV3V35M0UbZHoItvqhP8Cct4RYb/SwSB1CzYrgJi6 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: 0aGk1Ve5G9oCJUNHdJi2s/JDXUIYPNiwUTRoMeEe5HzCnSVVDUBKk0G2dE90qPbLWKj1Y023DnA6Edbjl2dQ6dnJyUN3aiWZhOPTodkZp62Jel9FTJabJg+accxLfp5ZI1VSO/JzqNPIyEqZubyDUwUdLdVC+X7/GFiJRuQBDaceD1lK36CuzF8AO/O0k4andqNsuXIAVBplkL9mkDAGyH7zE1qpOQ0JNpKN7WI102sIYaI2BvZbC/r/ks4qUbymf+Z6Hp6Tob2TeZwzfsQToqjWRBmAVixGb/r95ITyvKnwmDGDjR5I3mUkgIuW+2Se9GagL161sTMZ2ApFQevcr9Z/qDmh1F2XkpPYe5MwHyCXk+8FPAanCT/tFG8wrGjdXMckrTzgk1Z3aT3J/yZ2jU2R6HOlvYX6wsn7bF1ZFDRylwauxJz/Es29MwB/ZeU25+dzZMucE4TkjjX3B13Gh71lkvP5Ka2/z40cSFjjxtO10eH2BlOdmBn3/vFpcnf4q9RNLYEzxMllG9IAbTLetsog7+5FRrEJaOl7bUTg1dDGeimbc6wcp4w5bqokhBWjK9Uw5g914hDws9KLIjLtR0I/HlF/zRODoxdpaFEQYsWB6poICrIrkwJttbDb5AjrRz+ioAzzVJC6fx8ZaRIJMJGNus65OtLKeRsftu/J6EsA9CndNDP6rNXnSBdixgCMtje5SYjhTAI3iO4Z8VAJAv8KKhiTW/Z0QGajj0ai4QTKXA+HRE8T+WOvnP3j6oUo5YzJ5HdrjyyQSRl2WMVf3EF0xUdZwhoFPjS+Il+vc1c71IGh7Iuk0Uul7qQ8ttTP+PRhS8YfLH903EoKP7uG0LoskHS4J/doX2aFl//+tnMeuR92/YW/oBKWvZ9il1Q1vpR/rW8xfiz+aEzWFHITg01B/zHPGDQ7I8aNW46l4ZwcNtsvPWDhjcIf1KKDcaAnOVHt1TKfeCILNctp1Rdb/OWvVsiQHoR6LIkXp4LldYm39fvrdTvS8bgtBdsin6S/HstAPLyygBSTIUrI4tq6LBXJD/4syCuxx/zMtBFwMC0H9+sAd8fPJyeyQa+LnrmcDUI+BxZGJUYkGAh8pjdeAWJQGP8haIbkbDgR9J50holhcNdectI5N3NjkMTPiGZqeeMY2pzY/4qAFDQj3hvVUYwOD3qDEuj865RCq9qLJgVdGMiBb6x95SlqAqsk0YgeaMLcYFvIWrkTor5v2wokK5v/+GReM51+W1CikAI0x6IXPY1Gc9kO9cnvi8q3EanmDiElBybp9QbuEGo5OIJG4/WOF7SVHRH/NL1AH/P0RURA7j4e2goRrbKg9iFnOb9gr/+FYrZh0ikp4AAOpDlJGNiA2rV5/D0lPeITcw73BDZgDPhzA8pwfAPIe4Mzgga19+2DVCW/oy6HlgMFqEX9WiXBt/AuyVOAllZjOZSKxWZtu3G4/UO1LBJgyDqa/9tPanCvhewWDU5JFLlhQt7fTIcvupNGElTA/WMVMCLxDmxw1qoe4ZjhZvvJgqGvxvjpaLwAmpULesYhd42JbDoWMupLKeCPGELAyai9ynyMPpFSbLGFE+6xca67JSMMughXvM7bZBB4zyyh9Jd1MjthFpSlxRTRok+QFH8zImWZw+E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad75b9f6-5658-40a5-3177-08dd4b0c5364 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:24:06.8420 (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: hD87NyuozwfsZ27BwKS2LCGS9YstDpGGU/gNiWwgRjKhQCXdfNq7o9NN+Dr4LhrXoIm9Hkiq+bolVrh7NQVp1Y8Mj4f3GX1ozRJAmEB63yxWvVj91lz23sUaSF6E6NLB X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 snd_soc_read_signed() never return error. Let's makes it void. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-ops.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index c6601ef16f843..bb1fbffeef9f8 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -122,10 +122,8 @@ EXPORT_SYMBOL_GPL(snd_soc_put_enum_double); * This functions reads a codec register. The register value is shifted right * by 'shift' bits and masked with the given 'mask'. Afterwards it translates * the given registervalue into a signed integer if sign_bit is non-zero. - * - * Returns 0 on sucess, otherwise an error value */ -static int snd_soc_read_signed(struct snd_soc_component *component, +static void snd_soc_read_signed(struct snd_soc_component *component, unsigned int reg, unsigned int mask, unsigned int shift, unsigned int sign_bit, int *signed_val) { @@ -137,13 +135,13 @@ static int snd_soc_read_signed(struct snd_soc_component *component, if (!sign_bit) { *signed_val = val; - return 0; + return; } /* non-negative number */ if (!(val & BIT(sign_bit))) { *signed_val = val; - return 0; + return; } ret = val; @@ -157,8 +155,6 @@ static int snd_soc_read_signed(struct snd_soc_component *component, ret |= ~((int)(BIT(sign_bit) - 1)); *signed_val = ret; - - return 0; } /** @@ -266,14 +262,11 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, unsigned int mask = (1ULL << fls(max)) - 1; unsigned int invert = mc->invert; int val; - int ret; if (sign_bit) mask = BIT(sign_bit + 1) - 1; - ret = snd_soc_read_signed(component, reg, mask, shift, sign_bit, &val); - if (ret) - return ret; + snd_soc_read_signed(component, reg, mask, shift, sign_bit, &val); ucontrol->value.integer.value[0] = val - min; if (invert) @@ -282,13 +275,9 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { if (reg == reg2) - ret = snd_soc_read_signed(component, reg, mask, rshift, - sign_bit, &val); + snd_soc_read_signed(component, reg, mask, rshift, sign_bit, &val); else - ret = snd_soc_read_signed(component, reg2, mask, shift, - sign_bit, &val); - if (ret) - return ret; + snd_soc_read_signed(component, reg2, mask, shift, sign_bit, &val); ucontrol->value.integer.value[1] = val - min; if (invert) From patchwork Wed Feb 12 02:24:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970951 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011053.outbound.protection.outlook.com [40.107.74.53]) (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 6703818D65E for ; Wed, 12 Feb 2025 02:24:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327061; cv=fail; b=uaNus5OV4Y/5rly3TPeeQe2ptC+8A00iJeoWKUwOQSweCFlUbmihazOp/T+BvwEWkjg6FuYtULFplAZP4Qy5ud0hY2zBFHYqzV7nyL6B61S/YM8+GtqRMWl2v7Vdabg2FLYqBeyDJErXfdgL7r5z7w6fBKyzr1wxnVXh7TEDgWM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327061; c=relaxed/simple; bh=4WEd2a/U5jkSaY1Cy8/9vZ/9k/KPdJj9C6DK3eTHWyo=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=WL1/ynw3vi9rMMMiOKbTqjgkQn9QFip/FwvlUXCcEnjQPKJ1atGLudn3QwkUmgEkJKT/l3S0kiYGeUJR8NoMuShxGnTlyvaEc4nzxgI6CHGWpEmL9d3WCWZG/rMxqe/wGi3YDEQmTI0ASTYtr0mLGp8qaIj/YkBYBwb1RIY6k+k= 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=Zjj97W6c; arc=fail smtp.client-ip=40.107.74.53 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="Zjj97W6c" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tycxbiKM8DUCWgKJJh9uSq5IH3Ujj+Gs+UgaDIYltK4SDVQ2iRFc4f3sIU4KE5dkunS5NqLjkOb7oefE/irPDS5q7K8jTYmS5Yx7olSn5X79o1B1y/c1ZrmnnOI0iGCtlrQHLdwgJmhIp9TgT0UvlXl4a9H6goVilbFcq/GSf3h5K++SeclsPGpEvBlAbrjpGwaov0YlsHHd6DCWROWSUaJpUd3Um5yFkz6qHXm2qbTNZmJJB316n5KML/UIGhqL+bWg7j9Z1bbmQ2ph2V2+ORXpF2inFfaVvN+b6a8dVlqUeB4U0n1lZgLSx/ivdSz4xoswTgxvdYLlWHkSA3V3qg== 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=w+/y9cXmsUz3VIQGT9hx4pO+/XcNDsEXXs9imZXN+Dc=; b=gc/MlYhvx1z+GJL5lq51U86zaSOCzdOtBLQ06bGvallQNqPVXAtIVo+0cjXEKAEJsVnw2c+O0hR2rlWnTU03N1qYoWauCAkq2IVGW6+OJPS54920rDvS4tPC7lfGyggG84o3Kz2gCVSSvhACNthwM1iTFO+SPK5mCf4YXQn2L7841hQZgMAXxGfIfkknR6EVbqbezL5BVD7DuSsYTyxLJ0oPVK5wacyo8pzxxYZCG2WnJSv7iC31WpNrmG/fKLi/3CDhSMVw555EVXWRdVkNKox8cf7cKtHDasnDMegK459F8ENsHscQvZDKruDOG+l0k+Cb+dreuPjJGN34h9LZ0w== 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=w+/y9cXmsUz3VIQGT9hx4pO+/XcNDsEXXs9imZXN+Dc=; b=Zjj97W6csBwp7XOKKobquZ/MYUBzR2z9wIH/iEcdLl6foCiZyhM7jQmkwInkXlT28ncs2Riqo4slSzkb8W4Jb+H7XQh4flRQl6FKHHk04o2txhfdBNxoKJ0ij82ahMK8KwKGQejyQwCF2Qn8ENafKoQZwv0bqJ1xOoSM5Y2KRFA= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:24:17 +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.8422.015; Wed, 12 Feb 2025 02:24:17 +0000 Message-ID: <87seojyk6m.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 04/12] ASoC: soc-pcm: makes dpcm_dapm_stream_event() void User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:24:17 +0000 X-ClientProxiedBy: TYAPR01CA0151.jpnprd01.prod.outlook.com (2603:1096:404:7e::19) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: 7513486a-d7fc-489d-f394-08dd4b0c59c3 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: xobESGLDVrd7aIbEZcrasCLRqkd1bPkZx0FntH/Ui+4xY3i64EUDOOHs7noEXNQliskqgspJ7+OSkSncNE7xLzHzLC8ie4Dq5rvIhyZ7lA6e61NwDjXI8nJTWZVJK3coYYvpdyTYvsVd6JhV0h1BFZgYYUzi+3+pXZGktThZ3xIrhW6reGsy1KaJw4zoYGLqMDnGkEFYzjn9p+peL/GDWnm2VqBf45rym/N7hQH0cDAOG1omDy/iYkJsc1CsW+3/USURF26Z263q9MPSxezRA0yBUmRCWuY882HDen7C6mqzkHnhiYNCb6YlQGXpNQss8kumf9u2zdzIgWY8OxvYJb5ofYY1D3fEohfYPlb3w8lQQ7Vb5nJ+LMm85b/ye0QjeRePAFQCDiMWWT599hE7UZJzCuyX6udLVwl4JCXp/Ptagm1L8lUVjKLoXb5+9tcVe86cpSlyeGO1Nmax7mutK1Z+NrZwAdH79+aHL2+mFSveLF/MW4dIWXQc9bHNHf8YrKFO7788tsYgWFXwo89XAwvlyqv2zPR/jB7f/VwjxSpHVygmS7iJUeng9nV/VmBMKvACwuAyL+2Svm2s9ekhpzeof08fGkKnCixufL+gRNpEgrEPsVcQu8fhocGoM7nQF0RgjEFic+B4ell/OHzB9WuMp5K0GSPu3yLjGg7oQB4T6DNJEDVWl7b8nSoIOy1hryvoJQN33/OKHsHx5DJo744eemEqjsYtzYxrEyNPvMmoqf5IFuk9ikX6mjXdQb3turzQSAkYexSB47/hofsoqwZPP/qlu+d7d5zzsT96yjB7BxeVmwLGN3JBBiKTBQFakTLzyDvzaToVJV8bLHEsMJ4I6AO2p56ttDXOSYcz1gT0UNZNishfW1WnudoL/B0Qbsj+NnEjdW0fARdZ2TCOdV6NZ/IBVWj3cYGicr6shtfIgAt2w9UglkXn+N+6T9s4WFK9xlZFBlUN+GOAWrji/FvAH4zUzDTuiZAE9lM136FziNvnU6M+EHmIhvYTr1PLEHLIYxZvXAmQnfZWs3q8BSSYPW5O5vQ71lO5cbnxkoVUjce5Ymax/PvsxPjwqCaxpJKoIGruk+noOj6dAga24LIIixcCavoTmNcW87cbggr1IxvpHprcgSvf8Mzn/gT45Q2oXs7b2frzSL0cLC9cnInaTXdtHdFWtUvG1HSAPyKiJbhDbKbN/H4/b+O0ipPZrFjbZMuGOGyHPP4TsMylFBP75iCsAW63MkL+XOz1Q1e0nerUfTNiwp8g1bxzfLYgFxTCzseGUxDmGZYlBoIiuneSuP3tVfILxrMQ6tWwL1876iYeabK0xBgGH2AcU7H6ZgwV5d3QAJpxUKA0jEptoWRmqUVKzPLFbfMzwfJNsjR0zLDNdFWWhnxyXXDLlTZt2gzU1kIOjaNW9Exqv5q9atKDz4aBRIlQtFXifoLR5DBocd/5M0AMggAfdCnDHCls 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: 5KtdU181Q/YQcZLm+Swl7reqMUtLTp+rrN3PqYeK2EYCx3KVJVnKroRteJogUYVSp3LeIwG6tUBNTVQxgQOJxIokDlAB8GWrQ6VQGWW2C9J7p/Y0hPzADWbL92kJl8ZwXTSu3iPAPYqF332rDfrb3nF4x7BCxmB9lTJbN/LxA/QMYUjOCepVbClTEMN9PrPt9aNlrJWKttw+tlAcA01Fj2X7re4TWWV80Qv+XJe84llej9+QSiLD5ngUCq5S1hsiB1R/ns0yrpipdvrK5ij5X7DR5cU03/BsC57QGcjNtDrQQMNBpi/0qGANUTIuVZNiGuEqctUjHp+hY2nyzDOS3Hhz8oZyz9SyqR5Y1B1ttBMZRwVXTrxSl5zDrJlC8ExmggA2IkTF9EjjYaC7qVGy/S8HF6BhKB0xxpbyHmXXNgHDZo0Pbmy9Dp+1lLEzAuVqx+761/mKeLt/EdwmgbcdLyffiRR/qibSH9s0YdQdNf/n+8Q6EpTJMsHK0ZPXfgIQs2x2gp26kloIZOBh3VctejNHXbS052FhkXKtQyimLd76bcwEZXw1v6QfS/RIWq3qmY1mV9+AGnulsNEZ2cKErabgV0CW8Cx4I4XJMyJN1RmNOo7pboxG+qAtB0LzcOuKKrbOobTFW6ot6YVNKODSnpQ95wGGbXATQ+c+dBfQUfKjwD/hRc2JmvdbkSM+tq9rIRC7ocY4wkmJl1Gymdnlq9/s+I9/9/vk4/kShBtwdHSB19QgMvNROpbEkQt6D/x9/0xuYcckWQAYg3zEfW4Da2OzTQPBgdR6IxSmWy7ivPpvo2WwXlkQjTAyQhyu6k8r6UJdHsbumleosnpbpEGP9z3kXtfNFjT82jdz7WscEgWaKy/1e2zV43t9iNGolPCz5jJOlyTz9+7i/rE7L0zWwMMGalLk+6fql3J2YTTSCXEbLkIn9qUURYKvgeOp2xmlhpNbuTympOofH4ttaAVrBWBZ1UWG5+ZB4WOAqauxmVJfdQ+USpCeWbqVUYWXdpTRHGwD/Q4kQZsuSwvOuzJb3zPa2tbHcJDig0pm0o5zpzZQcTJPY2NL+fRs6AEkwAtd3Q+P8A8qdSCBeqBj8HG1LMTa4pqP0cITifdsSqJXACYZeC2BW/DvS8BgHSED98z0Fn6aeMY8F3fWhkbpIPJ9ejap/QaneZLMihv5e1fdCv7PbigsBpnPj87ezJN59u19dO1SFsx3B/PIKOXGqVfTyss9MqXhrquJJmXpVGYxQ9EuVLH1bja4+NyWctQhiHTPtlHPmaz7DGFTUxnzrphlTIO2iO7/Umc+v9COQdBrSYjpKYtb5xhUjZ+Ug21WqID/33cWcoZQCbKJrdlVVAPAng/ThoE+dHzrzyM9wtM58zRk8uo4KEAEXQLNfMFxUzKRB6cFb+o5os/ry1UF6bAyKVb4xlapU+024JVvgWZBFem/Ztna0gOrxZ5YS3Z1cKfnqOEGrRZZ0HwUrVOWr1feDvsfr5jP+99Vqu9rNItlh6rpVntYstqIW/LEoHjQWIFfkA6XS+7RLBci2irZpYOYB8733xkzU8rJJj1eIX2T7P6GGMJq3ZmPAL1QhUl5PzgcLmxpowK5xFuqlsnuRG5t+9tZzPl0KVTEGYJkZmGT9hI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7513486a-d7fc-489d-f394-08dd4b0c59c3 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:24:17.5386 (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: WdNuTcYuaExNtfC2iqUFjCyjD5iR7SL0IjRYoUf+1qdJg+9aQelIJ+A3H+Hl8fvfKlU+Bq5FK4bfkO5KKAYqC9TAfTvHhsygxV0ZQWbixjtVzhImQy/1gii2zgFUInG/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 No one uses dpcm_dapm_stream_event() return value, and it always return 0. Let's makes it void. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dpcm.h | 4 ++-- sound/soc/soc-pcm.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index c6fb350b4b062..c1b88c3b78356 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -143,8 +143,8 @@ void dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream); int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int tream); int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, int cmd); int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream); -int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir, - int event); +void dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir, int event); + bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, enum snd_soc_dapm_direction dir); int widget_in_list(struct snd_soc_dapm_widget_list *list, struct snd_soc_dapm_widget *widget); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 0d556d3505602..a206a25451f7c 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -400,8 +400,7 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd) } /* DPCM stream event, send event to FE and all active BEs. */ -int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir, - int event) +void dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir, int event) { struct snd_soc_dpcm *dpcm; @@ -422,8 +421,6 @@ int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir, } snd_soc_dapm_stream_event(fe, dir, event); - - return 0; } static void soc_pcm_set_dai_params(struct snd_soc_dai *dai, From patchwork Wed Feb 12 02:24:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970952 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011047.outbound.protection.outlook.com [40.107.74.47]) (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 8D66D18D65E for ; Wed, 12 Feb 2025 02:24:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327069; cv=fail; b=mUGgxEyH1Jgq+VeC0owN28AgZkOit1YAtGOfzsDFPd7YGzbGbY4j+5k+nhtLrStW2ZVMkGyLoAEAKak9Zy227BBKqyDkn0vyzIsDlzNi3vzlgO1yS93YaYQ9UYBqJZ4rt+UszNbVIAcOW8b+Sa7ihVBw1NAYETxCQABtiwYd2LE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327069; c=relaxed/simple; bh=zqDwDfJPBNz5kNT1s+WJKFSPZ2uMp53AntVUnR9ksG4=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Z9D5vs1kSbJi9E30vOXLLMi1P16YlG9xXlydXodUx1yBHCiuMpp6xfpYGZUbldih4pzuivOHOiKKpVSz7Otpqg0w2LAvZJjSqFMT1TFexKdDHj9wZYfgR2ILBM9K1J9g1wLZlGoYMXe2IqiKqTuO4F6l9YTO7iP0V8Odgn5DRSc= 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=NQi8FgFy; arc=fail smtp.client-ip=40.107.74.47 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="NQi8FgFy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uDB0iM/J990M4pD9akME4hX73g5Rpk/6vto6G/LhGJ/DM+yY1x1yZ0X+ILeWHK6oNulN9FqY4CZ3/EVT8F8MSm0GOp07hmnC9q5sYgfHP9T0O7nsTpVHI89vNgXBEXeUMdKrPOkC0jKtHtt77wfIRXYHA491vMn8j73oxtkqUgoP7gZ8ljf7PaOvDR2IIUoaRaTTqNT0BBKR+XjkIolj7ymxoCXNuzf2vaoeCLtcPsQmAGYhwmW4LoWrfSrENXubJ2K9KUOJ8NE16C4vmlXIsBSyp/l3B3o9WGEEP7RwiE8/DfUVyIBgotAfV0faieslmU4hZUhcghJGg9lUaFaF/Q== 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=vssr6/BDyNTd5376ESwDDB7hxvFXDWlAyIYQbyOQLJk=; b=f77OZfHsYjH8JM5dNKJT4egsL5LEqGp08OStiGfP2kIQulfW26aE3D1BwhjCbqT4eM+BjHgSs0kg9ApYmnaiuZuz8bMH7Cs/Pfw+t8A1N3V1vNZX78T3rPaXY6OuG7BBap5u9+en2OOf1GXUhUMFruv9i7Uob+R2PekkS0EXmSLY8TnXD2S8eEBIlC52hUIKrxIJOqdPJlpbNFiCCkgIClwGyuEuxH5u6xml0NboCy+BUDuDdA2fdGORXuKARnJwrkP6Jiyy3hYfF6+uha1EOBUN/jyaU8GeZYlJtvprysS+2OYbePPKg2AbUs4T2WBjF58L4ulYyKGi9Au2a5Oelg== 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=vssr6/BDyNTd5376ESwDDB7hxvFXDWlAyIYQbyOQLJk=; b=NQi8FgFyhITwJvB8fR+AYq0lo6JFiXHr4QnlVVGhcLdRWz43t5CvoUsBfXYzqbjLYT1p3O7TxNnizHVMFkGKiHkgMmPTFJgYzr37mKGlkp0qITxrbzUQykrmUuv+YOayHCgo/TEn0kq+xbayI3/ZzscMQgKG1K974OFrQGkncqM= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:24:25 +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.8422.015; Wed, 12 Feb 2025 02:24:25 +0000 Message-ID: <87r043yk6e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/12] ASoC: soc-core: line cleanup on snd_soc_bind_card() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:24:25 +0000 X-ClientProxiedBy: TYCPR01CA0203.jpnprd01.prod.outlook.com (2603:1096:405:7a::12) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: a7238b81-e59c-4cb8-4d38-08dd4b0c5ead 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: KM8WleSV8x0zk5Y4utU/UxRPnqLeaymuw7+ehav1vIxMWebuzoSVrhmHU62oTq/19e3zh/2PrqSuwlmv75elT9oHpUqCSJXM8zR0lci7R7bvLSceB+L8W4IPrvXaLePqtjLcHi6CkGKR1/UWYdMFPj0EzkIwtxHUFbmfmTjM0p25rdv2029tXZBRV5SzgEeYPEJh9R8ddTkA9zfW3aOuWrICuWbG8crfi/6T+C+aisCCYk1+NDyGFs8yQ4k6KobmWOets1c4uOORu6blQl8Ucq5wiSo88GA8sMJzCKRAnJGC3K3ASfgY6w6fCEGTkERmHRVgxZkVASboXxmwGwdB9eSc2DDaidV1GgHoNCyK7oekM+XRAKDZL3G5Yedm0KadQ3Ifxuq6LlgcZ6zlkA0D8zSzdEspfL0CYWAZRpVvXhQoJIw7ANTOaEW95xm8/DH2zySg4uemguEafgTHB5aLBerTlZLj7Rd7XmrbCKJYwwUWeV02+Tv4lUpiUTjyypwt5/QaZXButxfZ1+PBhLd9MHNSG8/kTPreKGxpmCrVDIjvBtqIhAFw0UgfQHS/zCuhpZdj3+gAPklUBFkPVbFUhPd6FV+vpFy6BVSdyAd4nx9OE1NOfRCAbUEAFS5LSaJzPS89egpclJpabmLfZzk+3bmIf19G2dLvzu+Ii6Ecwkq7ZlojxEpaGGqzewlUOCJFq4r2fvf1Xw/IAu8E7DOqgX+5pSPo7B67KEm1uLUGmbOZLvxcHzg6xTG/6xxKH2NBEfRyx3hkrcJCxkYVVYZ+WYoJMe8oBKgOflwU6xOI2cjEwKlak6bGmL13BV/YdFFaGBJs7SHQ80UFfZi5OUnoOS7mP4ZRQLpC+FWOd6+YuTiWu4LPplFxRytrdFjlrpgm2joF89U4fSNzbt+nV053HdMy9HdBm3ULaI3y+wkvFu8aubAeHiI5HZkZqZKoNI4HQpeXqXgF2K36Ve8ffqF+FrQeF9CLKjDPhdIF9JfvrrI5cvtWaiicyWf4f5XJealuZaTyVwvTjOhm/vxM5NG4vrRZG+qyebG7knAAOd6gibA75MMtrgWcPaS0edtfTEaNekk7Uh0/AWySCHw3uSy2G0BlL1WiNXXbU3yKMo+cq+hacxfaTqqb4N2s/qpbuPb/KVM97GUPr7kJ0aLSzBTZs1SzSWwGrT+z0Zc1hfVVkFT6Y6UvKNY4C4getyHuH4K+F8Eb5HIup7Q11kdWm3Pl/EyMqPBcB9063EY4nXxvNKNv+349rMqbTvC87GcbrENWNoaNOLHP6BRTzt+lvAI9pypLHTUpLvg5vV0Id73hlV0JgjEfk/WlkDdvEB0wHub4+LCKjcwd6+PRh2Pw2djCF3cVQ0+hA/iCAaik0UoyPuSZZXWrGFMxOpfaVM5HQCqeN97fLaEpy7ueSA23fRqzN4o1ibfUq4iuolRd69tKJYLhKEEcTflXGvSF3zc3IE0k 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: nUJHsvrVbSdemp9TKLRlvJ5jhsLEcii0OWm9phUN+nMpvFtIweUnbbqPpkKs0tMYFj3obPR4CroW0X3d61KUlcENjDcYcZ0oJV9xjD2HJbAZvIyGulEB/IzDNZ7dCUraDjWx46oPWoT12G7a+vXdQoMnvtWcMsNHxXPSeLyzxsHMlbkqHagHUy2EqaMNZNNEUWVI1q7Lo6QTNFaJrBdkdZMOG01ZCioTm6x6cRZQhw5v/zLpHPXqL4TLFb030XR1n6vWAGUDLNJZX74XKN/rinYMfxcGdCvARinuGGwXxHxiN+J6Mf117IGicm14e/jLY7asoxqA33SC/BTZyw2safhlRMWE+/KmysRfEtwM+9GW4p+UU8iBMHwJ+FMHN55QEeLGsapH6ZIsZLB/w2fwSwlaLgebe6HN8BIvPYhxdVWg7grupmQyR6IekeuAYtZMa2SZTO+mFmr4OcIn0PThTAzYhKc7bC9Lv7OC3YATlxPF41CUvslIvBa8ZlH3XJNfur5wAp0Wl4UGnKhnXtV/YHdh4pFIsVm79TUEfp+CROvTlMEUKbwu6DuU1eWFU29nGe+bJeJrCYl6uC95VIt8SVqiZW38ZjWPCJI6dfV22+pNizq6oZ6frc8jDCtpWU5a+/DRgZr4i00YgcJWqEoYAV1oY4dLxfQAm5+jNbYLYlcLNS2WKCy+LocjU51uYZ9R0ZIeG5AnUdogoL7QbK5fTB60IPRWvRs2wENCN7ayad50TDsRDHI7Nt5Ep3EdZmNLE7V9fEdYtLaz53pWj8i6wl9Vi8kvEjS6B84eKS1ghxcYknyW+Vowb7gz8zMkiXvbpfhhDosxp9s5q7cOIgqyF2pmqHqjAI5l71cYZaNR/flcekPJcPcD0Wntk2iwRALhUAZKRWlt4pem0ozVovAtZqN6ySJCjXN/cPF/6T4IDB/ePEbu47GFNwM5pHc8jFGXead/CtWio6OwdOoHUCvXB0jhNjLrbHUakq+XuNPFAA2jUAwBa6lEwEzx5ATtVVSAYLXVcx8byAmuGVjrXqnTAQMAPOjpRc0guTISfdcJIyNIfSbGI7hHUHFfaaL4+x1o66wNQTWXhzqgVuXVppkqrACzsWFJfcBSB7kc5fI8QUorihvUzBP8vmm2fzMvTbtxVneuFhM4y4GrVO08QNs7kD57DY+VPsFhg9rG71ajb7I7yD/kZ62C9o0HYrFMVr/9m1LNOC5bko6HTpZR60ir9e8TsiLzGbizQn7+jaKXtbIkHFKoNlfdi5sNRyQsBhVxfw4ngt5J7z9k/9aqK49Qpm2wYUmFl3Qq+10IYko/tsd8hKPytgZEcy6DEFW9LScVEYdHz+Hb6ZWUwNoBHqdEM7mg+EXME5peSPxemanBWjGMntI5LprcIWir+Zvzc+IIYbJ9y1tHoq+6AuzxavCxI4tv1DvS1k3BsiMsGU7PoVcUVgoufXjcBpkzw9W3NxTALYo9U0N8w/2jEPzPalESf2Z7r8leIYAXMgTNuYWJgmlBxtaGTgoZZWwzAjMfosopKejXcUOtPsTIEYj/A5edXyZoUmJ05oWI2IXSISGmtpvaOG2EAJs8r+mBtjkJLR2mMTVaGpTV1eJU82io5HyH2Rh1xYPEEqkmb2T0IM4U16I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7238b81-e59c-4cb8-4d38-08dd4b0c5ead X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:24:25.7921 (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: HPz1TpLusSKbwS5YttpsvOoK+3joysV7crShTdDlJxszcoov6/fOfq5SheNCJnfOXefiC+oRGZ4TIIfnz8xiv3TRaBoSG5PMcJVNj5rmZrW5xIfW+zIKZpqgz4kB5jMK X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 We can use 100 char in 1 line. Let's cleanup code. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ae7b3e39d5ffb..af75e59dec377 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2257,12 +2257,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card) /* try to set some sane longname if DMI is available */ snd_soc_set_dmi_name(card); - soc_setup_card_name(card, card->snd_card->shortname, - card->name, NULL); - soc_setup_card_name(card, card->snd_card->longname, - card->long_name, card->name); - soc_setup_card_name(card, card->snd_card->driver, - card->driver_name, card->name); + soc_setup_card_name(card, card->snd_card->shortname, card->name, NULL); + soc_setup_card_name(card, card->snd_card->longname, card->long_name, card->name); + soc_setup_card_name(card, card->snd_card->driver, card->driver_name, card->name); if (card->components) { /* the current implementation of snd_component_add() accepts */ From patchwork Wed Feb 12 02:24:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970953 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011037.outbound.protection.outlook.com [40.107.74.37]) (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 8190B18D65E for ; Wed, 12 Feb 2025 02:24:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327075; cv=fail; b=Kkvako3yzXfRTOdyHY47kyzlEurGx8W0Oa04E4bmDRZfG/JSJRbiZKsrejZLM0WNNnr58HKZY2wbDHSBWofz7G49EE8sFaEaypcu0fNIUvbRUaDZaOFWL0ua2BiHS0xTJbjDiGs8PHoqUN+3ggLCoaUTiYJBUvopaILlxnq1zmg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327075; c=relaxed/simple; bh=ooUzEadBfaRJ1I3Jrwa1MPu82BE4iYJhJDfW0n/w6lY=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=fyk1pzHl2cUIcQeNR9yNdYwY59U3MeLhVAt4LohfeLOB3x9Gg/TRhP5Eb/onM4Li4HyCUnWQEVvdtClsM5QhshoLuVR/QeIw6XoLILOHdLqEBoZ9sgI9Bl15Ap2JNJ58YUF7myFNm9bHx5O3AviwNas3kslmf9OKuBzrb+wiMCg= 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=lD+kZMtG; arc=fail smtp.client-ip=40.107.74.37 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="lD+kZMtG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VGkBmFgDnqnIv2JeHq5ay1epiW5O8Qf3KMaVaVjPU2jAwfKmje+Fgv6QDip0Y2II9cZNPPKCTyL1zMymnAPIxZT8S7iouNq15yLV3BDLmAv+j0FuoTunTQqKZ4BSFdIkJj3kt/6Wv61UcxH9qHgPS5r7iyIiOKFbkIGijJDC+jAklP1pmiaXDo3iL4/LgQiM1c22gS0mX6A4QK747U2kCFK42l0+vIOpxstycxxEwXeDvZL/XHcIoUa9vwujszKW9s3D9HR9jPH/KmboUZCvPe2vZYe0inqCqi2U/+4fciMWeyrkV9ED8QLppPDgkCmN1q7OL6Q7qUWec3Ps3lTYIA== 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=xrwMW0kxS/jRqzYJGdLTLIZBkmK9tO0B014kyx580Pw=; b=JizpBXtFxxijowuvkjxAMqfwGYB1j4CIbjhpzPG6Yo4XSbxXvz4rIz9Z/bR7OESE2WoMDLsiFS9F/WaNBxEjcOqV7pKGXB9GQ19w63wxYdKz3L2aOhf7bfRC9GE0MqIoquPEwpgiMvp75NX0dPzPIvLVQzocp9S4PoN46kwVqQ3AaPK7uTFISGd+zTwKRLP6U07PyvyGwTCP2yf9wkuWBGsvJ3cAqCC8zteNItQTMTLaFuJ3JWJwbQnUhZQvQYxsXqF5ruKtJwtqLpLIy5YPYJTcDHuxjwCwYIzvVHD3CVC8dgLSH3LXMG7TvzQlBQOf3R0TTzTz9PbguC3/Rk8GkA== 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=xrwMW0kxS/jRqzYJGdLTLIZBkmK9tO0B014kyx580Pw=; b=lD+kZMtGNKCkHhXByDZe8Dhvn+jAD+ppBkGESsl671Lcfp6eZS1uZdjrsty0QZTg7DebyP/2BEVBkCcaPpIr1KSJ/iZQ6w6ZK9+S5vmLfzpR/loPzvJwtvodOG+w8RQvGPl0qjBz+WiGOb0DcJu/3eOOBCfS58W0uty/i1rzfzw= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:24:31 +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.8422.015; Wed, 12 Feb 2025 02:24:31 +0000 Message-ID: <87pljnyk68.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 06/12] ASoC: soc-dapm: line cleanup on snd_soc_dai_link_event_pre_pmu() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:24:31 +0000 X-ClientProxiedBy: TY2PR01CA0023.jpnprd01.prod.outlook.com (2603:1096:404:a::35) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: 34c7278d-3dcf-4c25-a69d-08dd4b0c624f 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: y77CMv28fnpzC97EQQuMUzPMSux+opV4DMXv1K5gO9wlODp68zHLjGO9Bp+prwQV5/dlfqFz8AELoKo6JMwgxvqbgFeI/0HHadvriL4kQES84md86pl9J76elHN9NjbWICS/F1AgMIq2zBJjKSEy3d+fV3JLeNQKeQL4pPp9PqrVrl47xXQO6jDgHwE5QhGOhWDuyfcZ9dNeaTFuPkzr8T/zh8MR8T+cFuVqV6M8VsX9cL6SK8xYTbVgUC5nAwY+TAYYDuC2zVsce2I1j8TWMmvb9BpwPSIBKqqYqyBWrVlH9BoAjShGLI7F7JEPRhYhGPzUBzbMcnQrLnR8i8P4wNAO0RrwZCad4GzCldnRAr9gb1D5CQPD77gxVN6kZE0VKtYhPVUXTIsyuOhdVf1XfxeM7d3RHAZP+ZnjQQOIGv76jpY9ze7VU2z7duGjYFnriz3AmTNhiDeltMmWNTy4jTuQX/GRISZlrCVnOyZa0dQvz1OvSq7h03NKjnuG1Sl7x7oY3H+yxF4m7veucXs01C+cRPgbv0rjjZnbxnqKkKLA5fJAmUb8bsm2HYZTZNbVK1MeioBfKg+DupNvf9PhogrNftnYbI4dNABX10++YJ1KdOoQ9mtYrw5XfYzkGcbLtDNduTFn7OydSy5Oq0VyPSK6PMEon7vH3LYfZlkps4CJ1kRP3c0V2hnouoTOKp1zGR6gzjzLKAjvjPCxMuJy1U+lBX6DheUT1Ox9lJZR4MOUSKbVHlgVADyQArzBKqvAkCq0HJuiMEFyiqTHgUXr9uhA1mRvXb2Yq1ge6PTE2JpDJJGkkkIcu7Jp7o1iTLhTsuSMDvC69XlzuP2rFVmIc3wXTsy6ljYk2ZtNeqXrIDNFww1UKAdDfSSYw9KhvAW+V7v5+r7ywRlqVitCxEVjBDJxJ76pp/oUW79zszPfNqHdhBGGxKcTi+FYVSIzH7bkSh0jqX8W8kVkb0TpwzWS12z8ieQfUFhvyB1GqkcCzAeOLOMGEr2fw1lOpW7qslqUIUhPlgZmP2K/ZPBCNXXPKvcDwg/3nuCwdxwgfMHecbYaVC515Z9wInAQE+DI6nqOERc6R8SXyzocWeYDe9QRzDWvLOz4r4YR761k3QVpKF31O1b02zuTbtE/c4OyQcKzVg6nK5EcnZI3rVbUpB/VXXV/v6cSdeircdf4vZBw0JKcillUJlSxlu19crvGrh1ruoMCHKbLhBx4isrsX8S+fdIYkUu4UPu0KL0RXO2DeTl8KdwU09XWubgleP+I01RIgR2UDNbKLqJKC8ta98637nWX7maa63i1bP5hO8l9QUThdaRltUNAzCs9jjbAItJXXGsulk+pB0aJ/mrRZ3BqGpfxp0VC2upvf72IhI0be5oUUM1YQZKhybxfTN1uafAsbdEnmb3QFALrJongLTPLZQ9fTwFuakwEj2SOkp96wO5qAtF7It4qQxG4o3fdxQbl 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: jy9wcyIE3t5XnBnBAvM0mDRfO3upRl/ifw5V5lg4EYzoQ0nTtL1KqTMuKM2z/AqRwfnPugYLcbbmjWb4KH4nT3GEdurKKrR+vSSWDFZOcwXKnm3yIYqawOHjDNdbFIpyw6TB0AOUBnVzO94D+wBpDMwnvSsWDkHqGY+N9/Jgk9gtfHf+dt+5G6rbqNlEJ44gctPnU8j7gIjuz53++T8YuQIBS2nPOL3zA/u/6W0sJ8/L1rHaQELqh2O9iL9gumsi/Fizw+Yagf/kc7Z+5aYiovptedlI9TE3pdwgp3QcOGGzZlN8CGl+e+Hd4/DFpIlEnWhyYmX2X5tX3kJIxuomBPEACkn+O9TgrzUb0CSVz6CMFdUErftpaR2t/JJa+BTt1fOH97sN5ygavxmFQoT2p3BQE3BUg+frYZiAyCASbKh45DIx71YliwzwsQgmYEyAIHS3VDR71lu9bFRjXrPpfEGXWxkLh4sVYKE5L7FYBN9zanKyYAVVtbnnDkeOWMIr2YYqbFQE7EaJG3ulQqRje6ayYKvwc4lLIoyl+/9LCoNL7HGkGNHAHK8sa9TNH1N3dVFO24y/+CGzYn9q6rdcQv+dzEPdqBwgl9Xfx7eCeSCaPZ6P1mzp4LgBxwZ628t0f2cICUJ3GwP1BFjpuKfVm54EUXd99aPpM0leKwWfYGe8TZFRfNH22jW5gn1lMir/ZzAQTd/zpCbidleYLhoaFO7DsoDrk4tx/yHDF37IorMqCEQtldrI/ZnL/FjLbqQMBeN8RZtYZZAyppPoCx7E3ut/+7mK2xRwSXGHBexm/2UKR23ifab53vECc3EKOBlriamb3mm0lICv654C5goDVutHEby67Y+X7Njgovuo50oB0lovVmhWPoDCjqC+orK5FR7Ezks4F+t0LqKq1e29HGwctJR2FyMGnzSi4swcpLOZ6OFWWam6iyV3qg7Qzeom5vldoVzEeB9+OYVsTiUfkKlmoY5G2KyTwHZvdTfBoUqpvkfDBuWzqGTx23BVPDXJpYIYzdkfhqZVB3J7TeI4Xxo7qjDQwBFIMtUyYcaMJ1ZjYV0SUgahl4pxTgYLLYsF3MrFl7io2BMOesUFPRZcqHEbDb6SDdKENeyhEZRManfGKilgdhP1x6VjUdF2QCOCOGL5ravzuLtLlNb28OKoWigc0g7DoIa72KaPIYOredBSia3izEqaD86AnW1YldkQuanx1d2fQdHeqD+5JxqPUQMZ7QciSkmwo6uT2KFfX6Kpumv7O+ApygqsWyLN79vSaNQ3u2kM3N6Au0f1EWVv6tcuhD0eqev6JmcIwH27Bmd6qrmSi8KHnfHTUJb8Pf1umm67Jd8wskQ0vO9ncoM03kDxESH6OV2rfIXDTocK+ZFcRRR7pF7T8Sajlxxm5S0HPIKkkLcuWbptpdeYSL8vpKvgLhohieY1GLRYHi81MqbZZqFOU113es/jR+rIVcIDgS7RTbTvz2yGaDVBXksXqrdNFs4NFvW43QtdpJHpnkd3SjLQSaoN9zflBYnbRkCrU2gh9vc5lykI57VIv4DOtXMUKwJRAwGsoovaCnqXVKjRJ1ZnSQQL8rk0/hVUM1NJS79WZGS/NeUV+SFmEv3VCe7xw0bN+llj0/+sKoavHvw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34c7278d-3dcf-4c25-a69d-08dd4b0c624f X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:24:31.8564 (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: j/0DQE+drNDMUXsWcEE2KLOtqNRVhFkajGTCPq1akZPRTldkP05c0hXyDSFMWDRoj3u9CB7k2jREpTVGzhhjgv0S9AASMoubOSxD6tZlxMT+qXBhdWbC9JlzPxN2R3dg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 We can use 100 char in 1 line. Let's cleanup code. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 420fe7dea31e9..7f18968097924 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3951,14 +3951,10 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, fmt = ffs(config->formats) - 1; snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt); - hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = - config->rate_min; - hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = - config->rate_max; - hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min - = config->channels_min; - hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max - = config->channels_max; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = config->rate_min; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = config->rate_max; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min = config->channels_min; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max = config->channels_max; substream->stream = SNDRV_PCM_STREAM_CAPTURE; snd_soc_dapm_widget_for_each_source_path(w, path) { From patchwork Wed Feb 12 02:24:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970954 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011018.outbound.protection.outlook.com [40.107.74.18]) (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 978A918D65E for ; Wed, 12 Feb 2025 02:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327082; cv=fail; b=LWGIuj8mBUszWAxMIING/0E7dGy1+eIu9QtZtEaf7PZg1axgAZEC0KZVZDlDiWMVjIy3D4had7A4C7hUL3vS+nOE6ssvplgsRSUIFkQZqtFrfZ66eiVeEODhofhGooyyrE5Pl3qpSto2diFOpQGEGtCYtUFPq4yHMLtuYTZ0uJw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327082; c=relaxed/simple; bh=k+70X7yds8zDLOaPHVXQouDxAAFu4H6f2eyfUzB5JmM=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=VZaawJ8Bx8f9KLyQo3bXemalLf902Z5eR+/giUz+BD5pcHi7O0ZzYxoYgGTIYfZWQ0KTSNtJaxf6wlhSgpIt5RWQfsyWHg7b3dbQ2/OFdx9XQTnN6K6XDMAu/QLQ3F+lRMNCEKbrtQ+hbQHFEy8TNqspHFTnrbfhwB7kn8MWrFA= 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=V0YhNZGL; arc=fail smtp.client-ip=40.107.74.18 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="V0YhNZGL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qvRohd86mD3wFtmrW0COtiabtNrZcGBQrX9YvkR9fLsvipU+AxbceCz+61yX3h9ZRD3oKTewDZ5p7DZ2Je+hTSUXyzcHNRoF8yW2qtT5jSU6KB0iBRFIv8RAoNgO21+cNrREiFlonQsFpEgqSdH9U4393db9/rRy4RpNFe3Fcvlgf+k10HIkAT4nnhg7yV0tvPD8B1YvEQcdxEa+H9dnb9Q0YBs93+CbI06etvVLOJuXlFc4xrd7jnPuSzrX1IjhmGMuP9pxYLaoOWtpHL4bnfFkLYwK55D36I/wB3NgX5XHoxtU+VlHtGRrxEk+B3dCNQ03V+JDhnf+N95CTj6NNA== 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=XD0zNVuhUfC51U9njh3W48xP+2xH1/UnpDGfCRr7EuA=; b=IqjcFtCD4A4MMTXypHCLpOvkh9s4QbJw45bv9tadpyTDhOdSI3MIJEBCtTxvSOE+6jWlHDHw3tHfbWZD3bqIXqdnT6RAkeesMDV8Frk2QHqszpG2TqJzi3m+R2vjizcYuYhcOIcHkcwCC4qgmXrm9a7tSEacLPy13xPYwdZPbDG1jr0g9Lg6qmaaYxh1rxm2e0Ie2Sq3/V+oC4gnSeyzwjGGtYd28RVTXnaFieUMCmSJ1l645T8pu7044aLQmXgP9jtZoHTnYs9oZGwiYqkFDs16B/2DHpRUeSDzhSSJ6WXXYqGUEnW23W7U+PK0RI8znsKBUZhk+310lhDBFFrGIQ== 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=XD0zNVuhUfC51U9njh3W48xP+2xH1/UnpDGfCRr7EuA=; b=V0YhNZGLgqybwqxxz7dpvWcevwpef0ILxPn1uyMdyBlPA4emdgX9JFF86HqebZyyWKIvkX731ffVJfYwOEROl1QwyotEScUZBHA0wkE3QCUp4AGVVEEaQ5LNKEl9+c5hQIs030F6wzfxJOwGE9RnUa5j3DI6lEZymiHIR53zXLY= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:24:38 +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.8422.015; Wed, 12 Feb 2025 02:24:38 +0000 Message-ID: <87o6z7yk61.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 07/12] ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:24:38 +0000 X-ClientProxiedBy: TY2PR0101CA0012.apcprd01.prod.exchangelabs.com (2603:1096:404:92::24) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: 94c4f845-88a0-46d7-5ce5-08dd4b0c6671 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: Xn0/zdkmqZ20j1qc2s3cfunnTHYuUXLX8rCrAfJ0ZVowcA1+yTkcCEZL1RDUf3mOFsa/j1we9BnerQ64RQLUrcRR2ULU5hPa6Ow9qNLYfvv+F5whkoC5AG335t5pAwAJB2l937Ep6SJFKCRZwJnYkHt+VtLq69yNV2JLNl1e95wH9ynrf0FZ+6Uawmvbp4rAd4GnUGvKfHWCuqWYmePFd7nGCBc67JbnX3Y9oDvCtIAnxec9JsWDy8TCx7Yz0yTtUpoNjSte0oi5KXjPGnMFpTWKyVT5sStRIlZybPkBfA3iYa2Gvfs6byG5LM+Br/wUjJU0brWEWfWkwPvV20Dv2P2ePdWeS6RfZPuLbV8jDK8Xwli+/d+CAcrf1Ek9rmrbKINC3HMtsqTGx7w4I6LIm3PaVARgghk2z1N+6f6TZzZClDvz4TjhZWOjzRyC8hqIy8Sx1/pOldGbLRjjSicVs1HSJMzy6UoqECT8KaPDwQkivij4kLXQw5Zj/3YVnWkgAcGPXVe2Av9Oie13aDxHERrMAUREhzDiVbzmwEc8Z5/aFzYd+pUst9YwBbdN00AfgwTuCWOt97ApRaJ8Ne/Km4LXgGvejGR8RMG+f3h2eUL2NQbg83ClvhQ38XQewmxAqazHg62PwIMjMqe2iA7eSVs2QyemZS4FsRZgq4D4aaPVNCygTrlTpG3myyc8kSybBefg/JfhZiCD1a74sgoskEAOzVxBPxQy61qoOGKr5UxIzaXgtPNwHW46N8Gg5YE0N27cF1sZPDxl9j+KYF08LmPpoUBkzZ2nsnrqHEoObSlKzsHvCq6ecARDjoXQzMyVSpK6K7mY1umhf6O6EbZJCccrHt+Ri6jhxHLoPjdQuxExDZDr5UcfNtLQxtMgDdk/yXnAJpK/kuM1/FXDmxbiV0lIxrdUWeEbq6JRiR9F5hGmvSA68DF1HqHRYfFvgwnv2rf+U1CJBhC/lcakH+U3l1riWBDZpOfdosCBW4r5opz1OBXYG7WSoBCCoE82pwz40EioQ7gZGUo8dB1CjMbr32+R83FprWIG9zZkMj4OcIoeE9U9X4Q+4Au/PGAGJ6JS0MAsScshVKeybbsGzmt8Xe/mZ+8INi+XzTiLj2xRoUJJ2NanRJo2ZIWHt6NhFssj6v3PuQpZbG1Btbt1AqS8E92CmwgwJ3sQzIUmxBWkETZ12+nYub9ha1EQPbHg1hqLc1kyNax/ylNmu7y85lSPL2qXXMQ7DiYAx4GY2QEUQglkCrAAfIlTPge5GG/eFUDN/OKURzejWWytiVJMuNwqwcPmLuDVVN6uAzYblo0iu2z+Vkx0x1YcOvReiePl/M82ILRY0mcLwUAL3v0mctfFxXWKCE/NImzRIF5nGhkE+bCGAgZZuJ65cNKpfk+t38jR+Js/om6f6yOiO6f+tidySA+2feFXsklq6zhKAuJSVFVdl2jze6A9mSP82rSo0dHH 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: RE5rhLXISM2uD5esYzkjWSSWTbPaLzEhC27nrnrQelH4ZRWMoL3/YC0qvCvRjwwd8O5cxIUVft1U66eBXyn1N2Ytg0sDlM8IPJ8ZxL9mt1fwvFsMqrY9zs9xqr94Lxsu3EeQOV/+pQJntbg6vrOq85eZ8EVT3osS+AF44SBF3wIHuIV1y42HgDoFDX3GPDlK+Y4UNfyrIHhi/Ra38fRuNeDCeEgJSROorT/Ps8n39EPikKM9rnMtBmhUH7BUHOjp0RGSbzxCxO7Wf31S8OBxJuyyKRK3HQetKTrLlJZfZPrFnZrjwcL3BB+c1M1kZG8F+49pvQZkJzmfr7TWRaiXSM30tjFY8zXmt7vcabZYFkKX5HOI6MQmEDXXQ1s1e1yJOMQidQWiKPh5Sofp4egFmV0obJ2qhZiEpSZ9e272v5jelwUTB7TUSqnn/O1cX/TetluCBkVZcFhgspQgFXIfmJmMaPMyZQZkPaJ9QERwOwi3R7YRqvBIeT7oXX+qMYJ01g35hySnY0i+QfHOQbIbY8V2mm1xKFOFMp/w67p+2Op0kT3rdP9MuDk5cypTDCbJfvik1/r0P/TwYE7mgjh0QFzSYNY4yttYk0XfFaVJCH48Y1SkPA+yHS1Ihry8kCuXJySiugc/mxsvnuwFui7ATFQJpZigOSD/A1VablmeCGZVpLsIR0YB87L0RkN9O53bi104OkkM6JF77k4RLRgeiSkysvex6iL5CgsNLzc+7wK0mESgCciAyl9ODRMEb/Zg75dK3zcrTfNDtIk3NScQNFUy3R4QOKqIHQrgHNKKzkh0VaimAOr6E+BHXTMgqo2Nhg817wC9fBJ1Kos1NF0C24eXpM5Q7ckchfMDh/DOpgj92O9NijNEwFtKGen0mJS9wRi+HL14OmsoWKA0tNPlS8YRaW2zLuxJi49R9J0DtAup4SAwOKQSHwjBKDVqva/xe6h+w95vuGZibSVVYeNEiZinjK7O9GJHGV9O+irmjpmQaL17I+FdcERyLodJu/AVGBWY5YN5qenP2zL2W6+i6KP/I3LIS8jt+a0LieWBZWwjCd1rfCa8bU99I2olZF156acqVi6fZsiYfoYYYnrjuum+eP4t7rfplA8uvHYlC0ikYe3OoPZJFUTafMNGFNFTnjJuhYZSHigSuHj26+tn0wBu+/haHZSmXWeDr+/EFxU5/5H85H0rdwpA0e0tolHAwLK0/WeFQH10+JBVq6D5MhvY8TkH6+peCqbQmovxy3Jn6PHTz1wEh3l92biuw6zBRrvCQk/E2PZ4AtXvRlu4UNkTHb4I6OuC5QSXJt6chYvcGbHeWIG/YT9d9I+HmmaMXn3j7R1CNIoNYB9dX/8d16OvY6q3wt+8E/j+uBjDGGCD/R928QQKnhDnIftLEaUPSwdbzBFP3cAHeJFO3LPp1yCndcBxpoYLXHtjPhzBUTKLDPafHKf9ezir/EobvYstL5INuwl3HjTkAphj3AtaD8wlkTCs2mQco2p9x75M7hwPC6RWC9pBpzD6c+SxDXiwFAiA6sDEIa/9sIKikDgFU83z89bTv3Y511R/yGyMcYQyxCASN7fTSkdhkk34aVNYr9ChRd0/sAah5LSIJTvynIz9ZIpJQUVQBDqAc1LSad8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94c4f845-88a0-46d7-5ce5-08dd4b0c6671 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:24:38.7869 (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: hwzJmUPA8B4ESYkefJeZAUK2qvUi2PQyXj8DSoThgSIqhfd8CuEpAqt8PzI+h+r8CS2W6+4Ke/r1ISOHK/tbhpQ9ZwPJ0Etk4P7eki/9r9frQCM95ciIJjbamEu9f2gq X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 snd_soc_dai_set_tdm_slot() calls .xlate_tdm_slot_mask() or snd_soc_xlate_tdm_slot_mask(), but didn't check its return value. Let's check it. This patch might break existing driver. In such case, let's makes each func to void instead of int. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dai.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 7c4c9127e5f3f..8f2b5b840bb08 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -261,10 +261,11 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, if (dai->driver->ops && dai->driver->ops->xlate_tdm_slot_mask) - dai->driver->ops->xlate_tdm_slot_mask(slots, - &tx_mask, &rx_mask); + ret = dai->driver->ops->xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); else - snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); + ret = snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); + if (ret) + goto err; for_each_pcm_streams(stream) snd_soc_dai_tdm_mask_set(dai, stream, *tdm_mask[stream]); @@ -273,6 +274,7 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, dai->driver->ops->set_tdm_slot) ret = dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask, slots, slot_width); +err: return soc_dai_ret(dai, ret); } EXPORT_SYMBOL_GPL(snd_soc_dai_set_tdm_slot); From patchwork Wed Feb 12 02:24:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970955 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010018.outbound.protection.outlook.com [52.101.228.18]) (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 82D4D1C462D for ; Wed, 12 Feb 2025 02:24:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327098; cv=fail; b=WFlBMI7vrysoeBQ0HkurQcP09biwp2Kqg0QSOoi+9DBQCk+znsMrtfbHhkz6vQIYRKFUCWGruF83/oszecGCq9XNpYcgjwsz4R3Np29PLR1gkgrS1sw+XXKZfBRVPqDmnlffwayyVAHgEGkxdDHG2idHEEIcjVKuLqVDrHrY5hc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327098; c=relaxed/simple; bh=Drx0c8+OVZwBpB/BqAaL4jcwrRA9LMcf9e2BpNrItS4=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=dpKfA66YB3Usso9HJAVrv4DdkyUCPzfUvAAlbVhJM2IFWxhde3/HE2WgSh8+Jm2VeJhfYMWoi5Zi762qG9jrfs+zgHJCpq1c57nAJJvqD7E1oHXYSqstODeziGw0hbttfRd0tCuTTpO2nSBRs7NJEqrQmpi1XzrUHrIfjV0QNTY= 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=IAjDUCKJ; arc=fail smtp.client-ip=52.101.228.18 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="IAjDUCKJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bXYkJck7O5yVZjGle7pS9mLKoTsI5ITBDrslYK4Zl3IZ51b0NwwSB8qEKfrKhfdvbC0fOWLmoa0g0ERY8olAiuLUQxLkNk1ayuhSwYYU3TcmoHCq1Xd5zgELuvHxEDDIs6iZim31hqPjl/vwgcNaxuTmOUcw2UNmIhkPI0XGptfPrQkoo1FOpFELvrak3mEyuz6Yq9cbv6dpjWk8qtBDBZHJDLfQvyiFYsnRjEVWYuPnEF+2yOO8zOy/7DPqBDc4jm+TXoV5kRx8e7wK4Got9Ju7vDmclszbpKeooy2pNAqVI3pAx6DHzqGtreBjVAjBX1Rypf4L4i9VAKgUKpZfxw== 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=984SSBlUcZ3GZ3ifLfSkCM8CJtOQP6hfyLjurOtBg9c=; b=cYyl5+/1v37QxIjVvRJjlfJ3I9lfdG0p9Fxh1Dks68aSxwSu7BdgnQh0KLICAj/sYEeV4AxgRvcY1dVCcA6ZQSzuAklhFStZHIgYDB1Xd5NtZyQPLCpt12WIO+Trg1wXfr2c/ppquqRjgFJ/2JV8t44o8ydOW28Qs45NyrkG3+qt4NA35tcM/8HLu6ICcsyOAnHFJOr18J6pbPzMGULdgHw2TvEEJ0oGFcBC75LgmV2YW/krzQMiEUVzmzbNoERb0ZBkeRsEuBnWMTj4yFRRZ/1IbuO6l7t4RcZtH9iCTX1TRykqDLYztTWkPQ84udH1x7NbkLt0BjaeVTwFoKiagg== 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=984SSBlUcZ3GZ3ifLfSkCM8CJtOQP6hfyLjurOtBg9c=; b=IAjDUCKJWMV+OaqxlVnODYWCWg2cesnwTBE5ScGSxYpxUYOxylEFgBTPh2LVCemkVbHugDOFBp4YGC8BJf0g1iX2+qzvRiHeoMut4Iqks8OdbibAQ4/6vXrpri+5rvubak+ZhqHM1cBMxEmDvO6ZrdwuWf5fJPLeIPq3yfRTdWU= 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 TY7PR01MB13706.jpnprd01.prod.outlook.com (2603:1096:405:1ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:24:55 +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.8422.015; Wed, 12 Feb 2025 02:24:54 +0000 Message-ID: <87mseryk5l.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 08/12] ASoC: soc-pcm: remove duplicate param from __soc_pcm_hw_params() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:24:54 +0000 X-ClientProxiedBy: TYCP301CA0028.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::11) 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_|TY7PR01MB13706:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a577e05-870c-4691-94b0-08dd4b0c7010 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: nh9jYRqrQSxwq2EEGSJyU7xBuCP2c8Q/zWCU7oJXQm4HSVPz0TG+PPLABTO/qlhBNgH2GKrM1JdL0dvwdJ1z7leiXaYA8gHXrr/o8JqqWBj9rxw+uvPlTeU3ls6A4lJ3+zdidkJou4+xJAPj1QlU0Mvx+3GInnZmCM3k3fVtFBsaNRpDnFGsylXReqx62xpev9zLP9tTOAnXwnQQA17Wizll+fbbGeSJsNmZcqOwsJJ6AFouB6cmjMw36pX8B1DVFwk0zcKBP3GgcBUrIpTWlVUoF27NacmHxlMSYp+nVCO+t4A9G0ID8PhjexZFVkMLaI7+L4T5XCfZOyy2zVEjZycofxufUNY3VVy2kLM0ftXAZoQsxB+ad97hald8fdnWDysg4qQ2aJEW9zT+U9rxRACDm41DL+v7RQSY3GqG1JQ9Q/ZA3elStZ2I1scpPFJTSWSFVNkOYugQM6MEwtc4o23yYbj0u3RB3ZjCwbJzxmRdXo2/pf8GEpYluJLhHLrX2dl/HzYUWjm+CAnVqjY1NawAfYVD0ueGSBKKKQ8ilG7LSgewhj9Dybnj89GGOLt7u17ur3GM9lO6mOhJwvJ0pBFMPDABPO1/vTGh4kvCiRLariDQ8PmfQ45MfeumAdZlepFizEK0Nm+DyAYAOY/8wmMNOpx9n5PvC2vboHwldRasIXyTyruGNXgzAdXfdL+lzmS8lhzvsKqHHqutwuTjiow3xqKYz9/bqMsMVAyngE+I4eWSQycMFob7N2KENCfIWIdx+7jg59ukqbo4DjAMr3DLVHtqODW7YyrSIvbx/FgW04we1tSq6sS0iiX/pp0QLKFtM2aL7w6Va+RqeLMUKmXS81RntkJ52LFA5cPGF6iDlHaSDiNYPPuAKIzmMgpcbyCLU3A37kpjc9N1oQjowr3fRlKrTY3rFmHN+HVShG/ZhQ97X5O858dNdLD/2nWqSEAxc1bAFH6puDuu4Im8QyQoVGMgzqExcs0mLEOadx7QlEtrRM1KMg0830GyO03gRLRgUKybWnFAI/kBsglJ+Cdi8yCTOH9guREug8ecQt63NhgiCl2pl3Q9XeEG1qzqbSAOXktzlZqsITKiBP4dfYdrH7/yvUtjyrD7PTNTy0XyFvyVVAevXNiavEPYNe7dc3a6IFJoG84jhVpOesQmo+t3sgxz9QsdqZKj/X5aKaEEJwoWBbUYp0raKPyzW9fOr7K02hJowC9XlV4d06RQ2sBXS30QzmCJMEdx8iFdGLlMPkuwhuv5Skq/UhUlj34ztrP5ZccNsjAfIhS187obuQaeKB7XbU2azawCWPpQZgwTB6avUx3SzsbXTpYRa0+OCbwCNiehkuvfeR5DI7BqQ11ytmisXiWPC287d3AQ1924Ca/kWH5JDpdxvpg0tvSEV1Wnqf6HLCQESqUfIXhauBRrfjLdgaT0bLpLxLpVLBEpSuasXaWjkEeLeLEX4fC9 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: lGNL90A03DnjMGQ8oEzBrd6ngNR8IAUyHaNnSuD+IU3itX6XlDnOXobM56sztcu680YDkdYXwTSXLaw2MqaGwSP95cosCYtSvJgavZpVb2zo7Xy4qljZD3A4j2dxTr818T3Z/KxR9WYsTbyp5S43Xff9fIYX27O0W6BOoou/POUGsOKERm/oP71xRzY2j4pjxuuOQwogcS1AZkrPHFriFHDaDlpsIWQwdB0yu+ArOOdLmhchZGUY3nkd3JmsfRF/KXEBV9xpOnRHrJITOLFtHw5lWe/Oy1gP0HpQfMucP89b71PtHQDpKE8/0Bal/EZmKTTjTlsrZ+RwzmE1vQAfGlFRgV2qxdN+W9Wt6jaNXO402KWS+DXEsOXGXTikWrLGzr8uAJhX5r22vtVdCJKDwkQogo/nGJL4+/IGyjDbQ2gAEQ7/CDLwh3c+ru5L523ORUXCPSmm4CKbHHVy6Nfaws8+hxt9omL+sFDmgwT0g8npHgsCgrpMzLOJWYwMe5PC+cnBYS4bJrmZclaKWvHb0qRqatGNJOSBwYNMoX2ZP6V5QTvgLxpqLue8Ta4d1jZH1Jby1nbzCikLXeqUsgoiEs425mTYEIKejbJbktqIGKst4gFyi4T65YVEGuZ2JjeNXna+gsO1VGK2xa93VV1SysRNLFZwRbn0+moJnnrKVbAPAF9v1sDsdwN1Rx+wmDJtovf5PJ2dInUvhPUbyuPIJsPJO1DuyTeFKewep3mgB4D8whR/YSqa6fGTdukTzy9dEf3uHZFBrbmNJaNlhooNbkglLlG9oaadaAy+6Mi0MKGmKE+OrAxPXskGIF1Rtn9R572dg7uWx3T3WZp9LhbYmhtk7QMeH5+kw0vKfdVbrJfQKYD9hQ5yjhA15KJ5exjzH5qLc1zIbMjfLmf85eAR+vJi0yokcrBLzL6lHXkVrBfT41/XHCCLoKIRtyYmRLYQOil/WqadZWJsICB5yulpPTBbKN83eI4CM+AE/9Zi3MFNXuHC539C1k6EzVmkkzGpX8JLWpxTikI6AdQ+aUdfEDmVfBR6KdIzekpFrJAlQefyOMMgP0bGHMvL79hrC9hFWI17eoalpFjyzX23A6JOk2JVGJXNFS6lWC0mHjtxoNVk07G380t2uPBLAMXx+dMczJThMS7NkQDNPZKAOKQH2AWNUUv6ny+JjYJ29QIZ+HZNB2z0ontcLF274+VTAtzW5rr0QdUZ3efkN6omAbYcKh9njlXwR2OJ1SN1tJVo+VGW2iEQeMLrbrbr99SrNPE2DNiALbVZuaABHCHAeuwSWMmdU/C4c6oLhNMtJhieGtKh5ZuNdhbis4uc+oj3zw3JsamC/iY3ArTfgK9kgAXls7TMpZnYNXpKFLUw8tl9gZhwV8IgyWliNZ7ds+WxomG/Z5GmLplR2EMRBIn4op/qagW4tCB7IPnQl3lxRj66j8PKm/U3v3nVa0mrIQS6pQAFn9vCloEXRqlCyTdUZuFlxfof5vkvYmFLMbEs28paUeT993or2sjGJge+ObQFkN1lg5sLu8cPxD+Y1pcqI6aeT48iEFc2Qec1ZI36AxeBkVqxh/2Jt8lPWYu2Vi5pp981EfUHR+ZLZJOdg8YTmFkRjp5X76prt6nFyo09PoZZ+50= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a577e05-870c-4691-94b0-08dd4b0c7010 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:24:54.9383 (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: T9mT/aUhMOZVXCV8YfXuQtHlyHEQGLqz1oL1YwntjWW9OjJLKzH7nF3S5nfcKE5vxUSjZOgxaSAOBMaCEPt3BhaTwUKbsSv8qWp93ojYYfQuiA8dPnwHOfdnpe9hmbyx X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY7PR01MB13706 We can get struct snd_soc_pcm_runtime from struct snd_pcm_substream, no need to have both as function parameter. Let's shrink it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index a206a25451f7c..062e2cc467cdd 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1062,10 +1062,10 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) * function can also be called multiple times and can allocate buffers * (using snd_pcm_lib_* ). It's non-atomic. */ -static int __soc_pcm_hw_params(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_substream *substream, +static int __soc_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai; struct snd_soc_dai *codec_dai; struct snd_pcm_hw_params tmp_params; @@ -1171,7 +1171,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, int ret; snd_soc_dpcm_mutex_lock(rtd); - ret = __soc_pcm_hw_params(rtd, substream, params); + ret = __soc_pcm_hw_params(substream, params); snd_soc_dpcm_mutex_unlock(rtd); return ret; } @@ -2123,7 +2123,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) dev_dbg(be->dev, "ASoC: hw_params BE %s\n", be->dai_link->name); - ret = __soc_pcm_hw_params(be, be_substream, &hw_params); + ret = __soc_pcm_hw_params(be_substream, &hw_params); if (ret < 0) goto unwind; @@ -2179,7 +2179,7 @@ static int dpcm_fe_dai_hw_params(struct snd_pcm_substream *substream, params_channels(params), params_format(params)); /* call hw_params on the frontend */ - ret = __soc_pcm_hw_params(fe, substream, params); + ret = __soc_pcm_hw_params(substream, params); if (ret < 0) dpcm_be_dai_hw_free(fe, stream); else From patchwork Wed Feb 12 02:28:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970956 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010004.outbound.protection.outlook.com [52.101.228.4]) (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 A02FA1D515A for ; Wed, 12 Feb 2025 02:28:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.4 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327329; cv=fail; b=Ezd3GuL1cUozIY1QW/DTD8ArEVBO7p6XfaHpIuDOqm3jkBSMfjCDsNW5csKFvBHplAWtJPViHhFRQWIMtGAkQYXpQEYeigLkMapcekCWanWAofgnhVwala/6Rf5PNdoplB3legH28otWd6dpuEi3qtQzhFgMJ2Nwl58xVHPrmY8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327329; c=relaxed/simple; bh=EkXW7/Z1SiP/0RS0n23O0igm6PpjjjgH2tP0TWFCjzk=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Cu+GVUejuNfjntgTGdxsqqYK3yJ/v4AnuCatOiLBPrqeP4t+LGMkarZaNhRIbc2PsQ/PcE00tlDszxeWusVMQuuCd5edMifDtj7/1gEMlieyFfr+Ao7YqYLxos7Md1Syz1bzCYbCH1V87R2jUoetp63MEhE9vNC1UQ0jZ8sHt/0= 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=mEWzNzNa; arc=fail smtp.client-ip=52.101.228.4 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="mEWzNzNa" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vCBEseNJQGb0nbf1qggCUANks2RJ2vE1Cnbw9OOFy1mMXBSH8UoDWyBhCFBTHpDM2g0bNgYsjWL2vdFEWZKJKdiGlnex0JvWY0makw2rEyK4E7PR/4QBH8dbxtE4SvFalQBO/m1mI0Vi2ODWGVtNFP7tbPKqIcO5AfS0J71lYp+oHuId/pimftxeI186WVwPkaDJELZ058FZJlicVZIC65ORi0E37qlatnJIFzccg2mYsXoig8oCnMuJsRt8d7dY2KWAFLoTuJmshYFEIUtfNS51X91/9NspXsLSBXObXLUsi65Ymo0lfpyi+o87P0DpPnhWDjnuoEg8NAKwrbY4NA== 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=u2olIib8Qg2U8YAYE3ef8OqJbS7+ULw3jxPPMwUBv5o=; b=VYtOQt7UpoNeJ4ETuUHiKSzWQJh7sLnQ9PEqbNMWP+lu8FgHX4TNfKWAzqsXK4pdzHUaF/wryg7+UUvoay+eVwAVJKOyuGWrp9Ew6sO4y66W3V2u+89u1VzVIb6nJu/eqNK1SNe526WiPEYQ/JYPJHmcqmm6E/ZQVWW5euOb5VYGLW/nqZJT8RWEDz6ZGJ6TcD0cG07+JNYiqdaezV9kSE4q3kRxcFdHlKpxvofZnDtN31Na6PEdgLrmIlckYJry5gJuyif6vpK9pE+3/ff9vjW8ZZKit/HsN0oGvxglF0WuD5fFE7IiIXHRlvINPQ1X7yoDYISNr9FB9UprAJH9+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=u2olIib8Qg2U8YAYE3ef8OqJbS7+ULw3jxPPMwUBv5o=; b=mEWzNzNaYOiGKD2qmxMReW7Rn+gbrtsbfvhv0tbm33V0NsTDx0o9267aaRraiJyUHZlp9nzidmz3Dk4Nt9UcZ9jO586JHzlrKqqGBCCbX220heH4BADOXaRarIyXLR1hrzqHmTHgF/5I+tV1SjIv4jPOKIUwVwkxDl8RqTnYO+M= 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 OS7PR01MB12096.jpnprd01.prod.outlook.com (2603:1096:604:260::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:28:43 +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.8422.015; Wed, 12 Feb 2025 02:28:43 +0000 Message-ID: <87ldubyjz9.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 09/12] ASoC: remove update from snd_soc_card User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:28:43 +0000 X-ClientProxiedBy: TYCP301CA0034.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::14) 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_|OS7PR01MB12096:EE_ X-MS-Office365-Filtering-Correlation-Id: f6fe594e-1d67-448c-b76b-08dd4b0cf837 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: iErBO8Y0X96CHIbx54w2Vm7ZSoUSmRWEFxY3YzTVZ+0J180JzhNjx3LAxOHKkBchOX5LismGKs5DwIdM/bs6Nx28OhWT+iU+8gIvvSe2qu3OKnwc6wqigeTghpU/jH91ZfvQzSFdz4GAR2+a0U0fZ+wKYdd8NN6Av0bayrtuHt9q8hW6QyCQ841v+ZqHlAtUSRoeaoa9+zAH6Er4XO9dnSb/TQx6k2vaMweK3ndMUrxtuzVwU7FnV1j3I0AIiU1+g+0LlKxteIzqSOmOOCusUgZ7KGpYca4G77KSFScHbxgzy+WR2M2pyxnDw8dXqJblJ6hh3nkjR3urmHm27KyY0dvzL1NPrkMQLLlgI1BKdpzd9bGO/fGFsY46PdhSX/NgCbv1mcdfV/I9fhxzRJfT+11wwlpEd88RR4MXuD3dMNMZSwbzcf7eo+nZbFIKj3q0fxjiXWqQ/EKHrmpJSsaFdLg8woRhtPtxXb42CS8k+VtRviM9Q42FVIcDABfsb1Xj6icWgqYV16X76uM4J2Xmfh1q+WbiXg/mlQ7w0MB3HyT+goIiciveYq1qQ/T2MRTfhZ1q16Jz0EIMaFCZJWXf2HEy3KmjYmoYkvy6WlBB1HTQz4qgIfqd/cNvtPZUqA6w+mF9xf3h63zP6Bk9P7wCnuoUUyQdiHlGFGhtfXbo/VORo4X+UuYTjtSJDKUH4vu8k9e8w4dAL5VTEfHjWKmrrbjL6jAEHZha7UgpeWQFFZvw9LZXguw1WZaVoBlLJwCTY5P7RQ/bZ9ZHhlpU9bgCSK9AMp3JQZVWBTQYL7kYiEHv020/PUP76/ouaOG/3C/7MXGO4Bhb+fGtRI4YPkHmEX4WJnBBPpvA5yh4f5FlgVKZJKvlL7aDPt8FCenqNeeXB9D17gUYGD2gsqV9Vgn40YFvn7ET9hfP2tAWGMOZyu5Guox966sdS209CM2/jvZ/kWkVEwE9bSBwrUWTI5612P6+EUasmafJHx+KqgQHFvV8jpFXuaEbnSfdfrmSMFimvYxjH3CQE8kaatyWv/DHXRNEMwYpHlE1UrAFm+3G9P2SKEuQLsY6WlJKj/fhy41IlGAYxnJO+gpkTHQTkJJNxZExWSykOjOFeFEdrIx0wRkcZ5mnp0pICQQZ3xZzFsTCQiaZ6cxdoHJHhv2BfbPP5z7FmaKYePz8gfM6sWXPJldVFAL2VIvax6YU/XG4gNCu0Z8jv7nYnC6/qf+WJew9RgVsPvw+VFvtP2I0e5bAUnlYtEAesp0VsJzDba2GC3HLgMoDa06ZXGIOsxsAWJL0HExJAGsAxmRw1GRGq6h8xQOse3fQF560A4GAtnxgJnJHL2S+ifL4D552ctnTh/6wKrV9SpxUTZJOCx16f3Lz6iYaZ/UmBiszX0n/EuuMLf/dMYspO14NflemR+nQvpL/9fNHUus4SXr6RUs/2Ewifuv1/pA3fGMn3qhHlC5ku8e8 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0SXlcmDlSy3GLpXAH6lSGpWTUqR7BlSXEOTj3ht+dvLTl2tJCNRK/RfvVjhlqFbuuj1K2cODlRpnrEv0DZFOGpCq3AYGNBE9Kqdb3JkIjArALQl/ESB/D4GrYKXC3lGjUAmCEDfa/N3N2XFqvLRPbjw9cm0kJukA6MjqI8mkSIYrN8RNDDX4kLg8g3915cimgPyqlTr6TKtYXCfeRSQ1qlZN1ArULrI6Z7inWmC6g9PHCMNF+2FHsAxFCJBSD4moUflTC95U7kuK6Z3IHzFu9vUBkMdaTNCwdv2h9RsV+vIfcsn6cbpKPYF4vD5D5lPEzndeUlc+t1tH56hR/WcK6eeMQVGXQkL/TrTrKsGgTIyD84mkqnLXp4IWkCzwZFlrOTDZAPb/ZOrubqLi7UxCrsyMGB5dau8tMkMuq/KOrUPvafP7zDMonf+8W5ktkTw2o/M53X365HzOIXT7dhycMrFwgpbnHePt+TxR4DZ+2jx2uB2Re4I8Fp9vtrOOyWoXgz70fofbtu4YAGKDB49wy14AV/DmYSbosahNh7Y9R7B9r6MbX6didAYd95Rm2df7aFxIMvBPZ8LeDyo2cZ8+N8dSBL05eACv9WBH+57JXYojl9BnxKbo6azfP633/wRMSRLUhFy5zYpEw7ne1jBRVc7LbcTsbxpxYOPBPkfeHLgR1XEF4BaotQMBJ6E2B0x1RIOR2ngQpnmuzWCzDxMpNZpq8RK2mljxEJHiXowka7fJB9Su+tIsMrdufURgqYG0Zilz8t3w9EwkxKX7xngNid62HWKY95fKqFGoH05GUPgyMkrpQwxF307Cyqw/P7Y4gjTAIhE3B2jrirbg82VGc/lWQkrn5pQBYLeW3L0L2diJxRbseBJ0WDCqYpZYYrJVZA2CUr9bypUX19jNNXrUKlb2wbrJTLNCtc7SzxTKOZNaLAvSK7YPhy+U/heRBCuq2j63E1KW8gUoIWY1bSYPO2OY0kL5y50BuZXBLm9JuA2intrUu2LRD5gMrEnxmJ84h5dHXXowBEH0DwpZ3M9TcrWDRl8CVDEAJHS9dITmA9mycZhbQ+8jBhuC4g2sCPv6aX90aIysCL/ovlw/Lku+YXOXEJ24bxr7prbCl1fPnytgdLR9QmGag4kzpAddpccWsA3z/PscPuBvjQIYzFnOI1LwxpL0H/UbMRE29YVTtGdeMiizZfT1YIuxYzZUrJ8IGnW3grauVYpi/cnk38DLRBpqXrDUThckWN7WEXarKceBKB/eqpyDk5R78wwoBsun18F+RjWKagaqINOhlEm1eGZ8Z505WxZV7dwAL/b6+zduAPvyL6NPLwzhiSrWYzR4a5o3B87+SmMN5684WkftvuaEQkykSsPjhu/IAI4H6o3aUt4znwhf8NCJOj83TMtPixzVjz/LaoDYuWdBf9+0ihGAPa8930+z0yqZ+xILOIyYlZn2vJGfyJa2Eh7WUeosgGmtJlWrHZz2UUuzL86145tx7i4dbq6pHI3h08NmpqNDJVjauPb21sJbh/mhocIMbiqyL1wP3g/KRgvQ6hOXWuihGiHnEl2VlKLtFehX4m3+g9Ri9C6qX/8RMAb+/PCmPvAHWKlbSBOaye7okJgm7H/dDiuZFk0BL0J9+4bRXcg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6fe594e-1d67-448c-b76b-08dd4b0cf837 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:28:43.3750 (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: KD0mHlZUUhugn2WYTjhcU9CeVLdO7thLlNWbbSaJkv32CwIIIdM+jyGdSi7BAA2VnXiD19KaDOyFSlFvI/xiscNo0azKBb+q9icS3npXEbBDgHzrskcx9sw8q1O6EprL X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB12096 snd_soc_card :: update is used only for passing parameters to dapm_widget_update() like below. card->update = update; ret = soc_dapm_xxx(card, ...); card->update = NULL; Let's passing it via function parameter and remove update from snd_soc_card. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 1 - sound/soc/soc-dapm.c | 48 +++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 62c90ef40f1a5..644cfe26022ed 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1106,7 +1106,6 @@ struct snd_soc_card { /* Generic DAPM context for the card */ struct snd_soc_dapm_context dapm; struct snd_soc_dapm_stats dapm_stats; - struct snd_soc_dapm_update *update; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_card_root; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7f18968097924..2a2c1f5941222 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1743,9 +1743,8 @@ static void dapm_seq_run(struct snd_soc_card *card, soc_dapm_async_complete(d); } -static void dapm_widget_update(struct snd_soc_card *card) +static void dapm_widget_update(struct snd_soc_card *card, struct snd_soc_dapm_update *update) { - struct snd_soc_dapm_update *update = card->update; struct snd_soc_dapm_widget_list *wlist; struct snd_soc_dapm_widget *w = NULL; unsigned int wi; @@ -1951,7 +1950,8 @@ static bool dapm_idle_bias_off(struct snd_soc_dapm_context *dapm) * o Input pin to Output pin (bypass, sidetone) * o DAC to ADC (loopback). */ -static int dapm_power_widgets(struct snd_soc_card *card, int event) +static int dapm_power_widgets(struct snd_soc_card *card, int event, + struct snd_soc_dapm_update *update) { struct snd_soc_dapm_widget *w; struct snd_soc_dapm_context *d; @@ -2059,7 +2059,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event) /* Power down widgets first; try to avoid amplifying pops. */ dapm_seq_run(card, &down_list, event, false); - dapm_widget_update(card); + dapm_widget_update(card, update); /* Now power up. */ dapm_seq_run(card, &up_list, event, true); @@ -2332,7 +2332,9 @@ static void soc_dapm_connect_path(struct snd_soc_dapm_path *path, /* test and update the power status of a mux widget */ static int soc_dapm_mux_update_power(struct snd_soc_card *card, - struct snd_kcontrol *kcontrol, int mux, struct soc_enum *e) + struct snd_kcontrol *kcontrol, + struct snd_soc_dapm_update *update, + int mux, struct soc_enum *e) { struct snd_soc_dapm_path *path; int found = 0; @@ -2353,7 +2355,7 @@ static int soc_dapm_mux_update_power(struct snd_soc_card *card, } if (found) - dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP); + dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP, update); return found; } @@ -2366,9 +2368,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm, int ret; snd_soc_dapm_mutex_lock(card); - card->update = update; - ret = soc_dapm_mux_update_power(card, kcontrol, mux, e); - card->update = NULL; + ret = soc_dapm_mux_update_power(card, kcontrol, update, mux, e); snd_soc_dapm_mutex_unlock(card); if (ret > 0) snd_soc_dpcm_runtime_update(card); @@ -2379,6 +2379,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power); /* test and update the power status of a mixer or switch widget */ static int soc_dapm_mixer_update_power(struct snd_soc_card *card, struct snd_kcontrol *kcontrol, + struct snd_soc_dapm_update *update, int connect, int rconnect) { struct snd_soc_dapm_path *path; @@ -2418,7 +2419,7 @@ static int soc_dapm_mixer_update_power(struct snd_soc_card *card, } if (found) - dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP); + dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP, update); return found; } @@ -2431,9 +2432,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, int ret; snd_soc_dapm_mutex_lock(card); - card->update = update; - ret = soc_dapm_mixer_update_power(card, kcontrol, connect, -1); - card->update = NULL; + ret = soc_dapm_mixer_update_power(card, kcontrol, update, connect, -1); snd_soc_dapm_mutex_unlock(card); if (ret > 0) snd_soc_dpcm_runtime_update(card); @@ -2689,7 +2688,7 @@ int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm) if (!snd_soc_card_is_instantiated(dapm->card)) return 0; - return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP); + return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP, NULL); } EXPORT_SYMBOL_GPL(snd_soc_dapm_sync_unlocked); @@ -3358,7 +3357,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_card *card) dapm_debugfs_add_widget(w); } - dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP); + dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP, NULL); snd_soc_dapm_mutex_unlock(card); return 0; } @@ -3447,6 +3446,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, unsigned int val, rval = 0; int connect, rconnect = -1, change, reg_change = 0; struct snd_soc_dapm_update update = {}; + struct snd_soc_dapm_update *pupdate = NULL; int ret = 0; val = (ucontrol->value.integer.value[0] & mask); @@ -3495,13 +3495,9 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, update.reg = reg; update.mask = mask << shift; update.val = val; - card->update = &update; + pupdate = &update; } - - ret = soc_dapm_mixer_update_power(card, kcontrol, connect, - rconnect); - - card->update = NULL; + ret = soc_dapm_mixer_update_power(card, kcontrol, pupdate, connect, rconnect); } snd_soc_dapm_mutex_unlock(card); @@ -3568,6 +3564,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, unsigned int val, change, reg_change = 0; unsigned int mask; struct snd_soc_dapm_update update = {}; + struct snd_soc_dapm_update *pupdate = NULL; int ret = 0; if (item[0] >= e->items) @@ -3595,12 +3592,9 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, update.reg = e->reg; update.mask = mask; update.val = val; - card->update = &update; + pupdate = &update; } - - ret = soc_dapm_mux_update_power(card, kcontrol, item[0], e); - - card->update = NULL; + ret = soc_dapm_mux_update_power(card, kcontrol, pupdate, item[0], e); } snd_soc_dapm_mutex_unlock(card); @@ -4522,7 +4516,7 @@ static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, for_each_rtd_dais(rtd, i, dai) soc_dapm_dai_stream_event(dai, stream, event); - dapm_power_widgets(rtd->card, event); + dapm_power_widgets(rtd->card, event, NULL); } /** From patchwork Wed Feb 12 02:28:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970957 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011063.outbound.protection.outlook.com [52.101.125.63]) (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 D56611922F6 for ; Wed, 12 Feb 2025 02:28:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327342; cv=fail; b=TUkIsQMFUmL8k0sh64OwCvJ+uW8+N2VIewrZZFbqTXfK/ugVTETKX2Pnj8PQEQXWrzUedAbmIgoumQOaOmHcwGFLlLt/qBVXhQZd6sQ8VEqwB8dPVV+ZZz/2tzjmPqTvaIfp15EyDHDaDTb1CJy89UDHWvKtp/VJ/0Dzcvw8AtA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327342; c=relaxed/simple; bh=mbLGCqedYKil6O6+an82oDRHZt7qpiM06e6WcGwYb/k=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=ZWLtzl8gpRe7GjeMmCDatOVTqx7Wpwcjh0AjeUMTub2GAHdxgbEqPU7MYUDIFl0eM6lch1uKnPsqQEDDjV48Xl7dRHnUuGO4SD61KbVmIygUiXlJDR3YXwJSjIiL4gDuf0+wWZdXtsOPg0qej4qTMSMS05AF3uTPlB/kUCOlhDA= 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=D7NhpD6Y; arc=fail smtp.client-ip=52.101.125.63 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="D7NhpD6Y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Xl/P/q5R/rVc/Ig0RoLpAhNgfkcMByY3KylWNquKvaS22GwRupCpsKa6Gev6QPxqXR72c1Yszyzx7PXBAdlIS8/WcCOfE+Gp1Mp8Y4rND4i3rmUY5iOcZBbGYXglo/ba9S84jNG9GTfJrk9VF1DIar4mEeinQGANqi295dereFSSenenTcINeZYA9mzy0yuGlaRVSkYxhxdPo7bCsTtAimX+0E1fV44iKBwm0+7BW1BVn8hsnc/FmjtnXJLym7jA3JV+qDGqmA6JuwK0J/TzA8by6rBkoM9CVZFyoWKOOD3aX2IiPuJDf7IBghHlGvxwZ3/65aQENNI24lWx0p46iA== 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=3O5yiDDl3sP54Q8041Gb31u19OYpAbfEK+URGGxsjS0=; b=JjwfleqGgqYb59XnDOl+sW7eVVv5WT/JsTde25j1espTOOHW91DyXSsm1kM34gj4QLf4/Z/7c1ZEOPfKFYRLtpiTPP6vXzmtj2Hn5XILKXKlKgmkPRSer/83O46MuO+Ba03JyrKNQ4evev+ieNwk5XxpiH1fEz6Y64kc99jZEffDrs7obajlv3LVBGA/yceszrvLi5H0dmHM7EEsXx3XBY46BJ+Kt+iRMXuwwTiq0u8VqXZ2s2DhR+zxL2Y9KgLItDpX6VOg8Ny8L1g8oWWRFj0XoYapU26xCsGDAH3r61QpwuakkZ8zC3BQP9e2Ot+i4eTN+0Baql+FhdxEh7qdoA== 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=3O5yiDDl3sP54Q8041Gb31u19OYpAbfEK+URGGxsjS0=; b=D7NhpD6YyNsCm9oVpkRdioXEqq4qLsiGaraiLTAtLmrLdSRzrbn1FgFs59hhOD1IC7EylJ/OAoBScNOYajeH/tO9zDtxDrlzzx0dsbp73quEHTogCdLj+DzjW/KFZik6q+5mtPhglFtgJy0ldxc1TECukJNv3JpRj6ZRw1UeVsc= 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 OS7PR01MB12096.jpnprd01.prod.outlook.com (2603:1096:604:260::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:28:57 +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.8422.015; Wed, 12 Feb 2025 02:28:57 +0000 Message-ID: <87jz9vyjyu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 10/12] ASoC: remove dpcm_process_paths() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:28:57 +0000 X-ClientProxiedBy: TY2PR01CA0001.jpnprd01.prod.outlook.com (2603:1096:404:a::13) 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_|OS7PR01MB12096:EE_ X-MS-Office365-Filtering-Correlation-Id: d7878213-fd9a-400e-4f7c-08dd4b0d0099 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 6wL8hEdP9pChu7aG9M77ZEX6CgbxWk4ZQND8YrbcJjFQ1xP50XJeiVuHJyoU7HeQqx7w7fjJz6HsOPMYy9kOZeKxOj4q9ifhigJimOQfYRsuTlCmTwutkE0vESh3Lp8AUdo5l/u79ZKJsu8po3InWv5+zt+xJStl5moje0a5Cj8IJtCXH7E/tNfRHYmCRX3qops8R2qIt+10GZ3c9ztGdFjneqKaL0ESz2lZvxI8AuuWKEdax5UOBPGLSjRvUqnS0PBjCVXJNlWq3gKUbzUdyTbiuPJd79ggm6INBsBGHjRqd3mNXdRJ6hOkp3/VxP6osv5z7woC3K+pbYrNSLuaLtu6VxIfLr4XXdANNlRdU8OwX0ddSyLw3VpE7Aj0gnjo5kVemTk1zma2ZDhkxEwlQ5mdYig63IsleII6kcm/DLbhPx0mZaZTl/pqAm8Ma4T8tH7m7pTS0bpokIg9qdaYs7AvJVCuy+XB9B0yfCwWGZUYitBvZW0JFUcfNRiyPBgpn/+g72BfrlrveYRpZQ6NTHiWEvihB70FEsxaCLw/j441SWL4e9JukU/vJyflcZXVVSQx6AOBzdcU9TwTlRhxyi+SG8F0/IkC9H14jneEqwI6w2hDMIr7J9R2R4MBnfnrFU97E76nvHcXbZPRg753y414JsMjQ65ICsyHyYtNxme2hBae+xM9oZukN18J3SGXYUG0ZNFeTUxIXdX9nJZS0vcbWsG/Pq8Vdh3rWlwIW8PLEHVvqBdprOK1+0z7LDNsC2AjMwGCXjmTYcsb7+t28c+zaGHL5aBvhUCTITTVJu1x+IMFjxM9F0HtK2YmeQJQLPjiLsDupfTwwISf9zyfOwhycXh2smFSq0CNjdgzBk53rrjIplkgygPcVDXhN8koP9IvMuRQVVRCxPma6lxeMWD2WGHxUW/asIQjXo/gpxERR/s3ibyt/zoVOC9wKtz2Ntc/lFNEal7eBtqDc0vKILaDFqErzgBeBmUwJ0cel9ziUlXbJkxGBzbbEWyOuLX47dKb16F1RITofNF2EnnOS/uJ+3UjxNE3XX+ZLDFjjdDv17lj8LnsSmUy0sz30varLfdYntW/cbeoT7avL23ehuYHK0X/68WULQcqB366gVjgx2pBeeEWoCF5WmENKQlfh46FJUfLOIqGRFF7WptoXubKcgJqwQ5/iInAdov+D4T0Jmx0TDcAbx30u/YSul0LX71RtJeR1vwnrn+S+NXti3d3TUsNKUn8o31Xapz/0J/UCQZcAZ9Xd9hpjpTPSwhoM2VFbE736qsiaVgMQFQgUKigPqgeEWL7zVtMXoEqVLvfQYDP35STllu8mBvhVGpCR4q+tLISnPQUqtvEyLcQq/CsQEY8BAmFvM1Q3smX0t07YDM6nkYkQNcpsB0JJfuJbEFt28EQfQbzUkus8YgEYcW8XPpz1+5Mm3kQzNWerULGqgxw1+5VUbypowhEx/tR 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rZjOXNMFKTAQBRsJ3KI9lG9Y3gRoUwOBlT37qAOY5wIqmN4K5pydNcseGvAkKxSY7dbpcngo6EQSqp5SM5AyWUS9NsMjkt6yBybCo7WarQgFQYRxAT9iRpbO/f7qlS8eZbuxtTW62dosGgf5nk1CZKyc4MTJ2ANatCqx6zAoNuBKestdohZ+fSbXnHFzTbKPsaZGGKmEnESWBMuvISE5Fozb+OQJkhYqJYlOJJNsq1SDxPCJywfDCNh8TgNXUkgjYJpcylKgV+RoIiAeynJLTVDEIcryPelLJU7Fgm91DW9y2WQHSwyTBY8rbf4c4KskonVh15ksmYi2pSFHvOU6b/ExsiNqgJuMju/jyETWEHTeuQrAFhoobiNToRAJQ3AVNlVBMXiHyNR8REwkkyIg0Idh6+GB6cwIbj7iTPTeYs22C4a+6iO/Et0i/Uar5/T8knxVf+DAzxF9COL4cAn2TlN99DmYYdWQ/7q7TARrtEIOHdOr9fRgw0rFsq9wl8Ga0gdG29/WDv1eb9Ijql9tUknNNViIwBLY/OAX14rErnZC7lLBb212LwzCAA39hdl3zcw30Mf+TIPE5N0Zv959oF5Je71UXwd+fNY2T5hNXNdsTXY2PwWzgC8WyPnuTqOhxWqKBeeoStOj6Stf2pbmqG/t36tGw7YIEmZsDtZwT0WX841w/zEGZ66wLzlwxkI2L9FUdwm6WP+8wslpyiz13nomstMsEbDbZ4E5Xiq/d+q586/wgIeTjwwMFl9zVqvwaigX9rjZlcUPJNi43mg6FCKrB8V/Wss1/XGmbvFAGnPaLZXLU9tLKuk0O/IIWgQ2XIRAuRTUzjFqa7YOnYnj893hpG3OjgUEXQdnlyd5Hja1v6rUe0fSdMs4BLa7+Ww1SlQKOuvCzpiVqW6lY4F0T2124N9VYhdktHvj3iMnCOfkbepf8vjNZm/p3XBJSq17k95rXsjE9l4TuZO+CP8sCIH/TDizEEZSiAPyo05kanCrpxqltOCTMH8eAGsCwB9hAwldQvI5X8NZA+T1LV5WL2gO0dZwCSG9v/gIa8t8Cn3wRzwP1BJBc7Swfjr9HMaImylaBDbC4G/NDFPRTlQztMyCnLl2bmBguvdTecDyGJF5NUItmw7fBEtioiYad2TlsLgF61EZdcKVA8HKSgewHlay7tA/+4tAV/othI9UxQajEKZ7+NC93YNHmWfzlLyyK1bgcgpFg4RQ7+HtnYptVDMhMz+wsYtr8hxUreOuc+IS2xTRMOhuHbaRVtGzRSoXO4ZBwpaJDN9In4mB5aTSv0k/mt6gZBtFzrPekykKiA6MmYVvzb4kpWL6goXLSRdn8MTUKoeMHjCyApVbCpNb6Or2XIUzMO13tVTGgwKQUhJ/qv/NO8BJRT2RWOwYcIvHxuoOMEKvlLY45Us5iRiBDnkMT1nOw83vJUucHcWYKsdtf2V9vPPpIVqdSApND/tAvDpoWvZ8lzkmGd9MeyyMbP6UJA10ACuvezP2uKvj1QP+po5RlVyNx/l+mm/2OAP+5Vkfh8B6kIn8CUBA4SO8wf3+uyoiv/reIn9n1HNUexRRwrLAw2fdXyEvKcC8IzIk87mXJhkdiBPGET6icUpXsdScfk3BYxxhJB3z5yjnrB4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7878213-fd9a-400e-4f7c-08dd4b0d0099 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:28:57.4151 (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: 4gVOcTUMALWBAWuQpggqcILL2/Hqh7DCu7TmnmrfU4IpHk51Rbni5P+ool4KJphw2ITc0H4mHQFwwEY/ittj2t97IULWvV/QMnTszr5wW3DYGZMT3nKBO1Xc3X+WlMoj X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB12096 dpcm_process_paths() will call dpcm_add_paths() (A) or dpcm_prune_paths() (B) dpcm_process_paths(..., new) { if (new) (A) return dpcm_add_paths(...); else (B) return dpcm_prune_paths(...); } but the user who need to call dpcm_prune_paths() (B) is only soc_dpcm_fe_runtime_update(), all other user want to call is dpcm_add_paths() (A). We don't need to have confusing dpcm_process_paths(). Let's remove it. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dpcm.h | 4 ++-- sound/soc/soc-compress.c | 2 +- sound/soc/soc-pcm.c | 28 +++++++++++----------------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index c1b88c3b78356..af24665e37e86 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -132,8 +132,8 @@ static inline void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) int dpcm_path_get(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dapm_widget_list **list_); void dpcm_path_put(struct snd_soc_dapm_widget_list **list); -int dpcm_process_paths(struct snd_soc_pcm_runtime *fe, - int stream, struct snd_soc_dapm_widget_list **list, int new); +int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, + struct snd_soc_dapm_widget_list **list_); int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream); void dpcm_be_dai_stop(struct snd_soc_pcm_runtime *fe, int stream, int do_hw_free, struct snd_soc_dpcm *last); diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 563dc0767c177..01d1d6bee28cf 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -148,7 +148,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) snd_soc_dpcm_mutex_lock(fe); /* calculate valid and active FE <-> BE dpcms */ - dpcm_process_paths(fe, stream, &list, 1); + dpcm_add_paths(fe, stream, &list); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 062e2cc467cdd..96776824d9daa 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1550,8 +1550,8 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream, return prune; } -static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, - struct snd_soc_dapm_widget_list **list_) +int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, + struct snd_soc_dapm_widget_list **list_) { struct snd_soc_card *card = fe->card; struct snd_soc_dapm_widget_list *list = *list_; @@ -1616,19 +1616,6 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, return new; } -/* - * Find the corresponding BE DAIs that source or sink audio to this - * FE substream. - */ -int dpcm_process_paths(struct snd_soc_pcm_runtime *fe, - int stream, struct snd_soc_dapm_widget_list **list, int new) -{ - if (new) - return dpcm_add_paths(fe, stream, list); - else - return dpcm_prune_paths(fe, stream, list); -} - void dpcm_clear_pending_state(struct snd_soc_pcm_runtime *fe, int stream) { struct snd_soc_dpcm *dpcm; @@ -2706,7 +2693,14 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new) return paths; /* update any playback/capture paths */ - count = dpcm_process_paths(fe, stream, &list, new); + /* + * Find the corresponding BE DAIs that source or sink audio to this + * FE substream. + */ + if (new) + count = dpcm_add_paths(fe, stream, &list); + else + count = dpcm_prune_paths(fe, stream, &list); if (count) { dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_BE); if (new) @@ -2798,7 +2792,7 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) goto open_end; /* calculate valid and active FE <-> BE dpcms */ - dpcm_process_paths(fe, stream, &list, 1); + dpcm_add_paths(fe, stream, &list); ret = dpcm_fe_dai_startup(fe_substream); if (ret < 0) From patchwork Wed Feb 12 02:29:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970958 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010045.outbound.protection.outlook.com [52.101.228.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 875DD78F4E for ; Wed, 12 Feb 2025 02:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327348; cv=fail; b=gM58QZoZdU7YR/tvpfIXEwW8l3IoqjVyEfiwLXFKK3Okl/VuAlgdYopS8H8StmbjSXIy1yR+94btXcNj848EVICGVZF2phSRZEwlnomAKYGF7OUw66BcwSSHMhf3GO/6lhAP6ZO0L31n7demLTMMwAMe9SdythyrJhEy50uvyv8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327348; c=relaxed/simple; bh=PfjRVBsFVqFoSQVTNLhhZEIu/FT8q1mzLa4bLzv00+4=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Zskf6BLiu3wUo2L0MlbQr67GSZbLBLipSqVNE7hhYi7Hh7mMtPIFvF3Q9zxws/VkUrLLHW2xcOL5mYs9OUgZvlWmdt01xszqiVgnKVCqdFVTVQzHDuMVSZaVzjUL3sY+jU7XNnfeBgDJuxaCQ9S0A/gvFkoqkOJIFtj/QeM4B1E= 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=h4NkcvHN; arc=fail smtp.client-ip=52.101.228.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="h4NkcvHN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z/c4uozuxTDotpSLJwsmrv3l3QpUOYNzZCIWsTVKltyqlx0liy5L6hoXbJN6j5iNrcbSiAT25SDiNlgDXjRCgubpIxr5pxfN4p9nssMngmZCh8FxIb3bocw0Cnt6UZtRs0auCxbRwp10+75laUeuyUK+IsEXC5A09usveZiA67CsVID5OR0NPbVG2IgxR5CwDdQ7viUyjhC9aAc87jIzgtRdXXUM59EwLmax7e7HGNc3tHC5IsKOYyBVzh8r3h45JWmHfNwFKtwCQ+KxetPeyxkR87DOp2dZx4PV50ltpAyfusokCy+L2lDKtGkLG8OMVlbMHyWF2To4I0l+5W03Qw== 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=AjAIhSt/tYsCk4rT/b6+y7XSxzcKvHMyuO4okBZukmA=; b=nXjV2njSz4UWdmwZoMlIgpLBH2RPQh1A2iDGPGJoYV4tALRf6gGTnSTPrDdEnDdYhicuiaE1yNbf9HDOaY157dfiEqr9pg1Ec5TrPKZDfnV2kLQBeR2+Qn2vRh0FHQF4VI4VsbwpwLmwWU2Nj06G4821roKGOjWBwirI8zTOdL1Q0Ng/Eg6DPN7gVE7l+K2BSuK6biLx7tmr18L70FEjWvMNMV2WwypsTQKPua2ElZIPTsyoaerXjz5WKmQV8gmX7mo0Hh9g14XqN0PXXTqU2smLA/C0+84kLJPjmFpYhV9PZVFyfLyE/r91HStXRraBmC4+C3AbWqWMgEg/BnRdQQ== 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=AjAIhSt/tYsCk4rT/b6+y7XSxzcKvHMyuO4okBZukmA=; b=h4NkcvHNO2HYLzWqt3R02rL6pGc4d+itXAy+4j857nuMNYQaYCp+1pE/FMLR8aS473u2xruzNUnho++i5STWrcaoFlk3vALdBOwldSSDdyJtJNFU/JAKoEyWXNX5Qu9GzBdu1qAfYR75cEeEaJyS3+IpD/DsH6U+vgLlaz29kBk= 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 OS7PR01MB12096.jpnprd01.prod.outlook.com (2603:1096:604:260::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:29:03 +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.8422.015; Wed, 12 Feb 2025 02:29:03 +0000 Message-ID: <87ikpfyjyo.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 11/12] ASoC: soc-pcm: cleanup dpcm_dai_trigger_fe_be() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:29:03 +0000 X-ClientProxiedBy: TYAPR01CA0039.jpnprd01.prod.outlook.com (2603:1096:404:28::27) 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_|OS7PR01MB12096:EE_ X-MS-Office365-Filtering-Correlation-Id: a5f59063-01ae-4687-d368-08dd4b0d043c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: kaLljiBCUtfW7dhHt95A7sfPEURFb2Jp9lKK+Uj/LSD1ffL/DPzTVvEUWSBcldAIcO4t7JCgO0boEEwgb4wllYdylXOR3noGnyq/GxjZHa8Dwowl/L4X9Fzjb/Crw1EmN/57z7wwxYk3cK4t4FtxNrRDTkxJqnQjHa9JMwkeYBxgUZIe1QiURvvUY0FQYQaehEMrP7BAMsSjOP853IbpcgbMItozz1WoHXPE0LfEa7lJjqgZDcIPHblJMDhkX0ms35ipX9DNYHNRFJSkgelUkNUPPMWLUW3RkvxZq7FebnH04Bw+ffzD5tgkbmgutX2bGVf397UZ/szqsSqKzNqIY5MVSOtHiLKfHnNaPUQUy21L27Qldxb3aHQNvCH5jEtByTpKic1Qu8Bhi/LcgGweIhhNjNZ+Zf5YKYWA1PExH0SHuC3Z+NUBwB7BT8lWR6Z2U9PhYGlAfyuwMekEPhyxCd2L+f6s9K3MhQrmD0/V7uJwg0Cs2rGxpKTbOH78Eq/ydacbHgSVeILWIqtMLg/ofES8fzIhytbhjYqPqdIMNcNXG/2Rb3dHDc9/jP7U448QtWMLnuOIjcV/9/LgZdtsvvfU3uqXXCSvHxPKUI5mAvs2xYlmjVPz7WJJcvntVSgPwWoYkIP6bIkoVQwiJ2JVc8AfX0j27C5Ne9iYdl0MGdydUUGwrip6+fOZ6nQVmvpWBlFu837BSD1VjRN2InOjefAo0EcyoUiqtQQu46IfN+IEoMSDP+xdM9g6Ot2Y6oggABrKindLz9czfVrmeD9SNkRAaloYStSZq4oR0V9Wk3ZW9W2eD8mKsfykrfr7O3fRelKx9mzN9cO/96K8GaAMGRycT/1LWUH5fKt5sd33hAGcbPuciUGaTlg7Xfqz8UXA+E8D9q1sx62SbnEp8o66sEyylDtMNtQwVGnarNX4vrVCEjD7HKU+HMgEj6mtx6ulxhfjt2x9kdm7T9bOy4vn/9fcSPdQ55M7Xim9hawg6zPSmQlmgKjZNshRP6Swlf0XlamPqMyzfcybOSvs+5DZjKvg6rT44WH7HVrwCzTu8dAHZ20E0SAVHjVCNwYzEdJL5Ma0W5HiEaFMABRjiXZUbqc4bX8MUC9YMWWtY8kl57F0LXMJ6pUk2AVEhZR+PxJZC4KVccrWMGuEeSxNJMZPeEdRqgsS/hHbXrUl/l7Dqehx59EItZUoVqoaWw0QMh7k2+Ou3Kxzk/fu9aJ7WG0icHSV/52DKK1r6YPdGzl90v2tBHsH33DE35sIuN3LDIMf4L5UKY6MGUXNEEprGrT600dJsW/mzlf4mnV0bU0TXlse/84OJvPvB2iJMYlkqMRXIQBDzQjipQcw0hbutb8Dc2DQX9nkc3da21oO28yAZPj4M8UReD3KjFxD3ne0Hf2yiJBdWyjOjkUMu1S7X4rSrunvzJHWWn+EubckCCuJdIE/tHJTVN+jMWwd8q/tmXkE 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gjxgfkk1I2gNJw6gmkuQD3MfP0kI5dKJMJ7OdbVW3M7eRwwvofIM3+Do1Woq2owu1FpAB0XqxTn4yvu0gQDTeXz06Ppjy3BLguXKnNwI4/zY7S1jnwvlTL9z3tduDpVQ63RJwKfl8cPAJ1aJxX6dvqAOTRAM0x2StxZEJl2GfVJRa6cGvuvlAn189yVEQ00Z1/viWZxmrwi7y2Fg2gYvPV5qIKoc6RRJDXU5mAaGPh+o3LL4I25u8fWKyPdESicUYd7z73132b7DKgzlqqOf8jqGIGQj4rWtVjeHoRq2g0Du3kyoFOLhFSqrbjqqQ+vRVYgrvJilrUxp/oOYqO+EHwGx8mPxwFZat0x8K+7UyDzMQg89gC8KzXEgPyHaTxXmaOEg2a87hW6tH7jS0GjpLXmK1gYqYAAWMVwmH6mGiGNv8VvsWswY5dQtr4PSPyWf2REGQ3pKZw/cVVkeTnNxZQcnQygS2JOV/BH/6N7ZFhJT5/Pz9oLo9hXLJlI6nyoPG7qMS4RbDA/kh6b0tlgXMAdYVUvl1rLoybWnMID8it2TSZNpH2lNodnQdLEuUjuOVTFh6F1WzS/qHQMnBzQV44OCt1jDidH5B/EqLE0pSWCj8YnbY3/soYxjcOv/15/yT4JqB6/WUuTrGZzBAGbtsRp1jFKKKG+s3/hd7cYI8n2/oVP+9dWQUs5gQeEqW8B0Nh6Gs4+1oaB+1DS3e2LKbNTOfRSobedSl82oaF15aNxDtRvZ7RRxLuqT8lezJFYJmKIaYUliwsFwYxaxQ1CnKEeboGUMLHpnn0jRinG6/u6xeYbj/g0uoH/27gBp7QW4rSEeSiyKzDxw05RLL4q38O0Na6dyuRQfS/jqRIcQf8OK+ml3BHqHSacLGGxoHbSgK/hIDXn0ufG1BZvXSLr70yIgSF5gKQf9HNJlxo6l7YyLT0e8jUmf2QftOtuG+8ywuZlLyDdBsV4dxeh7GqoDBYiE+0Dw9oJxdG7mVHgfuqOr+32+1aptpMsJs4LR87zU1pnvbpq5rsZEsJAGo65/04OC0pHFI1Jc7DDbQZY3q+20fw7Z2Hu0/EVKnGULTPMq7zIbDYh7vkp8CxfN2kjRzGUmXRnoCp9/0J9nx1f5b7fcTDliTAWD5zpagt/IieVmFz0DmW+KBDYcYphdJh0KkHpl3FrzZrmljJ8yGj9A1tfwCYQgJfU1lfNUJj3e+u62v2eHY3FqutnNdmxuXnBzc8PnLV+ZSi1Uer2VDNA9g1/0rivZhbJ4LrgQvAIICqFEwXQKiOLX8TawVRcFGEhQDzbyaX20er3jNGO7oP+oR6QS6er9vJ9/vIhdoCfZENMbR4oCoW/JdD39Npo1z4VXju4rsXS7CPPdxHO7GqYNm12c1QPWEwRQocJBD3c8zwDdU86zUgATLFBy1koH7zoGU8/Qhv/LfD7i9Kd8qfRX45M9fDwfUVpbcB3iYZG2a+SNxVz6WUgxDiTZVZsR6aJjf9i08oF8Z83ogG9aVLGvw5TiD0daYTb/Pj0Sse2qdTO5Z2ms52bPtAnX4kqlc20kAge6JItf3+2MT+zQxIH2KzH0Ul84sKwTikUhDpliGpWIYt2uF2S9sLb184uWIe+MloMNqZpIB+bOqsCnD6NgpOM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5f59063-01ae-4687-d368-08dd4b0d043c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:29:03.5292 (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: N+EmzO8nLyjKNPeG41U0thkWkOsUKhGsU4tMGkjrSMlBnbUKvISQxVxkkQQm3x3QjkO/RGLd8QKXgwkmXwT2H+LlKokMwKdOHlYhDF8R/CfbGqsXMgq1DskR+vjhT44u X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB12096 DPCM is already difficult to read, but now dpcm_dai_trigger_fe_be() even difficult to read. static int dpcm_dai_trigger_fe_be(.., fe_first) { ^ if (fe_first) { (A) ... |(x) goto end; v } ^ (B) ... v end: return ... } It want to switch function call order by using "fe_first" for fe->be order part (A), or be->fe order part (B). But the code is using "goto" in last of (A) (=x). Just use "if..else" for (A) (B) is easy to read and understand what it want to do. static int dpcm_dai_trigger_fe_be(.., fe_first) { ^ if (fe_first) { (A) ... v } ^ else { (B) ... v } return ... } Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 96776824d9daa..8a3073a506aa2 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2365,18 +2365,18 @@ static int dpcm_dai_trigger_fe_be(struct snd_pcm_substream *substream, goto end; ret = dpcm_be_dai_trigger(fe, substream->stream, cmd); - goto end; } - /* call trigger on the frontend after the backend. */ - ret = dpcm_be_dai_trigger(fe, substream->stream, cmd); - if (ret < 0) - goto end; + else { + ret = dpcm_be_dai_trigger(fe, substream->stream, cmd); + if (ret < 0) + goto end; - dev_dbg(fe->dev, "ASoC: post trigger FE %s cmd %d\n", - fe->dai_link->name, cmd); + dev_dbg(fe->dev, "ASoC: post trigger FE %s cmd %d\n", + fe->dai_link->name, cmd); - ret = soc_pcm_trigger(substream, cmd); + ret = soc_pcm_trigger(substream, cmd); + } end: return snd_soc_ret(fe->dev, ret, "trigger FE cmd: %d failed\n", cmd); } From patchwork Wed Feb 12 02:29:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13970959 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010066.outbound.protection.outlook.com [52.101.228.66]) (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 B4F7478F4E for ; Wed, 12 Feb 2025 02:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327358; cv=fail; b=kV7GbcFB0Yob4odhOZMrAOGWqHyXLdQVxk3XJDtkwd5HcppE5IIjXYYDmrVj9QuMTyPdYyoiJoi183kWwQOmLZ9he+S6rb0VMQeFcg2fkS30VW0D8jsPlf896bYKfMcZbHge7agEIUMAkqdA1/2xChZcalI+Ko6KbLHDG6yz96Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739327358; c=relaxed/simple; bh=WJf78SeRs9M32iifElS5r2u4RwVk6YkmKOby5JU1wps=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=d4DRdLxE4rTIOOjr4K1PyT88qHElrq/ZWqY0SwtPcV+D9JNp9fr/KRsIAP1EWgKRcTyDDaFuWP1mKaUgYMnZ0rtilco6/b67/SdL0wGhX8Bd2tmkj4LdUchEPlYPJbGwMNlDCUGEaHwPHzA4pU87GT9PutNpk/NzoTndrwZq11E= 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=EB6h5E+D; arc=fail smtp.client-ip=52.101.228.66 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="EB6h5E+D" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hKz0mp2zX6Xap/8my/0or3nzROV5VPKz5RNFein0i1Dwsdu8GJwLPnCP6TsmKItZTZEFbjSpmRQibiKUKCFUPI/4tvy1Cb2Hhn95gADM/AT6V2rZMK2WtjnRVPN+5v+quUO6/DO6iwoyxsC30U9+g/gQvLnOX5o/Jy3QYMHGZ7kg8rSDqE/xmQty+NmXnlaFHgsosCGVRQL9Fpy3XJB2rKiym0xqRisIziDR0gFgKBu6HukjgBGEfGw9yBhOD+6dOkUzryMSizkchlkECW9kZLMN/Mg5OrxqyJi8lWoImNZF96vajXOmK3ayBLVPMXtFup1LlHI1PiK5Qr6c8PxADw== 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=Fni5xxspew2uovCi2hGEtx+lE7LpBfheEKOcZaf1hKw=; b=lw2RqVptZXrSfEW4ci879bAe4PY5z2YER4kp105JI6QfxzoaTmSiD+XnqkqZdm6i5GRsgUdELjdtu0DHJULARpOpzzdQM0YpehJbCV0IRu64qDtiSH8kQachhuQXZaOdDMIWhmfcibsX1J6ZuQpYWqB4ee7W4X4achIZqZYArezG4+ru2L0I6wQj6PJ3grNjSXlAFc/K0dnWqiyiasmzcXCSD0CW4YOE+AEXjYVib9nmGrHN/eOOtmL4bB3tCQ8MVUcfMFvehLeFTUmF8FljtDlDnQOvy25hrKNHWDa782jCsA7F8gbg5RIVmDtMMYmvt9+B620BYuhXdz0zLWthzA== 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=Fni5xxspew2uovCi2hGEtx+lE7LpBfheEKOcZaf1hKw=; b=EB6h5E+DkAnsqVuAIGawHGiXwyWAoVo8wO9A2J/y6la0qICtX6dJa+zb/WMqRO4+9+sx5pvpK3qKcFRqYbUrsiE7HAwYyCAEV+BW0qYwIEm7Vi5wcKG7+jXbxMTFeHnlVUKRnOv8g+i7CbjJuMWcLMrOvf4JZtfS+hbZGjyLv+I= 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 OS7PR01MB12096.jpnprd01.prod.outlook.com (2603:1096:604:260::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Wed, 12 Feb 2025 02:29:14 +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.8422.015; Wed, 12 Feb 2025 02:29:14 +0000 Message-ID: <87h64zyjyd.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 12/12] ASoC: soc-pcm: cleanup dpcm_fe_dai_do_trigger() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> References: <87y0ybyk8p.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 12 Feb 2025 02:29:14 +0000 X-ClientProxiedBy: TYAPR01CA0045.jpnprd01.prod.outlook.com (2603:1096:404:28::33) 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_|OS7PR01MB12096:EE_ X-MS-Office365-Filtering-Correlation-Id: 83d451ae-7307-46af-1fa5-08dd4b0d0af5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: j6teuc20EIPuglV+/83ka7GSDYmroQsF9xNFDKpS7JMdbJZMBh5YrexFeGBLqQNl7PGvxLC/t7fQxDYZ15L+fTrtom6UG3OOc8HQPQpB6rKQBpyikYWNNGgSOdA+GL2ANWmJB4whxHS/gotywoGnYH5+W78SsFHMIS1jiQqPLC0D67HHe0SqLLB2s6FpevGRcU+0HPEVJXeepEdUR5nYSuFlb8NPfyOcc6EDBMRHJbh5xbu6BHt1pz9fHjjh7FUpLZouzW6pWnWHXHU2XQebLSuCRieR8+I0BziKLQswW3BhKpNtcfXx/5MnwfcpJmAQPCAyp4URuIxsnugmrEq97aPyl4dzNwQi/1YTpfhdvcrTqyHuYmDOQ/IpN8evVKDG91RKcKf8xD7UTIG9ceuqN6v6ApyW7xfY0Tg1UEA40kc5+3dQ1Sg1rMIWIYnNuoCwrn12A79K5B+VmOTnccTtT9iKMEnpcRkUKPm7oGDzu0KDgUDqFyG1Iv+QWPTrxT3Sv8HL9E2Z/eK/BpqO3lagxzOenK9KNDfQeMZyY0Gd+kdeMKDBGqRdzA8hdADrI6nSuJcTzYv1HAWD+N7xuTr1kiPI9j95c708OFHxWoNj/A1EI3NSZSR5uwjIezHnlf4EuUr0KeWTIUl6mykI/3dirHg872SwXj7uV6LdKEnr0txoE0RzoDtTyw5Oy77NUTnDeKMI3G2voFqqdNR3JpXQ6U6Tmi8rKUGDm0wPibc4onY/bkz9cj9CtjYg0ZPXuIX1zm5BbRrTgJlOJf1Tv69FT5f6Jtawo4acNHkAOPpCoCkVsAuxK+xwdvbe5uyhGQ/pPQmvuTE0HTL1FtZ/HhBZHJcBZCdqIUzY+0j42YmfmY7NzN5M97Yo/sZhEmvtGxO9yixHx7Q6QGk+pKgmh9hJ6PJ8GKUBRPdtlR5tfhFd62Vtj8cmVRZJ4padC97Aux9EGx9TOEbAOOx2XS5BsKb2TsvrR99xD7bEJj8h54wGi+cTQOcaxkeBRQfNM1hBwMhiEEhQwul/n2bUuulk77DcWCV4S81Jb7gmQ1enh5EJjmbrs3zgd13M8+QR0rt7gCQMYy26T+TCz3RfDD9EHAd9miRWI0HrT7zfZYDGvELAezKiJns7bh94UROD1wzRtxdADQ9sdH3JwTBJ7RQqTWhmw3EIljhTo32onRB1P0w6l6ZpTm+H5UHfMtiFkvphf5F4SI5F48QsX0VpbUVWYUKmzH6Rsd6I/kH+mIWDv1VmTUtQkv98sEW4aTx6y+74biL46bXK6QrEH6zK+QhushS2M63OwFIyx8Es8AxWy4HqzYW0vegGYAEwE8YGnRr63yjH1gNsQ//oJ6SBnjiC25e892/LfK6XKvZNXyyCShRiBTB49k9X7PzfRGyMYNeF+hfkS0A86xijMd7IdCVOBbK8mS1KpcmKcOv4zek5K8J/MUabuHDE5T+PdPvchsY/SEDM 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0y0qtQsCDF5/K1PnGecoJyN3hsaCXU7FrWgPqbFb0UDDD6jRjf+aVvXJzxtzp9kciL5xzYLA0mKWPYsO6ji8tKolK4N3N0psfyMMNBOyikkfKdWFKXq5wdMErizcRPCQjErkMdUDy00POZQeAJ9i0omzhUdbsvZHrbpUooKJtQP1g6MuNhO7yZ3nZkqKQ8OZLRxepzZIjdexCsKUdwyQA9RADpn10zpQ4oF4JkcUE3weFK9s4X2XJwdxPQcgsoL4ykjIkqTTgmUxrvYxvBHUdJem8KsI1tnCQ4a5sKe8aAZKNjiZiqquNc5o3aSzg9YTaN2rcoS3kO48mosYpiUka6pMoFH4M+NHwx4112ZsBKHik9Xk1Vk2PD6f28tvYhtqewptEIGqgv8RhWDRnxe9cGVRltmxaUYB/i9amkxJaR+4G3/Uy0nZsl6QihbrMTY10vtGS3+fKV0Qe5GDy5x/MGcuw6OHogzV470eNoFwikRdMZAely9bZcAkWJCs5IpqVKLajccNarQS/M6SoI0TvsiIjb6KduFE2lESyrj6hicwCIOfjCAXC8Pfrx8U73C/xVL22e2bixw7OJSfret+FLeC1pWDIgpk+JO/iKFI5ggl76MroS+/plZcl/WeaYhbiN38DjHdeKoTlSAlfI5QMHUk0HWaZ+D9DlcKetrVm2+tW2OqLAJ9XA7tW4YS0FwtzsMr5yXIXjWUNK88yKKUnbTWzRyX0uS8B+9kNKL01tHA0IlkQhsTXfXdR5AkSKmwNLU2+7TV8Z/gZz3g2wTcGB07/OGjwSeQbEvV/h3+mvgCxsES8+IS0nMf3JIRKfch3t0MdGHrFGldXy6oLcHVG9lK1SJwjOvyUq2MM9W5ZkbCrKS3UGfNe8bVrZ3w7UK++GgdcXOEPU3yk6H2uXzzaW0ndxidIdGxPwObq4ZHgqVoCkNC7SUXVglwYRIssucpfXT4jfreSpvJyHoViQgjxt5GMbZ33HWSNI6dVetyYeRhjy+4fF3cgTs4eUwy5Thk/clBW3y3LfxDoOuTXBO/Omm5N9zD5fBGjwAZio3CVVtS5UrhnJy+x795uV7iX0MjHkD5k6J0HzGy3v5ZoOLVqhcrXG6l2Xn7nJAL7DPUf5uoO2bquokXn52fTl2jJfxs1WwkOKk1TYAskEBFe4TPWsjRqVEMPHhT9jut0mMjNiz8eGYFLxVDqOfR2mVTGezpz42ED8wMX4KmviUAB7yXhB1YlGxGar4UKF4toxVUtRvvM7d5OnNh5TsvP/2Ch9HO9iZ6uwrZvj7gP/h+KSHfv50XvqYWbru49wDgYNhPqvrRgA7lUw5BJMKaURurmIECxy/IxO9G3c1Q4DpfIrPGOpUiGAgEAK3CHaDksy7GegLbWm9dlw6JR0TtDCGjXf/SkNcrhwQ2d6tieir0OZvzFfS7iMoWIo8o7tbYRT7oEiuksfnRvqllKjb0cdLrRYY/3wnrUNpPecoaICucQdDtUPuMsG2iIWIMwh6OtR214ZgayuxbiPKuwnjRtbTC6W2o5HmONeBsHbZCwQC2J/ZcRqdtKJgrIxfg+DphFrcaMx7ZLEojD47RRNyc+0zw7V0hgTvIrCGHWIVcpjX8LEEno6p+B4/o2WXM2u+fVd9dF9E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83d451ae-7307-46af-1fa5-08dd4b0d0af5 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2025 02:29:14.7904 (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: Zdc0GYZHs0rx1hC/JBFlH/R9CWF35HsQCZhKQk84WM8neb7xFdgoUJvr/cIK8zNuacO12eiGov+xKBIts6VBY7Gns2BPnbDEkJM9hSdWCTEcpxajEeTpfdCWenDhxU0n X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB12096 dpcm_fe_dai_do_trigger() has big duplicate code. Let's makes code more simple. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 52 +++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8a3073a506aa2..2a53a2eb4acd2 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2386,46 +2386,17 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream); int stream = substream->stream; int ret = 0; + int fe_first; enum snd_soc_dpcm_trigger trigger = fe->dai_link->trigger[stream]; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; switch (trigger) { case SND_SOC_DPCM_TRIGGER_PRE: - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - case SNDRV_PCM_TRIGGER_DRAIN: - ret = dpcm_dai_trigger_fe_be(substream, cmd, true); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - ret = dpcm_dai_trigger_fe_be(substream, cmd, false); - break; - default: - ret = -EINVAL; - break; - } + fe_first = true; break; case SND_SOC_DPCM_TRIGGER_POST: - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - case SNDRV_PCM_TRIGGER_DRAIN: - ret = dpcm_dai_trigger_fe_be(substream, cmd, false); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - ret = dpcm_dai_trigger_fe_be(substream, cmd, true); - break; - default: - ret = -EINVAL; - break; - } + fe_first = false; break; default: dev_err(fe->dev, "ASoC: invalid trigger cmd %d for %s\n", cmd, @@ -2434,6 +2405,23 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) goto out; } + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_DRAIN: + ret = dpcm_dai_trigger_fe_be(substream, cmd, fe_first); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ret = dpcm_dai_trigger_fe_be(substream, cmd, !fe_first); + break; + default: + ret = -EINVAL; + break; + } + if (ret < 0) goto out;