From patchwork Tue Aug 20 10:22:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huan Yang X-Patchwork-Id: 821052 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2064.outbound.protection.outlook.com [40.107.255.64]) (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 5ECAD18C351; Tue, 20 Aug 2024 10:22:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.255.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724149344; cv=fail; b=tkt19PdpZggqzmKIaYsn3bq/VcQs1wgFfXsnZr935CFvReXDq1LYnpAJpHnMyXNcZs+9Q2j5RB4tHl4qW23L41Qup+ParyC6juT1puYQ2jwE7QeVemaUACSseYk8VODn5nzPDbboSGoz3PQNS6jda1nWpfit+G/UEr0fKdqjHcs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724149344; c=relaxed/simple; bh=+LigA+kHGSOA6AomnYIpDvE9P03BnWt59TTUoVPEG/Q=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=rQoEMzibtyiwhVYwGLk2RzVlGqypYiIgbZ293U4cpIi7gZQVMUK1vuWenfbEf5z0HCP/KyINpNPjNsogU0XlOJszxRBKRz39b5xq7HMi/Cq7o+Am7mFYdQlo6Uu3vQg1bpXHzXvrHtZXgqXKj+ZHusF7QMw5OLZQFZJ0Z8tB6/s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=btIQLVN0; arc=fail smtp.client-ip=40.107.255.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="btIQLVN0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IpwLgatJI9kwbYe9rMzN7C+HKMcSqwSVd7zWO0c5WTa0a7y+TAKbh212uSOiKTzlz5Uyh4WFOwPVl10jKQ70547YAKC3Bpy7oNUbXRq2/lPb+M3e3TaXbO+TgNTkaRpOoD1r+eMbMpIE/2H/0M+5miXJi/IZHbF0lt+73f15YiLLXAGpej3eN4rKsngVlQjiby8PwcayFo+7YETvuYWuptG6K9SMTrYk+vLy+XmAVlLfveRTqco7wsztF6vepEYL1V9hNASpQ+FVNGWIE64yHeS1PmSFR39KAbRkqL47B8JxIQEc0rEnEGbEJaZMWXKxhgTCUzmVGh8LC62HumN/HQ== 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=sj3YHZ2HuFxMk0d+PQ52HeNC+n7cX6y0k5xtuMV/2Y4=; b=OvqgOAkSYZBpnqMzPbFHo2iL1WVwBvIV+8ZQWOaH9/7FWFwQPUZpEh+qGc33cTzS0AIvB6dv5NPhyVpxCJHrsmDX7kGg9Kl54yp3jzz8YO08u+z4hBO2m9hHt8nFtul7t+V1Xwc8CnovTprFvy7PXXRdFkEPmvlg+IloFxTd3As8RmF0K9uDRoVYr5lh7CIJD5tjACLC56c5UBfmHnBGThj7OaPuHxoAuh49I6FDm2wufxn+U7RW1KXiknHe7fcVng6b8MHHj3Qd2HOpinoXLLHOcecsavXX8SzKDUBNC5azApDQ14kZ768GGaKgGNptoQ7byS3Jo4pW9Ja89JVYlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sj3YHZ2HuFxMk0d+PQ52HeNC+n7cX6y0k5xtuMV/2Y4=; b=btIQLVN0tYnv/TZpkz7kDEvh1+72DpR4jO0+kbY32GPOrICReXS05GHMjDSldXjJoYLMBc6ABn9SpPEXFRA38xKQWeMwcpkLc+utZP2UUapSzpynGS/WDYXC6FXflI1X/f9ealL3SISLDt0j26VBvelefRkIBaDeKQg1EmDKEoyhrF+3oeLu0Haw7prHuk1+WZ48n4XG+Fchcuv5N1L/Noc5arb/Dz+MRaAp0EX9VNCavWh4KeXGU5PxxYSRq0GvSyWm9jKaY21ten1yXwMy4hysJ+TDaNgRmeyzvU77x5WmWto0Lg+AtR/h9PDk7sgBfEgebR7lD2rSgy8XxgIR+A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10) by SEZPR06MB6486.apcprd06.prod.outlook.com (2603:1096:101:179::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Tue, 20 Aug 2024 10:22:20 +0000 Received: from PUZPR06MB5676.apcprd06.prod.outlook.com ([fe80::a00b:f422:ac44:636f]) by PUZPR06MB5676.apcprd06.prod.outlook.com ([fe80::a00b:f422:ac44:636f%5]) with mapi id 15.20.7875.019; Tue, 20 Aug 2024 10:22:20 +0000 From: Huan Yang To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com, Huan Yang Subject: [PATCH] soundwire: qcom: Use devm_clk_get_enabled() helpers Date: Tue, 20 Aug 2024 18:22:09 +0800 Message-ID: <20240820102209.131512-1-link@vivo.com> X-Mailer: git-send-email 2.45.2 X-ClientProxiedBy: SI2P153CA0027.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::22) To PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10) Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR06MB5676:EE_|SEZPR06MB6486:EE_ X-MS-Office365-Filtering-Correlation-Id: 075a3bdd-edec-4deb-368b-08dcc101f92b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|366016|52116014|38350700014; X-Microsoft-Antispam-Message-Info: ZyMdqVU/ttXtoePfe+54TWrfB2m+fv6GbmRPN1FjD9tw2Qau64L2KYfCm7D3My+4d6MKMqFSar8a4kOlkYCTDzAPEGIb+6Am8rVkap6Zk8z+Dtv1aOPvZA5fukQLGF+JqpBSQwLE8HqKjnZ82uqmJLAqi70QchPh7mjyFyqB4etbwRrOQgk5O3BU8P9h4xyyrtCqvWgieIHSwa7RfKcyrcCk/SRaHOlMkeqTDwX+maJMvKdTO2Gj/IO3nfpTMl5rawoFn0ng5m7TFAcn+iuSndS8Ks7QA6ORvJKiG34VpUVf3pr07RIfxj6QDjpdewN9wjHQcOavbm5dpGysSN962wFPxCS77Zyt3lj6lMuPvb9wXlGchkyHVGKsL2WsWV0S7qr1uY5CXA6x4u4tJb2btpJ2m8/JqgvaDkdGjMLcUIGQqB3cqrVj17TZvf5DjY1bsdJkdBSgI9+jWjxkPpEPALNQVQeqPwSTXMIUVQmjc1LFJEbrRQpQMOLAmnYGxLwdT22J4ZLR9BpXhhr+L2zWoqSJ2xjgCZMmR+bUa2mCImd0nMx+UN1bXAbUoHdBkHoij+kM8gF4ZpcfW9jbScxREQFbPfaS+gFxxX0wdQQF4Kgf87UvOEVluaOPTs/I5EVtkRJkExRwzkJ93+isEy6kdWVL1GpYZl+3la5PMoPJrsqyO7o9z6sZhZg1ndcrzgObVOl2PoWcRBvh1b88Fuf5lYKiBo8Qnx/HFKXWgGJG5bBy7NRvcd0O1JUPMEC4GiEE5pCMf3SwiDLaG19Fr+GB20Nn9zgJD5rS31wHSSgf2kVpE3TvAx3z8A2AAAWr07wITTLPvvXXEg1vsnILR34z1dBR+U3Z+xqIvNUjZdAZt29I17tCiJ2fg/6MhxXI96cMxK6oYZB7Gg2cta8TNvtCoBnkhrElFPKAQX648kgmk1Zy84FAMcSMuahZd517oVgh6EnePS7ShthQqXRFob901dhJar9qa/AKTjZRNhPSlTSZMS+jRoXb6VC6ubQSDAiP74hRwDIFUBwrllaKC2VSdO01vIdFsqTVTSFG3Ert13kPB8SFa/HtOT9oHflzKJEaRwQoopQldoH0iOKQM0Bylx5Ri2JVW/oO0C1Z1Yqw/DSOk9I/ppgUocLQ/oi1UGlvib5Btc9+zERbXJJw+SR6kR1ZHtpYkNKVkNS8o4G7ix7hWnIDXLgmMne5uVYE/TfkYhnWU0LL44hzs9wBRNrY0TImAF5ojEqQSNXc8xV62mJpx32Sym5DbR2OJoJxpOtSsn6d6UpN3fpNAGbrSf+iDbB7ccW/cZ8/zQLNgjoTYNrre7+qsoQMGrc8RPNS1DmXMz83z3nc5wUjIEnwv/4kCkQMvI7f7Cr33HqEZQ7tlffRG2L32gNPc4VRYpmKRuzSD/uNXHa2X31hkJUXbrNy7w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PUZPR06MB5676.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /hq1w1rH8Ezlu/cIpZEcRCqoRYXElGUQEC3gwh+q44/I+cLPGPgvTFI6g9cvwe9LKEf/R3XNz2TGwIrpbkGfrC8vcAXJHmNJRNJr4QRn07QGuM9tojl79zjNrxXaWPF2p6jPaVvHNJy3Q/DcGL0lXb/diK7R2ZjVJQXuVGXYSnLV3YBVYF/sd3hP4kU5piBeRE02vtRylWmUoTAQW8Qwgy6I+ltaU2UWZtjiZl2yA9IN5Tt2WWRv16ueipP54KCFFqYcHi9hICMcGUPwrfi5oH60jXV7cgLiFxdNllUhrYl3XQSxNI9Hdzy8d3IOk/x0Pvh3lAiqjNCtEhMC2ujekyG7xxo+2wc5skH3tUOxao8aXoNOk+aM6D1j1iWlxrVslLvDI5d8O4bVnaO3JufsAO4kxsM3l1vPGzBLvJ+JPL3OYZFHfa8mQJUsWr+4b2rQa/Iz/YrFIBKygPrLJiu5D3f9iiUCWTWMf1cQmqj56pAIASupZNsYEo5mUbEI7XQEeKOG9/r1y5EWQt8yYip1EsKX/uxpZk3Fz4GjRRdmV56GicPfcWz8jX7ADRsR93SUfzeiUuvqdbWzM7nwx7Kw9IkK9oPfCFYQ4vXJ8rV48krqaUHCZ/Zqx5+FiRZT5l3KL04rHoG7Xubmv63vrXA7vGdxH7Y04JXrIgHdCdFiTVH3c6wuOdashc6P6LWrrEt4ad1iB8y3p+h/wSUw9VHRNwAxPpcdFrJJi5XRc199FVQJayiiZkpVV6anFXhrbDLQUoQZBU5EYmndbIL4G6j8DOs5zTe+ZyWugNz0kT4z9rL9Ych+70ZaTRKvnwzKWcZ2BspT9E0oSI3ji73fOnXYoq139InNLilSZ7AOtVxP1EqvM4/Gys8i/MvlZt0roVWdkIZyqeeMDGtk+H8nTOftbCl7hAxgXrrgOu90g+RHQil6dMvPefMyyYwVSSQ88yC+JgaBjCRUjqw0BlBTdmNqsXDgdBoSJliWNX3OBL7uE2/tWk87WV91CaKLRmRecwhXvshneEm1Sy+0vLa41q+1ocqIgi26yml5xPDAX/MexjTpQj9NXSXHOmgG3Hu5wQXOpEm4MUciiXQGnlJZcHC0cTvaZxjBA5hsR1oEWQvoIqR6BnAM45z6Aml6njBU4uGwad9TxR10d7yhCwyYdHoUk5eLUcjN/lZvDdE3JKGv4C7vVMyOdajJy7YU+p9Ma4yDi0Xjcel+5AONKOCQZdf2oGos2fHiBd4RD3lh0HbxhftGCwqIhuSwndxOrZUdvbnZc20zGf67inJ6/SRXSgszK2Q8EuiCr0+HOmOsQgB/p7FgzEmJDMMaF7ASv1vZOwEmOsNbZytaBdXIgrxDdO7bwNKDlyETB1+eh/dVabjXWtsKUuEthVQAZkKrnBVn+wZKfMkDfAMm5HkasNovW7/pkh+t2n8vNgK93ZgAO8DAdIkAifP2vvER0HmGUtb/2QA4xqdq8tTqH7wppCE7raelrodi95fTfTe7vgFDub6vvmQK3HayKrVFHMFArWUZ5F5k7QTphZWzorwIccwVwWwFWpRuIXbGOV1HtUPZ9Y5Bu1wBWR8mWTcDXzltyHF+kEAm X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 075a3bdd-edec-4deb-368b-08dcc101f92b X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5676.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2024 10:22:20.0567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ir/+L8hDRJ9wCBph6zlk35xWgldhC/JwtaziuZZQVdds1ldYHZpNLN2Bb2JYkEUl/DeTJiupx31bAdiuMnfMQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6486 The devm_clk_get_enabled() helpers: - call devm_clk_get() - call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code and avoids the calls to clk_disable_unprepare(). Signed-off-by: Huan Yang --- drivers/soundwire/qcom.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index aed57002fd0e..2a57ed9464b4 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1527,24 +1527,22 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (IS_ERR(ctrl->audio_cgcr)) { dev_err(dev, "Failed to get cgcr reset ctrl required for SW gating\n"); ret = PTR_ERR(ctrl->audio_cgcr); - goto err_init; + return ret; } } ctrl->irq = of_irq_get(dev->of_node, 0); if (ctrl->irq < 0) { ret = ctrl->irq; - goto err_init; + return ret; } - ctrl->hclk = devm_clk_get(dev, "iface"); + ctrl->hclk = devm_clk_get_enabled(dev, "iface"); if (IS_ERR(ctrl->hclk)) { ret = dev_err_probe(dev, PTR_ERR(ctrl->hclk), "unable to get iface clock\n"); - goto err_init; + return ret; } - clk_prepare_enable(ctrl->hclk); - ctrl->dev = dev; dev_set_drvdata(&pdev->dev, ctrl); mutex_init(&ctrl->port_lock); @@ -1558,7 +1556,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) ret = qcom_swrm_get_port_config(ctrl); if (ret) - goto err_clk; + return ret; params = &ctrl->bus.params; params->max_dr_freq = DEFAULT_CLK_FREQ; @@ -1586,7 +1584,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) "soundwire", ctrl); if (ret) { dev_err(dev, "Failed to request soundwire irq\n"); - goto err_clk; + return ret; } ctrl->wake_irq = of_irq_get(dev->of_node, 1); @@ -1597,7 +1595,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) "swr_wake_irq", ctrl); if (ret) { dev_err(dev, "Failed to request soundwire wake irq\n"); - goto err_init; + return ret; } } @@ -1612,7 +1610,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "Failed to register Soundwire controller (%d)\n", ret); - goto err_clk; + return ret; } qcom_swrm_init(ctrl); @@ -1642,9 +1640,6 @@ static int qcom_swrm_probe(struct platform_device *pdev) err_master_add: sdw_bus_master_delete(&ctrl->bus); -err_clk: - clk_disable_unprepare(ctrl->hclk); -err_init: return ret; } @@ -1653,7 +1648,6 @@ static void qcom_swrm_remove(struct platform_device *pdev) struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(&pdev->dev); sdw_bus_master_delete(&ctrl->bus); - clk_disable_unprepare(ctrl->hclk); } static int __maybe_unused swrm_runtime_resume(struct device *dev)