From nobody Mon Feb 9 04:39:04 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) (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 CC94F17E006; Fri, 23 Aug 2024 10:19:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408399; cv=fail; b=Ur5uKaHFhTsq9z29g1cwZleRhxyjnIQjyrdPYta4lViK7KmHZH2x2YPY+uSmmCMMYQFBuaIOnAq79IHrOjqiBw2v4eR3TpfaU07o5d457QeTqA+TJM/glX7YnPB8KBw2TGd+kXDVhlMXdlRHLLp64FS+bI2O/4aa2XRH4CxzPaA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408399; c=relaxed/simple; bh=qiUHQsxda2JlbDUHPsJcR/8nIUB8bwNwi9eJMzRqFqI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=KYUeKd599v64bFlCHuYD83T4An7+nqPfmGkrQmoFGj1HWrd2gXugatGoqPv/Tf0ZQ7OH4aLS3/Kz2hAMuaap8Wk3jHK4uw5YXuZAtKTfAsNjS98aybQC9OWW2p62F1EK/WqnYDbBcABciL9VIZ7GMMGWabutF1jmxPs6gZh6wBw= 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=RqISrgSL; arc=fail smtp.client-ip=40.107.215.69 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="RqISrgSL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ALPxwe5alUos9HrzzTxk6cKemH4hh+jOUz60lILPO2IxCPZ5PKBOY1ImEiYz4eQtF04AQ6ti23K68khG1jr+nlD37PGu0cFoQaoikkxNdzWStoFgYigxBnCmCnnEXghQIDNlGQtm8fDVVJ7y72blLj+GktyHMoi2LhnmBx559oXHxJ4nm2Zrn/SzgZQUGkLcMIhZ4pBp8EHXzkBgXE26C0fzzA7Imm1l8lVn2shgcBR6rfQDedljEpPKAXCUymkEXtGBOy69QLcckz4Z82V8BZSSmiBhwgYynCubB8gtENmIDGZmn72Y3zVRqgh7WSk5V8zZFVvzX7OTu+wfAdNb4Q== 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=8seUex0RD2SKfh+Sl7egdxEBbYQR2pQwRBCpA5Wan8M=; b=piQSwUTxCpUokIvXrFq0EkDaKMQCbqtijbAqCpa5SQ7Ru6R+/63YZWg9SK2pEjUOdY3bjEeR2On4aURlONWqx/+4siMdsEgZW7lual8R1Bzk7+6C/fjTL2ie36Csd2FPROkdT2TFqin4FEKX1CDleGwVVh/1Mv3vbkWHOCXkZ643pWZaw/FYudvz/0mx6NYUq0ZmyLIAaRRFt6E0MdVe68WVSuecEAPggvjbaterJKdxu1KbrlUu4/dV9jfqkJGcNvHAHigeixrpUE5xqVpUryE2tIkcLE9fdVs65eGYgua2u0p3tfKfg/Llo77Hg+AlFjnQFA40YNOEOFKVG1LVSw== 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=8seUex0RD2SKfh+Sl7egdxEBbYQR2pQwRBCpA5Wan8M=; b=RqISrgSLJ0AHBdBPMDOVD/T48SB5KbcQXrVfU3ohrPrw9xJ+omBOzsWzMDX9JtlslUOX6/3trJL+XcqPSOjX4qbwvqH1vQlag8WOKAXB8B1bO5ChNPjhiguJjgsGM9Pb3Y/7gdyf4Xnuo1/B3lSFauGuHn/LU8KOK4MUR4o17zebfrumrdIc477E1hFiNsGZEAuRnhF3R7PyJn6dbQniSguzVHKT2Z4CofhmflpwKiXim0tf0KC1VCSxs3tZnrhDmvrq59kCpALjuw5kWRoS9x5SI3GvPT6/yBL5f5AUVSGmLtuaglNdRVF+g5oBoda9xLRYn0aMJNuroXZ+HP/pzA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Fri, 23 Aug 2024 10:19:54 +0000 Received: from SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6]) by SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6%4]) with mapi id 15.20.7875.023; Fri, 23 Aug 2024 10:19:54 +0000 From: Liao Yuanhong To: vkoul@kernel.org Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Liao Yuanhong Subject: [PATCH 1/6] dma:at_hdmac:Use devm_clk_get_enabled() helpers Date: Fri, 23 Aug 2024 18:19:28 +0800 Message-Id: <20240823101933.9517-2-liaoyuanhong@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240823101933.9517-1-liaoyuanhong@vivo.com> References: <20240823101933.9517-1-liaoyuanhong@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404::36) To SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5576:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: d74f1b3e-8cd4-459c-5664-08dcc35d21b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Yz+tImNTnCUN59sp91Njvdxj7XJ8vVHEwtdLjivi3zHu+CPbLRKQtjeMugCA?= =?us-ascii?Q?3Xis4Jt5vXitse013u79bN7F7k9XhNCkx+EzTmF7yhm888HPf8bit2BqkLGH?= =?us-ascii?Q?HEAddVsZNsK/gSDmz0D4zQzn8m67qXP6wAFENLGmDjD+X4ySWhOeIw2745EG?= =?us-ascii?Q?2cNHJ8ddU3oEk937Bo7fc0pi7wvhRUC10CCTgHLX6ON6D+4iijvHipQOXSoI?= =?us-ascii?Q?sK6ATxcAyxripfzMxYN24IUoNCnxG+20gNdHND8UVHAM7lVj73ajBTY5DVRU?= =?us-ascii?Q?1WBINkug3dj4mBdNJRhFbV/+IpB0yoNjVovtTCLl3EwmuO7df7NsvWrL4931?= =?us-ascii?Q?6fyHEJ0Z6f6LepoMeXjgQAvdnrwaMytIxuPYkHUDf5+YOiRGjalcay+RU0/p?= =?us-ascii?Q?CK+etxEru8TyHYTCnrigvnmum2Lh0+f/ORDsL3zKS675EPVEi2Uku91t1xll?= =?us-ascii?Q?cqgrGMSQS4vExCgsrKoyzZZmxjb57BINuHz8fuK+6jJatmzRkKHMs8doXcYn?= =?us-ascii?Q?xJebQmGncbrakzQrMITDLUOTgPNI6VpbchOXc1rKBnwYRz1hQo00D/aN1MeD?= =?us-ascii?Q?BaxWjEOJw2XPFUSG4qMBLVn03kXM0YuUHqOlIozKnQZLodsDP0wiGXm2Hf2/?= =?us-ascii?Q?8+JGxL6tozhM1wdCas5tgTnjnzFSGjzCUp/y5HYbTUvv42BOukvOX6FbmZYJ?= =?us-ascii?Q?/CThAzKBIs0gQHdNE8J48Is3l58foBmr7jBZDBrzhjCeuM2Six5RwUqQKDBA?= =?us-ascii?Q?Xx+f5yMZxqYhO8tU5wMoV+dEsb8cow7berIr4t3h/Wrag8vATO2TOm6aNarV?= =?us-ascii?Q?DGGzEck8YmPKUfGgw7tSm6blXGof66EhM0d+GaVSE/SgBDXtmiVzCT/ev9i/?= =?us-ascii?Q?by7qfgw9Vi4f5vlAiU+x1K2HhCkL/bLCprBYbPsfMfgy/P8yq0FLUQtHuVYx?= =?us-ascii?Q?jKHjM42wFscbdboaBBZ42d5XJaFKhZtjPOV1cqzgFSA61SUpZW4sMoChEJJU?= =?us-ascii?Q?n9fXOwNTRxZAUQa2q0vYBpkum1XOlLQEv3Ye56P2r97OCU2wPhkU5rEBbkEK?= =?us-ascii?Q?+RRmPFncAelw6ReCHP9Jccrpym2y3pf54t0AqT9Udy20rQTtCFP7VirsLwj8?= =?us-ascii?Q?N1TfYRJi9HGHUwWjN2lTTmTlk+uu1a9rpvC7y8zcn6nPSICmPmb7ms91iOHr?= =?us-ascii?Q?io1z4L9MhBRWOv7Z0VIULGm1iJE7cCZXgYmULHjuwl3CCih6PruKTLKkl3dX?= =?us-ascii?Q?l9grEtGQ2bWjJkdFAaVrcjSc4p6fnwRQmay3Ak0EFAZpsdOT9perpm+icCDS?= =?us-ascii?Q?PvujevW1CEznlQCgDgEh5XwtkbwElNpv91vbvxEb//HmIwIG5gVsoFY8EY4/?= =?us-ascii?Q?Jx4fJIcdQPNn7pyXlWob3fvO0XUNPr8fkC45YZ8Uu2Y9hzdrxw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5576.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AOzcYHh3GUqjrb1UMRhiao7aJ9Txm2zHqswmERRjbfAnmuiXpdFf+OTT+JXG?= =?us-ascii?Q?ZAs7R2exr27cUJE9CZzyZXxrXWYcn2Tuj/+q1VSyZbHeVFsTenrmS4wqFHdn?= =?us-ascii?Q?f0prYgw+xJdfYx1l9oGfdJLTmLUzqgou2RJRcgc7qFTnOqdlyRdcDHlkRe+C?= =?us-ascii?Q?zMCHqhODKEcNxlJDgAEA/ApZZsK+zi5q/RppTAlfRRZa0zb/nH1CwcbZPnGm?= =?us-ascii?Q?W/PqNVkjtK64NM5rtZzX3WlyJy0accX52Q3oJsmdAM8My0cQBWwGsP8OVSDX?= =?us-ascii?Q?ELDHwNffgUtMZAiS0tPhu90YLHsf/gTZoVrUjMw8yevnFbryxr7cC7vqkkDN?= =?us-ascii?Q?Z4SwxhUyc8R7llrRJlbGAWTnrN4d8ZX0PgTTZ0178odmrXXlOoagft6QIyZt?= =?us-ascii?Q?/iCwz9Jvwh0jfvqjHo9e4sHnV6VvVDDfZKW0eJZSajorA3xetkCVjMTNk7Lp?= =?us-ascii?Q?p4OrxcquVxalZGkuugQ4PgpvdaqPKrQFqow4DBhYosH/IC5LYVc0oO4DOBmn?= =?us-ascii?Q?G1KbT7JNNaSyDomgrioilufUtnmmt8fNoLF1hhpMC3k55OakE1JUykm7DzjU?= =?us-ascii?Q?wvWH8VX6bhvM9BCb15SgQlF17/GXmgJMBWs7AzPihU5LE0aK6RPRiWD9eds+?= =?us-ascii?Q?bNjQRh8FanLJasuqez2VkKvDd2K3zLgEU7bNp3vOklXgLGZIXRB3waYygNfC?= =?us-ascii?Q?5D1X/48rm5awCtKuAezXd77bcvdsT9u6MLBSkQZQcLOv47y0zyEIhD8YSdAX?= =?us-ascii?Q?0ODwaucKRs57g9aWRB7ggDk+qhW/FZa/SIgFq5j6xQvLn1+UwNzxtB1tnAqE?= =?us-ascii?Q?defefL2RuNw5Ku3FVg+NL1z2Y5P5rrhgKSePDG5zo+zZLkmFiNr0G92+Ll50?= =?us-ascii?Q?7FFi/xGpk/1ksJYW5yc8NvQILDPmBEYdClhPXzx8iXtD7U3OKX3fguRPC5qd?= =?us-ascii?Q?yQBW3JnUQ4RrEmH1doDMI7sZ/b1HbHR/fCv/Nb7RJMeRWFJ0UxWhX5UQTgfj?= =?us-ascii?Q?xoT3OmM3SRa/t4k/xPjgInml9s/gIf090yh/4vYS3G4RySoqVbi/i/pYnzr6?= =?us-ascii?Q?p64IiUk+XRF9/YVuzArsGFNwanAW/NRTwohSTGRvvpd3wBg0juxTBEH4YnJ2?= =?us-ascii?Q?67k6SoX46MBZRjyalxZVIVZ3w/rh9s1NN+51lF+nDySfTGrgWpp8FoBcWKN4?= =?us-ascii?Q?i5q8TZqrFpG2GISFW+O6oSkm8feivf99HVlXNmE4VguepEXPzGu1KXcyjE2J?= =?us-ascii?Q?9ygVqNB3TAZRisRMMEFARqaWJVRGt2rcRL9RYd3RmimEEQKDeF9lUE79aubY?= =?us-ascii?Q?leAVOvO0IhVr7DL4lP4xGU3HD/pJncHCidKrizbUUeSdSLz7wMOG4grALDJQ?= =?us-ascii?Q?4LrMdgSEtqZkNT0/qdSnwFL7xI+OXe4RfTTf/KyvXtOGWNAfgrZQIlBmmKAf?= =?us-ascii?Q?PoUAJ8M+0HQVm5YBQztT4F9MG09zoFscuMdZnRblqQY6Ox+c6ppLAG/zkFaJ?= =?us-ascii?Q?PZKpPzaYw7AOwIBAuPnd99Or38uI/v/xze3xE/tFKOJBI0f0sFv+Ik9EV5oB?= =?us-ascii?Q?MyVEw0wfR6KD0phJ2feAVfCn5XmVWmeYB+uyTsLl?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d74f1b3e-8cd4-459c-5664-08dcc35d21b6 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5576.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 10:19:54.6476 (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: oXX0v+Z/vFE7jupz8DGWbrjMb/sFV5hZSi65DmCxry9KtNB6UtNM9KZCloivd7bSQrhAvYFGVl0A/4ZVzJzrYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB5873 Content-Type: text/plain; charset="utf-8" Use devm_clk_get_enabled() instead of clk functions in at_hdmac. Signed-off-by: Liao Yuanhong --- drivers/dma/at_hdmac.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 40052d1bd0b5..b1e10541cb12 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -337,7 +337,6 @@ static inline u8 convert_buswidth(enum dma_slave_buswid= th addr_width) * struct at_dma - internal representation of an Atmel HDMA Controller * @dma_device: dmaengine dma_device object members * @regs: memory mapped register base - * @clk: dma controller clock * @save_imr: interrupt mask register that is saved on suspend/resume cycle * @all_chan_mask: all channels availlable in a mask * @lli_pool: hw lli table @@ -347,7 +346,6 @@ static inline u8 convert_buswidth(enum dma_slave_buswid= th addr_width) struct at_dma { struct dma_device dma_device; void __iomem *regs; - struct clk *clk; u32 save_imr; =20 u8 all_chan_mask; @@ -1942,6 +1940,7 @@ static int __init at_dma_probe(struct platform_device= *pdev) int err; int i; const struct at_dma_platform_data *plat_dat; + struct clk *clk; =20 /* setup platform data for each SoC */ dma_cap_set(DMA_MEMCPY, at91sam9rl_config.cap_mask); @@ -1975,20 +1974,16 @@ static int __init at_dma_probe(struct platform_devi= ce *pdev) atdma->dma_device.cap_mask =3D plat_dat->cap_mask; atdma->all_chan_mask =3D (1 << plat_dat->nr_channels) - 1; =20 - atdma->clk =3D devm_clk_get(&pdev->dev, "dma_clk"); - if (IS_ERR(atdma->clk)) - return PTR_ERR(atdma->clk); - - err =3D clk_prepare_enable(atdma->clk); - if (err) - return err; + clk =3D devm_clk_get_enabled(&pdev->dev, "dma_clk"); + if (IS_ERR(clk)) + return PTR_ERR(clk); =20 /* force dma off, just in case */ at_dma_off(atdma); =20 err =3D request_irq(irq, at_dma_interrupt, 0, "at_hdmac", atdma); if (err) - goto err_irq; + return err; =20 platform_set_drvdata(pdev, atdma); =20 @@ -2105,8 +2100,6 @@ static int __init at_dma_probe(struct platform_device= *pdev) dma_pool_destroy(atdma->lli_pool); err_desc_pool_create: free_irq(platform_get_irq(pdev, 0), atdma); -err_irq: - clk_disable_unprepare(atdma->clk); return err; } =20 @@ -2130,8 +2123,6 @@ static void at_dma_remove(struct platform_device *pde= v) atc_disable_chan_irq(atdma, chan->chan_id); list_del(&chan->device_node); } - - clk_disable_unprepare(atdma->clk); } =20 static void at_dma_shutdown(struct platform_device *pdev) @@ -2139,7 +2130,6 @@ static void at_dma_shutdown(struct platform_device *p= dev) struct at_dma *atdma =3D platform_get_drvdata(pdev); =20 at_dma_off(platform_get_drvdata(pdev)); - clk_disable_unprepare(atdma->clk); } =20 static int at_dma_prepare(struct device *dev) @@ -2194,7 +2184,6 @@ static int at_dma_suspend_noirq(struct device *dev) =20 /* disable DMA controller */ at_dma_off(atdma); - clk_disable_unprepare(atdma->clk); return 0; } =20 @@ -2223,7 +2212,6 @@ static int at_dma_resume_noirq(struct device *dev) struct dma_chan *chan, *_chan; =20 /* bring back DMA controller */ - clk_prepare_enable(atdma->clk); dma_writel(atdma, EN, AT_DMA_ENABLE); =20 /* clear any pending interrupt */ --=20 2.25.1 From nobody Mon Feb 9 04:39:04 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) (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 DACC818308E; Fri, 23 Aug 2024 10:19:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408401; cv=fail; b=TXx1hgVcVwOSpxlO3KGhtiG4sps1WUNzLyNdHfu08eJf10z1VMfcyiuELJ5b+jZZho3XE/yKFlhFrg6aBqwd7HImwlxalMuKd3W1yBRrviBUf10JFyYPBwSB6XEvgGyWorRii+ATIfDN8wTdVXXlQzDBQtIQ0ka3WZQ/gYwmDVI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408401; c=relaxed/simple; bh=Qh7j9wmhX5g2OIvoFF7BzUrtY5MnqnRCX/Ycy2UFfJo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BDsZDDwYjNsx6EEGE8IlSJ/DRXP8TJtWk7ha+Rox07hRBDE0+trXDBxdmP64pmTczbXabAJdF5V1hyZQcLn5c6QjPhTDwIpvuUjzE5weR+upiuwc+ZzEhrO+wqtihZ8vzCeRpBS+6jYY6b5rWWZUlqGoWVL71WqiiGO3YuKTO4I= 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=jM4h0sVP; arc=fail smtp.client-ip=40.107.215.69 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="jM4h0sVP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z2Ya68rCg0XEMFcmoZazRgq/olbe1KogU8RNduvk/ofgcz2C89D77LDF0VUgxzdR1L6l6mMH0h0q6N600UHochgdli618FxrCCNWHJdzbC7FoBMlVULo3QqEpESgOY1LK8n3EZCFkhXt/SC3uSu6oL1BW0n3mENk+VuUuTN44pmAYif9gQ7XJ5o7xMrI+0616bbuJHJlTBD0vgsKkH72VhyKoRzJYXUyio4Todt7+qVkVOzih35Lse09Wfh+M3dgrIcfDJpVQqKC4A6Wo36H2Gfjd0CLk7D0/7jBOwtIsDoHDsnWP9tt+i560yOG3RXjqBGoDmRY5/kQ7lU+bvox3A== 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=jSflPk0BFm/B9lDS+zKq7lNbv3OAyQZkdwzDG4lbNz8=; b=k6rT/FkweLNowznkg7SjjI8nRXH9J3+7OvHAaHkDcPGDSI3BWZ8dofkRGPKGhoBRvzlGAG+Lvf6vNxerdQqKd/CqGbL45N9AmN7ht1oa0SK1ys/zbdP/beXA4GyKNqjD2C9Rv9jI2IeBLiszeXBeNNDGr/cYfuZmuNdMst0RFusuuMTKLvXTYDoykh53yP1aEY1b/zD0cd6cnw4ZpHKpUPim8H7hwmClKj8L7v4LFQwVy32fgXhhfSeSatgd0QIPKAqzOW18Gauz2cJPYwv3Jfoug6OUsJSiqrvYP+1yvohNj08lz0QF2C39xdqSGn3BAwWhmQj/CfP0BYgAVryxhQ== 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=jSflPk0BFm/B9lDS+zKq7lNbv3OAyQZkdwzDG4lbNz8=; b=jM4h0sVPM+XP6le8dTrIMdC/EUednUhB9oRh/foCXsj10+QwHVD1z3JnI/U+QDxE31+B+GL1os1WFMVGJ0nRJuvfhn7o/zVAvZv8XlO5N45fQoGpKWv45LqCyeKdhMazPDTo4kZatrkWMtMzfe7sys43UrpalrbXG587L7UDg04vlg94v9n++n2fkVc/dB6b2ObZFVk9sBZVDuEefvSLq8ZiN1pBsG52nkrTPP0X1MDZDGIrHt3p0vH0v1OqEEKCY0qSHIDkT/uEC1m/+OP+eYfRMooFni4gS/D+d7JT4YX55JrpfHRFHKyF1LbKEevmmFQed1gFcPuQIWCyh21nFQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Fri, 23 Aug 2024 10:19:56 +0000 Received: from SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6]) by SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6%4]) with mapi id 15.20.7875.023; Fri, 23 Aug 2024 10:19:56 +0000 From: Liao Yuanhong To: vkoul@kernel.org Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Liao Yuanhong Subject: [PATCH 2/6] dma:dma-jz4780:Use devm_clk_get_enabled() helpers Date: Fri, 23 Aug 2024 18:19:29 +0800 Message-Id: <20240823101933.9517-3-liaoyuanhong@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240823101933.9517-1-liaoyuanhong@vivo.com> References: <20240823101933.9517-1-liaoyuanhong@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404::36) To SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5576:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: 9cbcca87-57ac-4334-0632-08dcc35d2307 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JvW9lSdXOP4ARRyIF8lwIEhyj1ZdRE9wq9rClDnJ9iKyc/WbaSFQESSuJU/b?= =?us-ascii?Q?508lxtlvyAZRmr48SPpnMtAca6kxsRatb0TZ7FEQoyevFGtHmRrHKzTo/9uG?= =?us-ascii?Q?sKADXqRtp8XE2V/hzjWgpej5htrSFMPji894hm101uI+12cjqhG5YjRIG3B9?= =?us-ascii?Q?pN7Bu260HYjpC+tG/tgaYB+vyQhHCYHsLwq7CGOi/B4XOTKmf1tgyCD1rjDZ?= =?us-ascii?Q?FEY9O5UFICTRfZoFNL03zrEWx7EWkBR8xTIhofs9DAB38wMCEgGCZMY8zQl8?= =?us-ascii?Q?0xF/OhdnCAptjMsFxcPQNwrG4GQvLJZIywT68LGH7f9QIxUkhk8aC8DOG+JJ?= =?us-ascii?Q?EVuHT+U8+S08Cmu7gG972mTsEQWmnf6rtRXu5tNDwYigFC2XWw1uSEgjnAr6?= =?us-ascii?Q?ZM343+eaEqu+mZvF7Vc6VSUjZtN/ybHcg3Sw4jx48NZiFPS6DHIjRWjVPIfv?= =?us-ascii?Q?7aUwbhSYfDJuD3DFAP8YKWaIN8+e0I2tEf9qDBjJvuJrtFSPhsWk09XsOa0y?= =?us-ascii?Q?6qkgqFQnwDl/SOwu3Y0N2oYhC0VrxvdHOdSGQz6kr1pj4nfW/tuW6AOH9nTZ?= =?us-ascii?Q?tMPtiHAZJSjNPwXBOXyaL4kajxfPq2qOCMDTCfA5obLyQLMZ0yQfoMSaMJEU?= =?us-ascii?Q?bQoRDvxtj2Y/+zYT5tS2Ct8emYELMPtuQIdEY5rsN1KzgaosqUgp5cv75Dyq?= =?us-ascii?Q?jhfFNSPUS3n7YXicJlzYhG3rV00pWL8xhYHqI7Lq4bN1BJxKRX760R0kwP3p?= =?us-ascii?Q?yo925+6zNDTFTwOUIyt/8QaS2SJSnGMjLiKxQRxlINK+uNKkAhmau9Xye/9N?= =?us-ascii?Q?2/uj+bgbH2K81/QHBCbHPpA6IXsG0Ycf+HfgpuRpwNiTNXPPkFqd5EJzGFed?= =?us-ascii?Q?J0wrieLJuOOnmacPF/tMHq5ohrrMIEne+GK2yHIU64N4+h49GO7kPuf1C9GW?= =?us-ascii?Q?2yhZLkaSxvWxxSHQRFNtY1zyHlwTLAWTuAG8kwvDHpivriPjPCiPJSfmxgND?= =?us-ascii?Q?k9AJN97S274KYtD7ZX+hc/zyUAub3P2UxmNntn8CCL0IlJsvDDmVhnDpirvB?= =?us-ascii?Q?ii9dsvKX9UONTXuGCxCGSsdjP5oaEhS2zH9TIqDgf+ItEdOaHm2O/wz8v4EJ?= =?us-ascii?Q?JZZR3QvjQ7hC5XtasAKHN+u+P4aDP0E0aYcbPFOQhHbYGvRVSN5o/hishVFs?= =?us-ascii?Q?ESCOIr2rjI6DpKT060WpJWrs6ezhe3YAYMVH6NT56yWgmiG4h0yu0/TovLIl?= =?us-ascii?Q?Y2h3DeYyi+0l3vwEWBsqB9au/M5Pjg4EmCYAkaFNt01uXY89WoKLbprsSPje?= =?us-ascii?Q?kGEJICFn7uB1BERycQZEOK4bvPZwdOKbzzrihmAF0FO5iSD/h9ZV/2LcvlHT?= =?us-ascii?Q?DKWRrtEdq9jj1ZTBQn1ufTTiwqeK3hakSXVuxIxFDsifdNLG1Q=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5576.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KfonzicP5ZaATNsYFL1Hxsr4IwiKDWMIf6Z5MZinRy3yPPf9u+qDqAQBMCaZ?= =?us-ascii?Q?XiJsRFWQsgHPT8OiSd4Xst86qX8zwuhcToCGtx2ReNMQ7XXT1tJZ6lhRmKB3?= =?us-ascii?Q?03M4IJU9qkYj9JXtUeAzDKM7HGhnD3znGmPAsrPPJJOk4lJEkBCxWKIuJ3TI?= =?us-ascii?Q?4hmhiVwcsKgAIJAz8jN/wVXNrV6bbArJc03PEvyDp5YWbvwalYL6j8mg9eRy?= =?us-ascii?Q?cDIR7jJXkOerx+B/D5ZSjoovShVTkb+/uU5EJmCOPqMD0kL3AYpsIo2vFJ0S?= =?us-ascii?Q?wuE/Ykiqul64hAxC21GFlsCI0xTBc6AMvZiQkrliQr8Vb2C8AsIILeA/hSVV?= =?us-ascii?Q?HzDXtSqkKvwIWn2w6pBY4JQc9cNhENjyIKGF6zoWZUNU8gBDlBsvKxBdQ/+E?= =?us-ascii?Q?m13Pjsjbpkleq1jlp2z+WcIhUML3dofTTl0qexnSNp9KD4FObG5WORTX8YUh?= =?us-ascii?Q?Y+03Got+lMVyZdlK8S/l28vKNxOGDPNXyRvhuBMYOAwrzoIOSQHbh5KfLgyw?= =?us-ascii?Q?g4QnqTQKeUtY66IZ27Atc0k8iKmOH39Df27rAvSgzsemEq2yvl4O1cyVO73i?= =?us-ascii?Q?lkiVxgFfP7nz51zTAq7nuDFPcdWRc8Vcvei+VvZpmvb8QRS1NAsXbHSLgxym?= =?us-ascii?Q?71LZjWsIudpEu3xZqg6pee/jPvmiggfWd5v5oPhzB1LPyux+IPRmoF5R1Nuk?= =?us-ascii?Q?hJIRMMb9JRPjPUkpeaumH/s2ui2GKX4ovpgA5wJl65ih1YENfNC4VdBCzLSj?= =?us-ascii?Q?8gGdjFkf6NMACTdF3ZtYxto4T2EhHkH1HsfCbUeklkSUD+yHdHIq9JgVvmj5?= =?us-ascii?Q?sTlKDOckpoSU6K2Hxqbyr0nRC+TVNyv31fePl/pndO9y1s8y1+EpnO1N+VwF?= =?us-ascii?Q?PFNT9pTW2XPIwN55yMl/yhkW740Gtus17Iis+QyoHFArGFeSX0TitskdQS1c?= =?us-ascii?Q?nzRXBaCbXbVGZaaL5k1PMntnJqSdLwea2z8BwkreLPOGsoG0Ln2TiuUe+LKI?= =?us-ascii?Q?3mEtx8p9ceO+4z0N5av/3qJ8rRqqgWk0kwR9ronOf4U2e2i7S4so3gCY/d/k?= =?us-ascii?Q?AevseFFss3B+0eavfH9RRTwZW8xxr7ZOvqwnEXFEIBxj0uSAxK+XsUwR6MYh?= =?us-ascii?Q?48o++Y9zJmRJO0bEuDLs7o5ItCoj0pwmMsJVN/7CdFUoYWWPXpAuTWeLWaoT?= =?us-ascii?Q?vTYcJ/sCnaIW+JMFmgEbV8AY1yrlD6nxhXqColCecdPiIiA2qDHxP/1g1PHO?= =?us-ascii?Q?n4+Ysb0J6dity76L6bR1RVQHvv2ylNJABNCB9GIz0tm1ywXgDJIE6/oMTmor?= =?us-ascii?Q?6jvszm3uNW3vWRqqYgUb/1ORYYH4NF/TQy54VYBxy2eAvInld+K5pquXNb1F?= =?us-ascii?Q?KsDmemgvB0DiwUYaRNkRGkMOu2mejClrar6XKcjCJ2t4/2fBgd7UubUkGKsv?= =?us-ascii?Q?+OCoOYXklNtto2taQOt6pEKaIlKh/5s8/KvHLMwedytYuduuDpI3LVn7Ofyg?= =?us-ascii?Q?xNmNfN8XsEWBSQ327q0W3HMFgwK3Vut5BXqt+oBvE0gc3bAwg7pxoOnO6L8D?= =?us-ascii?Q?lQJ6ra+VXJreD13XlFJiXusqFFCrezdyOuYaFjba?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cbcca87-57ac-4334-0632-08dcc35d2307 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5576.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 10:19:56.8520 (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: SbnKWWlRzdWZYUZlSBBSVA+GaNN9XPKgDu5oMP3kNgm/elNVfYIBTyvdtHcpmHUEdmDIR6hDnNFc4UVc/o0N6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB5873 Content-Type: text/plain; charset="utf-8" Use devm_clk_get_enabled() instead of clk functions in dma-jz4780. Signed-off-by: Liao Yuanhong --- drivers/dma/dma-jz4780.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index c9cfa341db51..151a85516419 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -149,7 +149,6 @@ struct jz4780_dma_dev { struct dma_device dma_device; void __iomem *chn_base; void __iomem *ctrl_base; - struct clk *clk; unsigned int irq; const struct jz4780_dma_soc_data *soc_data; =20 @@ -857,6 +856,7 @@ static int jz4780_dma_probe(struct platform_device *pde= v) struct dma_device *dd; struct resource *res; int i, ret; + struct clk *clk; =20 if (!dev->of_node) { dev_err(dev, "This driver must be probed from devicetree\n"); @@ -896,15 +896,13 @@ static int jz4780_dma_probe(struct platform_device *p= dev) return -EINVAL; } =20 - jzdma->clk =3D devm_clk_get(dev, NULL); - if (IS_ERR(jzdma->clk)) { + clk =3D devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) { dev_err(dev, "failed to get clock\n"); - ret =3D PTR_ERR(jzdma->clk); + ret =3D PTR_ERR(clk); return ret; } =20 - clk_prepare_enable(jzdma->clk); - /* Property is optional, if it doesn't exist the value will remain 0. */ of_property_read_u32_index(dev->of_node, "ingenic,reserved-channels", 0, &jzdma->chan_reserved); @@ -972,7 +970,7 @@ static int jz4780_dma_probe(struct platform_device *pde= v) =20 ret =3D platform_get_irq(pdev, 0); if (ret < 0) - goto err_disable_clk; + return ret; =20 jzdma->irq =3D ret; =20 @@ -980,7 +978,7 @@ static int jz4780_dma_probe(struct platform_device *pde= v) jzdma); if (ret) { dev_err(dev, "failed to request IRQ %u!\n", jzdma->irq); - goto err_disable_clk; + return ret; } =20 ret =3D dmaenginem_async_device_register(dd); @@ -1002,9 +1000,6 @@ static int jz4780_dma_probe(struct platform_device *p= dev) =20 err_free_irq: free_irq(jzdma->irq, jzdma); - -err_disable_clk: - clk_disable_unprepare(jzdma->clk); return ret; } =20 @@ -1015,7 +1010,6 @@ static void jz4780_dma_remove(struct platform_device = *pdev) =20 of_dma_controller_free(pdev->dev.of_node); =20 - clk_disable_unprepare(jzdma->clk); free_irq(jzdma->irq, jzdma); =20 for (i =3D 0; i < jzdma->soc_data->nb_channels; i++) --=20 2.25.1 From nobody Mon Feb 9 04:39:04 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) (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 D2AE8183061; Fri, 23 Aug 2024 10:20:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408403; cv=fail; b=QuwszkQMyrFKwPoscx2yWHjw7ZunVWVvx5silAKbSEIYLHvpXhWF9MpeveQWD2Be2ZYIaFP2lb4duxd06TSpjaeBi/a4VY524XJmUQ56wHw6PA/gDr0tsVmqqjetMcYESBJ5NUeXN4lfXortE5H8WuJWGbHWaAj8lhoHpsDfoyo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408403; c=relaxed/simple; bh=U0+aJnyMNlaQ0ryEudVqINsv0ZOA77eKMJq4/8+2bQI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VF2ZROj5mqb9GpF5OF6IENqKF7yfU1AeLS+kMYmNY4Khp1zhfkhl2+iAQLX8BlqQih9ZYsQZA67phY9QDhtnMoBWjC2dmbEIV/yVN3Scq/DSXVkRenY6UMnuvhwdXMfSEeDa4pPPMxXO1hop7Myq3Z/8OccdAeFvwmrW7kUnDus= 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=LHHc0G5f; arc=fail smtp.client-ip=40.107.215.69 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="LHHc0G5f" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WTy1U8PceOd6Is6gVcJ/pVpwS6G2RyFRDlwsxZSvSCemNJgqAfItU7l7bfVKnvzKScLNgRseX5zDaqmydOZ1Qta9LgbAqQkFg3zwz1ii2n/mr62pi9afQqih4fQ/edf+XdBJCLJdmL3C3y8LHIQWNk+07wJzlX+iP3cy1RNrf3+VvXXk2+uvxYSYLbGd6YCAKqM6zh6U7qin7mVCNm53s4Kgqal1yJ72tnF1Crh8gOlCaWwb7gEj5YVwSQ0yfvUInb1GlebgMDPZ3+Fwxwgz6EQuXeWhmW7bAProvhfki+gLZ8AGw30XTv9voZYwnwLvogyTm7twrfZv0fpkMsvDIg== 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=iD0/H4MaXwi5m6Lep224sF/IcLmCoO8d9kwLMxcXtPg=; b=QJkG6nOLyfXCr4Nkox0wdYntLIPAzg/4Rvntto6H3AYSfO3JwMwWwwhwWNKPbyVYjeM1z/cj+jNL8H0M8hxKkdGT9jdChxO9HsCvEPeeH+j8L+UMPLGPAxzvmOpcjpP+0Lc7zmCizhZ5nY2r+XtshjUS4vn/ZgGksYjzjln156cg9qN4+w5dqqZPXG4KnPbV2HpsV+yqJV5rVoxnhnaMnPmvyiwyNIENeMERsfV3QR2ZvM8EQBdV+1nL2BC6VP01Q03YtisDpuaBi1oR/F+Y3KsYJnyUJK9ceuH5XuFkvYm+Ebyl9uxZC/DOR8aw6O8otnAcTJVjWdDQe8K7J0wOvQ== 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=iD0/H4MaXwi5m6Lep224sF/IcLmCoO8d9kwLMxcXtPg=; b=LHHc0G5f5kgn0hDrqrgQfx6vTGfytvAA5RaB2Q2xlRwimj6dVcWrccSnuIY7lGBqtPDXrKQFFdXHV6SD332qZRo4UjPygA08mi3IMFs7GHJ0Ie8XrGtEvRt/gIK4iW0PvqMCDE0NXrKW4HNbtB8f01ySioakuboaJ6SL9daS0ufsNqwNfrySIGVL04GtN2N9NclzyayjL7Z5f6Y6Ve//EQ8dUPxHzIKtZww3hlasoWXlWCteFjBWFHJj4yNywXMDnntSrQ8U7kczEzYKyNZDfrvxnMKCURJo7Z+U9ZTqH9c97PPLO98P1E9zyBIp3eMr7Hfogt6mX2ykr3ACGKz0SA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Fri, 23 Aug 2024 10:19:58 +0000 Received: from SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6]) by SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6%4]) with mapi id 15.20.7875.023; Fri, 23 Aug 2024 10:19:58 +0000 From: Liao Yuanhong To: vkoul@kernel.org Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Liao Yuanhong Subject: [PATCH 3/6] dma:imx-dma:Use devm_clk_get_enabled() helpers Date: Fri, 23 Aug 2024 18:19:30 +0800 Message-Id: <20240823101933.9517-4-liaoyuanhong@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240823101933.9517-1-liaoyuanhong@vivo.com> References: <20240823101933.9517-1-liaoyuanhong@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404::36) To SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5576:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: 515ebd5c-3e2e-4a03-2d06-08dcc35d2436 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5AfOI8C+y9itBALuJNZnai2Rtu7bUvRcMmVq4tbqEBTO5Pxcp3B/0wxYcYpu?= =?us-ascii?Q?UF3Pcmwxj8out6r7Z6sw+kHdVjf0j/iei5oyBQ+V/Y77mglGOaFi8Tf2a/sg?= =?us-ascii?Q?KGNp88MIoAFizaVa/BWDMwPZjnEyHXb01lDmb8VgWb08eefMjYhn+uBX7tym?= =?us-ascii?Q?5eZAlOJEu2gzk4scsuluEle7i+DNccMBCVbcbUAr8XgkU/Zs4WuCRPPptv/i?= =?us-ascii?Q?D4gvgk/596B9+cOoEUFzlsa+vJgRZpZNTL5EIOO/ZfSHEpL7EZ+nG2cgV2zx?= =?us-ascii?Q?dMFy1ftIMszGFFCEmfIuoGmmYQIWrcw2jW1GGeg3bs5ljG3RfReJIb1YZRf5?= =?us-ascii?Q?8r4rj2/jwSKqN0uXlbuu2zCrZFRX8NsuYReByHdbRWkZXTB9IokhDYnjHKka?= =?us-ascii?Q?WVEDFHzx681apM4e8OsLA/ZICimSVaEXtP1H2BErxXfhz1y+S3Vx0FNgiQ00?= =?us-ascii?Q?Bt6rNyjPaUTOGnQOOy2MadGn4VYUP600oOWrgDBlfNDoJpICf8FyytB0pBzw?= =?us-ascii?Q?rM9UYp8DQZ0xauL5o/MIKmJczw78Bqpq7QKSt/sG2datPOD50KPhsBfl6U37?= =?us-ascii?Q?h6KNJUAuwdUfL3PRzbNUZ+BdRUJ8I5aNeijjTsk2MocO843yRLUixz+P11Uf?= =?us-ascii?Q?doEI9C2oIV4j9psWVufF6i/RwC0OkxlrZfoCzgYvk8AlHGSZ8mAlN1022aF8?= =?us-ascii?Q?8w6NY3gFbIaXzVloNZlpBVQCGPDZs4PhjXPF/cV0bV4LSlYzocxqPclCBrYg?= =?us-ascii?Q?Kh2blivh7PqgOmPBMQV+qZJAoo4QUzhQnXPr10URStnF6VABy4VoKpVwy4tV?= =?us-ascii?Q?hn5QUAshleQegpSkcVx1JofLaHWObGrSy16eln28S7Yt1digENYrBfhqP878?= =?us-ascii?Q?sqBRwYdyScrPa+keyqypVub9R+2GKtTs2HQi1AAfEWFr3jck2W0hiiHldXOP?= =?us-ascii?Q?2f8itlLyQSFv+VnB79/6wlLPM+G+gkTzLi66WPF/6V7sCPk8/6M2DuAeWULP?= =?us-ascii?Q?3gUKv2eg8wvVvvIY4BYj5dCO4Spl+gfalAGtByFSZWc9/5VD43dL6B6w90GK?= =?us-ascii?Q?OQ1g9M4GqgKTpGau6O29rsULLKUkyNKoMrUeIk5aPVgq1z6167+NGcEsaTPA?= =?us-ascii?Q?cEsL4widQS732+tM0Gup2kV5ocw1NxOGBI/Cz2ErkOakolAyalIeZkO0f4um?= =?us-ascii?Q?P/8MCnmLQC687+lp/0DXnySr5gWzxHave8Lg73lC5cfj5l6msjX8MwPESHPF?= =?us-ascii?Q?gj6/Gz3wfFlwTVlDhw4M/9DnOheskIy8lK0NLgFJhliUWvZnhO9esD0GF94J?= =?us-ascii?Q?Kg2kvhsocl0Q6knZWKz6+TELZNuHRIDmqkrzHT3UXoeIn3AZKLVuORP3G2UT?= =?us-ascii?Q?UinaDxRi7o0Y6ZKj2ncKKJHqs12gGeNrT2XIL6SKmnk8jWnyyg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5576.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2+phClZ43eQFr80FC3AcqTIe853fp5zHdZuB1Xb/HneNyBxtHBdVkPynKV/r?= =?us-ascii?Q?5Qyn8yXQB9ydXVjK+H8kt2GKHyqJ0ROmxkvMv0rmx3vWHfJZR9fKQiIHYnKX?= =?us-ascii?Q?rfWvJGKXjicjqmVX0q7JoDaYqLCY5UsOEL4FxzQS9sIffkc0kYZLBZsM6Ss/?= =?us-ascii?Q?TIzgDBFmr2c6BzW0F7kvhWO8ryRWQYyWfmZQr0jOi+wYoHA55m/J2lKcgei5?= =?us-ascii?Q?AZXrLrvePcwLacvuyqk09nQXaKP9b5gJuv9MNrNgSPLyNmeTc+0tjUZgjd1R?= =?us-ascii?Q?r2TozUQGQ4/OYRwxyUFSpkfVFU5Q6S/oVU4TUvlhhk71JQoMlIEKqQ2hdahb?= =?us-ascii?Q?nKA/273fRjD5utgnBf1hdcUVJOm5gv3g7fpNdeQj8n8SPSmyIfw7GcV1wBlo?= =?us-ascii?Q?8DMGeGWaJqreMsl+3+tl6F2F+RInAZ+MWdP7kZ+cdjUZYxZcQpQD/E1knHrq?= =?us-ascii?Q?TGbnyJHD4BXGk5dqzFBFMk0us96/V+2YOB3x9iYHmRnA2U8u0JjluBsNfpr9?= =?us-ascii?Q?iVrxpXxjsSEpmOdWBW2hGGhyzJqftVkUKLtc5jFZoK7gYcFbNjxaqaddpT4k?= =?us-ascii?Q?ZrGBNkhO5lephvvJoWT3jmWI0wDBR2voMX4v1V3I7YdmuugjaKGXAPpQJLpa?= =?us-ascii?Q?9PIkORF7vRvPt3zmpo1PIbgmDlqnhxPmxDlZXnbYqNRHRirPDZ98Sd8Zx/aT?= =?us-ascii?Q?JaOptNIU7xwHaaOt64Lpeu/dah+SjH3zzCZUHnU7dcdcYF4sVWb11T+XsFmV?= =?us-ascii?Q?v8424odIyd0jbHyBmvyxDpV0xjJMxMPy0AsoOH+fte3bQFVWAJjgLMygc6lR?= =?us-ascii?Q?y7+uN6wCHwsqOI5TM22AzvUexAnYT+wgTxv0tHnUSGoLoeIe5RbVDoXi+/QM?= =?us-ascii?Q?Aar9GlPXBxYeiS/5qRuX+auwfXu8WNCbWTxOOWDpVJNbtPnXozDNnI/l0+h8?= =?us-ascii?Q?mGHbc5EHbo1TOdetKptc2QpafXjP/FOcgyjuogQNLt0uXR6/7lc4J8zFysHf?= =?us-ascii?Q?6bVNOhlekFz4Oq+R3U0Usum3KxykcmiWccT7YTUj03k4Ip2wcRP5Um9PVCal?= =?us-ascii?Q?fE0yCAF4vW/QDuKdx/zA/nSE58Myots8TmKYVgazjuOSDlDbAvDhn3Yncrpa?= =?us-ascii?Q?7WKBatj6R2UofSOfFtlPJYJyCzLyRBTCeRWRGMDisaxv+FY+ookMetQdIpyu?= =?us-ascii?Q?1eB53Qmo1zr0I4Er139VMaUmUoDRNPxBJyMNIROjMqb2ZyJhKZlRwgWYl02V?= =?us-ascii?Q?11zJjk391w99jvYpLGbYumEUdiSOp2fcpfuO55CvuYMN+WgPfhUOWbw2zSDf?= =?us-ascii?Q?xZQkTvhi6bOjDTxFI4mU6e12dTwFbxbKeG2SyrUKz7cxbVgP6490E8VVzzHJ?= =?us-ascii?Q?2szBqMR+SFv4DAFqQDhDLYCA7nW5NqtA1/2mto/HfezBDCnNXAxJiGKfdbc4?= =?us-ascii?Q?H5sPiWaaFVf93LNJ7IbhnUvmK03voNnu4fOUMudRbdjn+Ki0YkWXyB5QaZVG?= =?us-ascii?Q?7rrhHUgkdYpgtPAjvr9B2HyYnYUtkeQIgcgSOlSDVsu0LaYbCaY9Bu9l64j5?= =?us-ascii?Q?/PwtE2obQhdAFhTSU8v3QH4yOyTIPSbmpICcywOU?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 515ebd5c-3e2e-4a03-2d06-08dcc35d2436 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5576.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 10:19:58.8353 (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: /mnFax6UgzTXQotG6eIVwO3urDE2lp5U5zkBE7I9d7sNgfbT+ykKfJESyw1Xuz9NB2TU0mPcRUU0eX+Bor237Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB5873 Content-Type: text/plain; charset="utf-8" Use devm_clk_get_enabled() instead of clk functions in imx-dma. Signed-off-by: Liao Yuanhong --- drivers/dma/imx-dma.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index ebf7c115d553..1ef926304d0e 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -1039,6 +1039,8 @@ static int __init imxdma_probe(struct platform_device= *pdev) struct imxdma_engine *imxdma; int ret, i; int irq, irq_err; + struct clk *dma_ahb; + struct clk *dma_ipg; =20 imxdma =3D devm_kzalloc(&pdev->dev, sizeof(*imxdma), GFP_KERNEL); if (!imxdma) @@ -1055,20 +1057,13 @@ static int __init imxdma_probe(struct platform_devi= ce *pdev) if (irq < 0) return irq; =20 - imxdma->dma_ipg =3D devm_clk_get(&pdev->dev, "ipg"); - if (IS_ERR(imxdma->dma_ipg)) - return PTR_ERR(imxdma->dma_ipg); + dma_ipg =3D devm_clk_get_enabled(&pdev->dev, "ipg"); + if (IS_ERR(dma_ipg)) + return PTR_ERR(dma_ipg); =20 - imxdma->dma_ahb =3D devm_clk_get(&pdev->dev, "ahb"); - if (IS_ERR(imxdma->dma_ahb)) - return PTR_ERR(imxdma->dma_ahb); - - ret =3D clk_prepare_enable(imxdma->dma_ipg); - if (ret) - return ret; - ret =3D clk_prepare_enable(imxdma->dma_ahb); - if (ret) - goto disable_dma_ipg_clk; + dma_ahb =3D devm_clk_get_enabled(&pdev->dev, "ahb"); + if (IS_ERR(dma_ahb)) + return PTR_ERR(dma_ahb); =20 /* reset DMA module */ imx_dmav1_writel(imxdma, DCR_DRST, DMA_DCR); @@ -1078,21 +1073,21 @@ static int __init imxdma_probe(struct platform_devi= ce *pdev) dma_irq_handler, 0, "DMA", imxdma); if (ret) { dev_warn(imxdma->dev, "Can't register IRQ for DMA\n"); - goto disable_dma_ahb_clk; + return ret; } imxdma->irq =3D irq; =20 irq_err =3D platform_get_irq(pdev, 1); if (irq_err < 0) { ret =3D irq_err; - goto disable_dma_ahb_clk; + return ret; } =20 ret =3D devm_request_irq(&pdev->dev, irq_err, imxdma_err_handler, 0, "DMA", imxdma); if (ret) { dev_warn(imxdma->dev, "Can't register ERRIRQ for DMA\n"); - goto disable_dma_ahb_clk; + return ret; } imxdma->irq_err =3D irq_err; } @@ -1130,7 +1125,7 @@ static int __init imxdma_probe(struct platform_device= *pdev) dev_warn(imxdma->dev, "Can't register IRQ %d " "for DMA channel %d\n", irq + i, i); - goto disable_dma_ahb_clk; + return ret; } =20 imxdmac->irq =3D irq + i; @@ -1174,7 +1169,7 @@ static int __init imxdma_probe(struct platform_device= *pdev) ret =3D dma_async_device_register(&imxdma->dma_device); if (ret) { dev_err(&pdev->dev, "unable to register\n"); - goto disable_dma_ahb_clk; + return ret; } =20 if (pdev->dev.of_node) { @@ -1190,10 +1185,6 @@ static int __init imxdma_probe(struct platform_devic= e *pdev) =20 err_of_dma_controller: dma_async_device_unregister(&imxdma->dma_device); -disable_dma_ahb_clk: - clk_disable_unprepare(imxdma->dma_ahb); -disable_dma_ipg_clk: - clk_disable_unprepare(imxdma->dma_ipg); return ret; } =20 @@ -1226,9 +1217,6 @@ static void imxdma_remove(struct platform_device *pde= v) =20 if (pdev->dev.of_node) of_dma_controller_free(pdev->dev.of_node); - - clk_disable_unprepare(imxdma->dma_ipg); - clk_disable_unprepare(imxdma->dma_ahb); } =20 static struct platform_driver imxdma_driver =3D { --=20 2.25.1 From nobody Mon Feb 9 04:39:04 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) (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 D96E518733B; Fri, 23 Aug 2024 10:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408405; cv=fail; b=LqjX4ruXDseO8jBbppQmgHUk6sidWiHIzCBvMVbUY+FLZGhAWnci63vcjgkMqgDiGSwvrl7hO7z4/19MoMSLGwJ8DmRp5IMGqLYSsmaJp1HNJNajRPqe15oLbKC2gNIgCk4spnAScoiq8av96X5/7azigL+a+4nCrtKViLrUoc0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408405; c=relaxed/simple; bh=we5xSqic5G7n2Fxst0d5xu0pVOm0xzDz5IoO93tpz1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=aX10f5DXNDsMl+Xbe8mgg/uf2aGbdZ4iU2cU8qLYY4LGhVgdA9uMnyfUflV2j4cEiQDKzWx+4vGluqesclKm5btRTZOyAg1rUuvlhn1Xsjo4VVsNn2I6GFOyWv7CpeL0MTOSKvAybZxBQyildHsQ9+qlfDeYaIfC5mWMtx/0Fyo= 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=fZatAWIq; arc=fail smtp.client-ip=40.107.215.69 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="fZatAWIq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q3PGVcbrHARtR7HniaR+T+fot47Q5qA1Spbutqdq503HXTphLbSAs9FDK1iFVs3R1+W+T1vwSpkv/HBrkFgDdvP4BJYfCXYZRRm0uJlHAmnCh2mCPOEEvexi9p5PGZFejTNTy31k2WBYR8uhWPJ3c6tyG0Fpwf9g+KdNZz+h1FBUdrm+1tfMisW3Ori2b1ycdFulrymuMWVoZ8Ixu8RW4pfi5r7JreYHIaq4RYkc/VIwvU+v9GN4/J74/NdAjpkwerLmyG12hWzVH5bfHti3RrY/5ipmkDT4z/9oxW9UIbz2QSNcaUTGXTKF7aOks7a3hB+Xso01sk/6VMbxzgFFZw== 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=3CBKzRZVhAfE1GGxYtmoT4zKcdXQrw+66XZhjdFdUlc=; b=DU4CnnlnszKEo3VRoejb8NsisXBltw1JrPewl0rw0GgAYS9Rxnj/GjSgItPt5zK5b69LJPQfixcXLyLZioDZByjnUAJiC+FPZmX7QlydzkI1uTCnaKIyOeY4m+nkxMVDid29R8eDPZdpWJec8yEsKhOZji3HQOTYC4CMIUkgwF+fB+kXgFOOEaTYOaW/736N5srrouPnSYDhqnWKr+yyMkk/lGkeXeRCzLhquswG1JsZM/pIHnJ3VxyhIsWC7T+0UZuoc2tBCS7HTi6lN92tMpFkfWRWltm/gEADYOJsOTpIg+mAVMY+YWKVNqXQo/xoSXQ41m8SJTiELF2qhwXAKg== 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=3CBKzRZVhAfE1GGxYtmoT4zKcdXQrw+66XZhjdFdUlc=; b=fZatAWIqgzWUtUFS2ujLUuxKhB6n6XSHsoZoYRVZkw4GECxVwiwExhNlQlv0k/8RiXBLvcCbvCJ/q5aYTgD6FGY7403mXK4D30Q+40dmpA9t3Blv2RQAyaiU6zuY2nXlIotXHQwIk/lQVGeH9xlnovPSeqvkcQkuatYq8xdd6f9dD8fRq51sXarLp6AQGj8F7mtvTWOyOXMUUXlNF0QPXNh0C6Ab9zuOf51JxToocv1t6t7VYoVPb2MDSvVPvU+MpbecG3j8xFys/RjX0oLEa6Ci3jW1PUabV0QDaNK9COz7zq1B2JRdNuXA/fqHNXotdyRPE6ZVgXUBSkOrQWGtmA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Fri, 23 Aug 2024 10:20:00 +0000 Received: from SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6]) by SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6%4]) with mapi id 15.20.7875.023; Fri, 23 Aug 2024 10:20:00 +0000 From: Liao Yuanhong To: vkoul@kernel.org Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Liao Yuanhong Subject: [PATCH 4/6] dma:imx-sdma:Use devm_clk_get_enabled() helpers Date: Fri, 23 Aug 2024 18:19:31 +0800 Message-Id: <20240823101933.9517-5-liaoyuanhong@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240823101933.9517-1-liaoyuanhong@vivo.com> References: <20240823101933.9517-1-liaoyuanhong@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404::36) To SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5576:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: ac8c3c1a-15f9-4031-bc9f-08dcc35d254c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TythpMkZUEvTaCK4kaDCEFE890PV5LPibumqqzlvdJpgCD/uPCw8XGb45FRx?= =?us-ascii?Q?5GEn2HOeaaKZyXrStHQLE5xUZo0WE1XW2jzdoM4xBh7cfUn5CSW3nQzuasUs?= =?us-ascii?Q?/lmDhB4WgepCmS2K7jRCSiYki+KRpj0akEGVxUux2QDKO5AFRWydMCJYsP6F?= =?us-ascii?Q?xMOtvOlIGfBWLcZhwEYJ/JvfShOYSTcX7A9tt4/tXJRoizTddp5Wd5qMYfoY?= =?us-ascii?Q?WF4n8dYTWadACEGfC7B+cOz/KMafx+k3ZpCOyVCcKohhUNMn7Ro5/fwTjCrE?= =?us-ascii?Q?KX7SoKBYou8/s2D3huW48CnYM9byjAZkMbrTS+8lERY2VUKdlX/p8+XB14tI?= =?us-ascii?Q?NlZI3Ol6gr7glzyzTV1bBel6ay1PZ9pR3G1rFPwlYW9XvRFQnglu9KYv9Mto?= =?us-ascii?Q?6tgvRL8GGXtXOI+LG+QV3A2nBUkKQzj+3S1OMFeftJ2QbZS0c5ZhFUh9qjCV?= =?us-ascii?Q?D6V9Suyhwh35lhBrMsqJIxZHhZtJfKqWmGQNDYBFpmGLezo741jPP+KXfF42?= =?us-ascii?Q?ePnFrDGjCClnnTRjXDC/MxknLQZBseJkrltAxSIBx9B2KGycnbMUkExIvw7N?= =?us-ascii?Q?83U5cggN0i3ZY8sRNDep5t0AO/lqod2y5hDBidtNX29+d9ZesfXHbRQ55A7B?= =?us-ascii?Q?LmPSg2Z9byI4szzjl4m+EFdCSea0pOClSpzxiWylqkvehV/qKVoPNVuMNDaV?= =?us-ascii?Q?pG38nc2qxVMryzs9uey78qoFbvr3MoujNSodmdnPQK5PrAuMYyDgwNIAMIAF?= =?us-ascii?Q?e0jI+N1stgfcY5ICNAR3Ky5QQYRM5CDvUB+ojhiVWWexgRpOjOZ5KU9oJy59?= =?us-ascii?Q?/BadcW+Jk/mGhMfykrn6O+wC3moh1dlyUGIxAPUKL0dEz0dAMkKnRfkG1zJ1?= =?us-ascii?Q?C49mBtv0nOMXZMSTmm+/JqeNe6k5JSyY6uJ9+SIpiRo6gyBXsBESlkkfjX0a?= =?us-ascii?Q?ZJsRi0FhwMaLkEEBU1SP3MSYDSBHCa6sZK2VV6v8DNfAGODoSjji/UpTsIKP?= =?us-ascii?Q?GO1q5qbRkF0LNympCrJsXmzD3Iko1tleKcV1et27EXDrcpy/E05F0K5hyiXu?= =?us-ascii?Q?vTzRvX32SteUYLa83jGkDsSGoLQz4PsAK/x/x2u3unz8I643NGcyhNCIW50l?= =?us-ascii?Q?PD4uyLUdj3h5+8FaWhFC34l8a/4I0cpP9VzwGB+NeM0ndHlmiCcasH5fs5VZ?= =?us-ascii?Q?0EuFkeH1zsp9KJ4L5jDfU6rh0Kpp/93owHKbBonDwzjZPCIJQGvpwskVuxQF?= =?us-ascii?Q?Mvt3/+nvezhrzgFjCwS0S8BoPlIUfPNVIsz1i1poNR2E2TFwQ4K0+lOEeL9H?= =?us-ascii?Q?SnqbaeWG7NMfacj2tggusJLDpdcgLFb2sxXGgWwurc1E4v029FliHY5ewMi7?= =?us-ascii?Q?fFX0F72LqA6dzdhSb8CVtB00SX6QmKlvW4rDxBOp6DE7l5aHFg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5576.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tq9QgQ88NMgWv2nvbh2V2Kxz6o4Er18bTAMGVHdm8eUyJQ9d0jPR9YJeYulK?= =?us-ascii?Q?iyX/BDXS69IghbimFgoKA2k+/FTJG3mkUDhJKcEgZ4+WDE9OGUOWFI/EQUWI?= =?us-ascii?Q?PkKHdtyoLEmUf+7WG5bQWtNuxVyRz+qqSmIO4wB0oduNZlnBy50v2u5pLwSh?= =?us-ascii?Q?9ng5fvG3MAAmfi+uJFEZSC0SUZPuFWX0yFGKbnYMSpNy310ul2vFlqCIqMeF?= =?us-ascii?Q?bBUdWYZpX9ycjZ3VmP0VetDwn9NSRcy9HLzNIa6CybeqptZEZFxtNBDkVIyJ?= =?us-ascii?Q?RXF9yPxFUV9d8cp9sjjWk6wuWNvVqyuTFa8e/W2Fbamhi3BZUEkk7cOCucyx?= =?us-ascii?Q?KeRyks/Htrcq/JMOe/ghbUAqbhDVhPbxEzhavtdQvlXk4j948VvqSD4+c5tm?= =?us-ascii?Q?sHynqhdRHJRSKQYodYeA86IPaEFZPje/iQA5d/KXQaklC0xKYY9AlWV7xmRJ?= =?us-ascii?Q?6mOenXftbdb0o5WlnWWNGwObAKRg4rBHLQ89+yudM4KHCjN2ujdrsE0gsu/S?= =?us-ascii?Q?WaflCpS+/4j1BUTG6zusrehcecWdMRF5avovpRmK8YXEfbJgGoD9XaORkd0r?= =?us-ascii?Q?Y6/OYE3Q3yJqS4lapu4DTtXCtxLLRNlu7vNNPQNpeW5AuAa5Oo95ui9sKNIB?= =?us-ascii?Q?A+ybz5Qv161mQ+/GSEVw9QChtR/n2ccKY0OdtajC5mf1V8U3GYQJgpBvQzRO?= =?us-ascii?Q?8WMRMM6QefnPwqLsXOW7dKzROENEnJQF9m2PZix5/yfODUXJMh4Q0GQHKepC?= =?us-ascii?Q?+QkdQxBHRXaBh0Q//bR8ofEWW4jvd27x3cW/6dFWcG9Nm8sCmuyVh0LbyUXz?= =?us-ascii?Q?eN9Atf7qjxdB0Pue6wcTP4L1rhYe/ATa42MoBYZqFPaLvvqU724dg1KasTrJ?= =?us-ascii?Q?6c1U4Qa4gsMAuMyDde6eIKsGT7EcQDEa/DspEwy8+mi7V+BnBzLTb1+y4B9V?= =?us-ascii?Q?Sk6lR7FhPnS7RTvPiSaSiIOk/zO3WzGop8ZgZMaIHeVbS/Z87iC9rUIu5A/b?= =?us-ascii?Q?qZ29pB2ft7LDxzR5Jbe/IFL7ZoA9ZhGMtak94M35V329cmR7H+o7nZSg9M2y?= =?us-ascii?Q?HKzMdF3xabW1Y04l1TDFFZuRWjP+Sao4x+XMb6djKghtxyZ3kl1As55yj9e3?= =?us-ascii?Q?JZSQ7tu4AGSPl10GeGyxYZlFfKFn4bvVGpq9iY6qXq9D2aLWVMTRD7Gng/bH?= =?us-ascii?Q?qovz31WREk48ngtS0T9NY6+igP3xfPX+nGNwJARIDyRUVX3+woMjtbTjCq+I?= =?us-ascii?Q?s7VGmi6M6C64d4exWGYUycNSFrqpOsRROl39Q3ggFMIRQB2dtPPScdC44p+F?= =?us-ascii?Q?DEMHRPfbRyhHDyFAvCnhJOAjE4VNVoGSLd7pZASG7FVadE0HMQUcIqwrVGLT?= =?us-ascii?Q?fX4v0ZR/eSQ4FzYm4uEP6M96yGMIuIZiD9EexXqth7RNTFdnzeJUrXonstdc?= =?us-ascii?Q?efoLRGbVMFiDX2o0BWJx2Xznx9Z9Jdx73xVE9G+AljCBqQ7S1D+MX19v5FQL?= =?us-ascii?Q?b989B6U6Z/PT+Kn59ZmBx7+mfzH6YUz6ce/HLw68p15xYjdRodXTbqvwc6cH?= =?us-ascii?Q?aLlvILTvvBvmfCAMjW4ykxTeAHyzm/0blxakmdie?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac8c3c1a-15f9-4031-bc9f-08dcc35d254c X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5576.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 10:20:00.6573 (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: kHtlHI6735Hbs/AiJJRTYjsJRRoxl6BU8OKTLFrE4oDA4CQqCSR8XfYZ6RIGo/0KDL7KeKdChl4NZZlKd6Wh8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB5873 Content-Type: text/plain; charset="utf-8" Use devm_clk_get_enabled() instead of clk functions in imx-sdma. Signed-off-by: Liao Yuanhong --- drivers/dma/imx-sdma.c | 57 ++++-------------------------------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 72299a08af44..af972a4b6ce1 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1493,24 +1493,11 @@ static int sdma_alloc_chan_resources(struct dma_cha= n *chan) sdmac->event_id0 =3D data->dma_request; sdmac->event_id1 =3D data->dma_request2; =20 - ret =3D clk_enable(sdmac->sdma->clk_ipg); - if (ret) - return ret; - ret =3D clk_enable(sdmac->sdma->clk_ahb); - if (ret) - goto disable_clk_ipg; - ret =3D sdma_set_channel_priority(sdmac, prio); if (ret) - goto disable_clk_ahb; + return ret; =20 return 0; - -disable_clk_ahb: - clk_disable(sdmac->sdma->clk_ahb); -disable_clk_ipg: - clk_disable(sdmac->sdma->clk_ipg); - return ret; } =20 static void sdma_free_chan_resources(struct dma_chan *chan) @@ -1530,9 +1517,6 @@ static void sdma_free_chan_resources(struct dma_chan = *chan) sdmac->event_id1 =3D 0; =20 sdma_set_channel_priority(sdmac, 0); - - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); } =20 static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac, @@ -2015,14 +1999,10 @@ static void sdma_load_firmware(const struct firmwar= e *fw, void *context) addr =3D (void *)header + header->script_addrs_start; ram_code =3D (void *)header + header->ram_code_start; =20 - clk_enable(sdma->clk_ipg); - clk_enable(sdma->clk_ahb); /* download the RAM image for SDMA */ sdma_load_script(sdma, ram_code, header->ram_code_size, addr->ram_code_start_addr); - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); =20 sdma_add_scripts(sdma, addr); =20 @@ -2119,13 +2099,6 @@ static int sdma_init(struct sdma_engine *sdma) dma_addr_t ccb_phys; int ccbsize; =20 - ret =3D clk_enable(sdma->clk_ipg); - if (ret) - return ret; - ret =3D clk_enable(sdma->clk_ahb); - if (ret) - goto disable_clk_ipg; - if (sdma->drvdata->check_ratio && (clk_get_rate(sdma->clk_ahb) =3D=3D clk_get_rate(sdma->clk_ipg))) sdma->clk_ratio =3D 1; @@ -2180,15 +2153,9 @@ static int sdma_init(struct sdma_engine *sdma) /* Initializes channel's priorities */ sdma_set_channel_priority(&sdma->channel[0], 7); =20 - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); - return 0; =20 err_dma_alloc: - clk_disable(sdma->clk_ahb); -disable_clk_ipg: - clk_disable(sdma->clk_ipg); dev_err(sdma->dev, "initialisation failed with %d\n", ret); return ret; } @@ -2266,33 +2233,25 @@ static int sdma_probe(struct platform_device *pdev) if (IS_ERR(sdma->regs)) return PTR_ERR(sdma->regs); =20 - sdma->clk_ipg =3D devm_clk_get(&pdev->dev, "ipg"); + sdma->clk_ipg =3D devm_clk_get_enabled(&pdev->dev, "ipg"); if (IS_ERR(sdma->clk_ipg)) return PTR_ERR(sdma->clk_ipg); =20 - sdma->clk_ahb =3D devm_clk_get(&pdev->dev, "ahb"); + sdma->clk_ahb =3D devm_clk_get_enabled(&pdev->dev, "ahb"); if (IS_ERR(sdma->clk_ahb)) return PTR_ERR(sdma->clk_ahb); =20 - ret =3D clk_prepare(sdma->clk_ipg); - if (ret) - return ret; - - ret =3D clk_prepare(sdma->clk_ahb); - if (ret) - goto err_clk; - ret =3D devm_request_irq(&pdev->dev, irq, sdma_int_handler, 0, dev_name(&pdev->dev), sdma); if (ret) - goto err_irq; + return ret; =20 sdma->irq =3D irq; =20 sdma->script_addrs =3D kzalloc(sizeof(*sdma->script_addrs), GFP_KERNEL); if (!sdma->script_addrs) { ret =3D -ENOMEM; - goto err_irq; + return ret; } =20 /* initially no scripts available */ @@ -2407,10 +2366,6 @@ static int sdma_probe(struct platform_device *pdev) dma_async_device_unregister(&sdma->dma_device); err_init: kfree(sdma->script_addrs); -err_irq: - clk_unprepare(sdma->clk_ahb); -err_clk: - clk_unprepare(sdma->clk_ipg); return ret; } =20 @@ -2422,8 +2377,6 @@ static void sdma_remove(struct platform_device *pdev) devm_free_irq(&pdev->dev, sdma->irq, sdma); dma_async_device_unregister(&sdma->dma_device); kfree(sdma->script_addrs); - clk_unprepare(sdma->clk_ahb); - clk_unprepare(sdma->clk_ipg); /* Kill the tasklet */ for (i =3D 0; i < MAX_DMA_CHANNELS; i++) { struct sdma_channel *sdmac =3D &sdma->channel[i]; --=20 2.25.1 From nobody Mon Feb 9 04:39:04 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) (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 0AA33187568; Fri, 23 Aug 2024 10:20:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408407; cv=fail; b=XBnfJ/524nyoIbQfwc3IUmUiNIHBL1wS4afZxt9b9woW8Q04tXFlxHTuQCZIUrfrNcLqzY6CMPqN+76cFAZw8EuZTZNGdE1dQMQRD+em4uD/NKEgBnlDKUfCLhXp7h/aXrQNN3Kj7E6uWvpRI/sU2FGoM1m3JJ725VV7jMtLYfI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408407; c=relaxed/simple; bh=JSrVpMV6/L51y8i+ffpQkeXXiw1cXLe3yCiR4GsZXOc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Ua1LtM+1Br8yig7ek5+YugXLGSvFL+gU5J9Cet2PItcZ5otuqeWuS/jQURSMfTUswZz4TiqWk+KqYxDsJUMBfiMNBosHRytPD1WMbGCy/ULM/Z4HLldAWYZeDJzS8p5g6hZ9gwKkh3Q9gFgzBOB4vvwiFro3DTuJOodf/MFHAks= 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=Tp3uEHIh; arc=fail smtp.client-ip=40.107.215.69 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="Tp3uEHIh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nw5MigdeKtc5GOT7pmXtUsPq73KCowNQj1O/yOMK5I5e0aTLeMvujEiZTKyEANf1YMq1xcocQur24VfClYCVgK5lDM2D5DNBgYDuu97JrkdEE3a75sZJ6YFVKxhbBa0a4OW/eb/tzEyC0XA6wSWqU2ITvbgmkDw/oOppmqXFgcTe0ImxbWziGgaBaq+2vxYp+GNeid+k/UeRjMVP6IqiSJxDIjU8Fh8lsennLayGqzTQXbi9CtMXfQGI6X8gODOt9ZneIO1eAVC8AW+3AGWQHuVcUWEFKXIl/W0CVdUZdQgaN5FQzw/zNCrrGHgO4uPDXLkBpVPPlqU1tnMBaBKJSQ== 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=t//JNj3zH8IwaNVFP+SWjbF0AZkMptOSwtNFs21wFN8=; b=ZFg8W0YzatdjYguO2aLbrFC6evH1R9NBW0MKxfw/x3DFlQCBulHYn3xKF3tiCoyE8LcYbaPFmABRyb8srtVUQ8xQXHNIVxHUsg+f/YRpS+L6IkGedp5AehV+ItE/+Lj1xrKNek3AHX8IlMnb9x70oQcZ8ZoHBqvewwEaehS3j/1tLi59PdaQzeWxDB1jlkvhRAreaZXSuPuOQWANDr8QrwJHFCWINWUX0ryCx4hNIL2IfI3GtX+XtsxycCkQWlOqo3ecyVJBG1ppcViyvsuOaqCH/HOjF5uvz4fYbfYplXd9hvleLIzsSpKSqCO9QswAv0GJnsFh77OFsNVWzeyYCA== 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=t//JNj3zH8IwaNVFP+SWjbF0AZkMptOSwtNFs21wFN8=; b=Tp3uEHIhP2wmBetx4bdRCJLS7l1lvqcqLe+1n5vX2d2SG0fLVm3o6jPOUBl59G2ewcocGfZ0zAAP1Jsnibt2bU/A4b+1knVHw56644wkYQjiaHO6hUPi6zmraq/PwZ3sSkYj2BXw3z0MQ8qcMpIfmWLixV/T9iIst1sbnOPE0FnGxqXEMjDYLHTcwoKqxiktx8uoMooGnPFEEHAOS07JN+roKgytzNXhzgCoZnw74kVyGmFg/Y5O/XOWmcdAqZCJxl4kATNCHqeuT8K+uITzB5TnX8gtgCGYTIJc0zaq8pViacQQeypF9nMJIfsKoiPz5T45vzM3S2WK4FlUpas5HA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Fri, 23 Aug 2024 10:20:02 +0000 Received: from SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6]) by SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6%4]) with mapi id 15.20.7875.023; Fri, 23 Aug 2024 10:20:02 +0000 From: Liao Yuanhong To: vkoul@kernel.org Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Liao Yuanhong Subject: [PATCH 5/6] dma:milbeaut-hdmac:Use devm_clk_get_enabled() helpers Date: Fri, 23 Aug 2024 18:19:32 +0800 Message-Id: <20240823101933.9517-6-liaoyuanhong@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240823101933.9517-1-liaoyuanhong@vivo.com> References: <20240823101933.9517-1-liaoyuanhong@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404::36) To SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5576:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: c080b9c2-5def-4573-a580-08dcc35d2662 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2XuxfTK5RZBYyjQ/zWewnwgRzkspuyFotiGaLq6j2dJrjQHVP3FScD+hjSh5?= =?us-ascii?Q?1OnJiQoZj9zRa8+COEtrRcUBmdqHfyRvGIYNsmx0eTimDame6v1KdaO0kRl8?= =?us-ascii?Q?cZXZSI+YB9lomyIW0irusydka3ctK/neO55TKIf6xZGKShvsB5RLcCaDhZgX?= =?us-ascii?Q?1Z9A9Lq0LUTA8JwKmy1S7rzv3/Tbw23lrLo3d0hGhTRjL9RWtGa8N2ewu9Ji?= =?us-ascii?Q?HgRwnvlq/c8U8RkXgHyfCRJ35oKPrslAMnJNTkd4Kf4rR1i6H/h6/V08mYSJ?= =?us-ascii?Q?lF7dUkJSzqc2rtXtdxMm75m6WSSie7BBgaCCily71krFeSsivHKPPj8ZAocB?= =?us-ascii?Q?OHfCfJJSU44+erb5NDSJSZIlrk7ddOQEhOjAuoM2Gg/RFvR0jLIwtEmLZkY1?= =?us-ascii?Q?VpW6vDeK10Pio+iXI7yMmKS7e6dbepv6SbigCzyiXcFDRk4zHUcNyzSv4oTQ?= =?us-ascii?Q?rGO/R4om/xtxTMDj/9QvyySKXvl1mpjfJYnccffvcvEjbKfi5uWM2PirWCj7?= =?us-ascii?Q?CsG5Gk7iGNXFrORmQX87hB1PYX9hFKDWurUeEXTdD2KaYdI9ToOuZQIG0TPC?= =?us-ascii?Q?GQc0OuHfzS5mdG3ZGyPyK9aEaKts+bde7FmlDuNtf7Xu59UixkwM337FQ3ry?= =?us-ascii?Q?Rlgc7q+wRoHlR844OP39NxhaRVolIkybgNgl+bn7vT2AYtqfC1Ftv6cZwB95?= =?us-ascii?Q?c5RZMDtf84myRdDnaS3Rotqx5pZ6KCx1MZPahuUDlvCq37MXGVeqfCtvraWQ?= =?us-ascii?Q?iXT/SuN1APrEClIDPl5bGDJkYPNQd2md/elTLsLUn8/Z9WpJur/Xv0zS6w7w?= =?us-ascii?Q?b2xtf9lOCrsPOItlXh1roIu5uHCJ/B+/rAKktcw8v+NmzhYMcFshNuWA/p+5?= =?us-ascii?Q?lYaZ6TkMM6JCzxF6oXS4tZHpd183n3IWQ/g5I0RKBcpPl5d0fghG23tEY8b/?= =?us-ascii?Q?TBnf5m8I7VATmXXvqWxPlaRzwGm3dBCcl34mu/e6VpqfJdEyScfXCr8l1I83?= =?us-ascii?Q?y5ze7t1CPL+KaFbRjgyptFVw0RVMeoupb0G00Q2FaZm89+Yap6JPJue7IPcu?= =?us-ascii?Q?YDeYk2GKrPsjjriW1PvJVoYC7o+9jkeD8jtqwF6YpzQEaBRQ28+pnTAo3c+W?= =?us-ascii?Q?Oe6LzBtXVw0jtywkhST5NCfPuiLdG3rHSwRJ9DMVpzuCcByzptUeFzXU7tV1?= =?us-ascii?Q?+tBIEEE8nugx1tBZBT97udchiP9lcaOJI5TAefN7O/d8zcd+WN+rvsLaI+zy?= =?us-ascii?Q?LJOSGcc9ozheaArALuRz2GFRST1K5E94Bt/Zrrx6Llg4hijIfNlTzoR5d13l?= =?us-ascii?Q?yStl0uvPFPfLpr1D8CvwhyMk2llmME3N/frHTlaa541Wg5iVUQzgXLGHDwHS?= =?us-ascii?Q?D4Kj5q1lVqW5eIsB2wmfTi+Tg4DepG5J9C2aciNePfSC4LsX1A=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5576.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MU6Q5TGJmDAC/Aui4r+dxrwtNX7u2S47vSTQoU6nr5ZUKQUHEzcehsItP7Qb?= =?us-ascii?Q?ZhmNrx9xpv491tiTpkGjP1bA14BgOwuE2nGL9uJQ/jcaq2wBjzx5N4APX6zF?= =?us-ascii?Q?ONNFjkLzoHoLm8mah+840ZGUil96w5Q//aBulY93MD/nWpU+mw4Fwq9cz6/G?= =?us-ascii?Q?GdtdS3sJMwoj0HqGvFIoSAGBnH0ME/3SKggNgDQU6lvu2jj9FbOiuJ5Hf2Ec?= =?us-ascii?Q?YMz+1TL/A4v038+x4uxUpgeq/jf8OZA3Mw4+qpiCdH2s8LfM3ixhSM/fwoJW?= =?us-ascii?Q?sps8pSz2NrSXBtQG0wI2Bk5IZB6J+aadbXfj03OGcH0w0zmnCswnQCrV75gD?= =?us-ascii?Q?tYBPOlxiJ/m4l36gEVK00nuyhhCMgzErGj0yKN557Xs7CBGDIRGHdnMF2deC?= =?us-ascii?Q?o9UYj4q4g/mLA9fZVWorHCXp+3No7Q9exxYywCgInmrzvGIr7Pe+yuMNyRJp?= =?us-ascii?Q?IfPspOY69NWDf8vDypiDpTB8r8kFKO6EB3Tr23ws+P04+Pa3aHYy5brdt0Vn?= =?us-ascii?Q?I58Bk57sBt1X3Ml2y8sQCUbhcwg0K27SqcUTbAdKhWjuPJXhWE+r9JH3Hh3g?= =?us-ascii?Q?TgTWm1Aq3vuBMB1dPd76ofueJaQ3JHww8lAgzrq4jLM1Ckbv8L6kNZSc9Mws?= =?us-ascii?Q?KsAxYfA5BATS4juyTs4+ipRfmNPlwt4Qn+BMRHIdB7zg02PPLsFv8t+4WGLS?= =?us-ascii?Q?2lpT6Qv/Au3tVhpSveu4CdkWyfqfAPL191DshvHpbcKfAXB/vejgH0GYqNiK?= =?us-ascii?Q?72IfrcHQQw4ZT9Or7t8iOStwllkvkUJNAnSWEniDRr0sAzunyd8VHgrVs+Br?= =?us-ascii?Q?j90rMxuA9slYfnLG1qOvfgmLjY2mbp32cyTWZazGLkgbyqBTL9lWZU/iLdms?= =?us-ascii?Q?ZsdaQ3KNFwROZkXhAXZxcfzktak1OgNdA/DvGL/ZJg341nj8gSg31HESZll7?= =?us-ascii?Q?6BaW49YE0HOom/auQXIb0tlSowrJH3dy/bSgcd2cT5Fog90y0jEpYgx/KAoM?= =?us-ascii?Q?8dF4GP6FI0wCdG37EhTsqoy1oyRLb5Onvu45s/3DMFLyhQOKmtB/af/MprCn?= =?us-ascii?Q?6a14fBPiFYJwHWNibeFWtAoGzO5jnRo+cwBhWlUztVWb60eugmFMSQ+AsmPH?= =?us-ascii?Q?Ue8HHoiP8PzSd9P8ZNmyq1vFSjOahcBN8k5xuTqnqj+JB/KscLuoDIyy1AcP?= =?us-ascii?Q?n26lXCwWETwVk7rV/Y9W9OKfT3CK2r/ovm07xMf8+2F+QR+RZ9r0qrKKGWKY?= =?us-ascii?Q?XzSgJ3cw4lO5LV09m9vNEk5bo9n9mujOgaw1Xcvf6FrfoLxyxTwFYl13V+eF?= =?us-ascii?Q?M+CbrumTJQQP3wGsLuKBQF4MjOb3Mcoon5Qvk4zCqEqnaZ5hPWzDDs+nj12k?= =?us-ascii?Q?H2fQ17YxLTMG11H94qQJzr5p9oyUX6gdSIkZuJrDMRYyUuuZ26YyYPrmnE68?= =?us-ascii?Q?TIlLDmke+CTks0eTn+NxiHl5JTM0oSw6Zrb5iSLhzLXxs69z4ZH6HP5CWeWy?= =?us-ascii?Q?/WogwTXp0+SsGhk/JeRSLJJnEtKxwva5wr80TO7+dXHql1Ozjyixdbg6Xefr?= =?us-ascii?Q?VGCWZMKM4rNijka94kOBKemIl9NdAItqnyU/+V52?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c080b9c2-5def-4573-a580-08dcc35d2662 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5576.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 10:20:02.4809 (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: Yltom0lIg4s/6ShKbal8+dbjvGIU3ZPaozcTnpN7g81CmyuWLfEE5zokKQFlQYFFgAz9OpkKamEbec7qndvnfw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB5873 Content-Type: text/plain; charset="utf-8" Use devm_clk_get_enabled() instead of clk functions in milbeaut-hdmac. Signed-off-by: Liao Yuanhong Reviewed-by: Jonathan Cameron --- drivers/dma/milbeaut-hdmac.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/dma/milbeaut-hdmac.c b/drivers/dma/milbeaut-hdmac.c index 7b41c670970a..b188bfa9613a 100644 --- a/drivers/dma/milbeaut-hdmac.c +++ b/drivers/dma/milbeaut-hdmac.c @@ -75,7 +75,6 @@ struct milbeaut_hdmac_chan { =20 struct milbeaut_hdmac_device { struct dma_device ddev; - struct clk *clk; void __iomem *reg_base; struct milbeaut_hdmac_chan channels[]; }; @@ -458,6 +457,7 @@ static int milbeaut_hdmac_probe(struct platform_device = *pdev) struct milbeaut_hdmac_device *mdev; struct dma_device *ddev; int nr_chans, ret, i; + struct clk *clk; =20 nr_chans =3D platform_irq_count(pdev); if (nr_chans < 0) @@ -476,16 +476,12 @@ static int milbeaut_hdmac_probe(struct platform_devic= e *pdev) if (IS_ERR(mdev->reg_base)) return PTR_ERR(mdev->reg_base); =20 - mdev->clk =3D devm_clk_get(dev, NULL); - if (IS_ERR(mdev->clk)) { + clk =3D devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) { dev_err(dev, "failed to get clock\n"); - return PTR_ERR(mdev->clk); + return PTR_ERR(clk); } =20 - ret =3D clk_prepare_enable(mdev->clk); - if (ret) - return ret; - ddev =3D &mdev->ddev; ddev->dev =3D dev; dma_cap_set(DMA_SLAVE, ddev->cap_mask); @@ -507,12 +503,12 @@ static int milbeaut_hdmac_probe(struct platform_devic= e *pdev) for (i =3D 0; i < nr_chans; i++) { ret =3D milbeaut_hdmac_chan_init(pdev, mdev, i); if (ret) - goto disable_clk; + return ret; } =20 ret =3D dma_async_device_register(ddev); if (ret) - goto disable_clk; + return ret; =20 ret =3D of_dma_controller_register(dev->of_node, milbeaut_hdmac_xlate, mdev); @@ -525,9 +521,6 @@ static int milbeaut_hdmac_probe(struct platform_device = *pdev) =20 unregister_dmac: dma_async_device_unregister(ddev); -disable_clk: - clk_disable_unprepare(mdev->clk); - return ret; } =20 @@ -560,7 +553,6 @@ static void milbeaut_hdmac_remove(struct platform_devic= e *pdev) =20 of_dma_controller_free(pdev->dev.of_node); dma_async_device_unregister(&mdev->ddev); - clk_disable_unprepare(mdev->clk); } =20 static const struct of_device_id milbeaut_hdmac_match[] =3D { --=20 2.25.1 From nobody Mon Feb 9 04:39:04 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) (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 EFFDE18786C; Fri, 23 Aug 2024 10:20:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408409; cv=fail; b=rH4iwCUdvIOip09XZKyLqxgYbOMHuLfbUq8DrFpOPPFrDX7YPVTFNkPvZ1A27LGfJmmsohq1267AVmblWLiwicGYCvo7e/9VDi57c3vBFvtUWJct3m2IvWWeLwfzpMNyY8vNFh/5XtA1liMQyekF2nF7rK44FIhpimubBElcTkI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724408409; c=relaxed/simple; bh=vcilT1fgufl/wmnpBoZD1a8ZfdOgQgFNPE/9IcSNOus=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WjELSPYDiSPLs8Pacj78CezeGtfiMtCZLbcG62NVBnFzTdvw2BDHR0PEitiqz8j1PUxfo0XxUlnnnPKlGvIw92XJOvPOLwMmTjacaBzr3FY0qoTHD33MdvVQ08dlSn6wQUJCVeLVK+dnsDX8V2assnx1sYYAvY6i1CsV33x0+ZY= 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=BgW7C4+F; arc=fail smtp.client-ip=40.107.215.69 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="BgW7C4+F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pbDmUH8HZ5pOEEYK2Wgttrrv73d83TjAKacwe8n6AgsVkebqPrjzvwYfE7LMoiIpFebJrOEISVHnr2oV4UsxINd0xG29o/L2o6Uo/uvUQ+FJWBgtdCgecCb2CB5Pob4qymS4d2CtU8PIvgDav0+UYwwDdHZVDjboc7DSmvbmjrKyDa4I2B21WXW3f+uSAZFVY6KNOmnXjqvEsHT4EpBE4dHECcS6Ka/0aEWBYkZB5uWsTknFOr1VURYzAvZVKOQ6kD5hby2OFS+QBTPFQa3WfbiR0W+92/Vw162TLypofX7vGWU6tF1L2PYgIMH+j9c7/Xdg+UxhyFa+S2iypuy7PA== 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=nAIiRvIi1lOxnG91KjnyRmAZG4cwJZ1EK/A8vbDAN40=; b=c2xlQTsAtg7i9e29TODRuQYoprLR3Ru4bW0+xspl0nkzaYNFSWT3iaGfn8cyUydQLLGE0BCY7DLHX8rgGECCghf8DuVXJhA4CfAUWoaQJ2ZynUKwIshEeW/Xvt6ngFXS9q11tuW7wImr/zVgrRO+3D+smBBcpPnlVbFNMIHq/4OL3IuG34VchL27JTWTv6nKstgiGBUWq1uSAJrUMeldAu+KqgakH1FhCK9W6pMCOPMZthXkWwlnAd4MFf4/Hl+pd9hKqW5PESK5hZks2t5t24hXRiblA7D0uz6ZL3V7u0Jj5Fk/jvImhMh8RmEYU+J3/ilZ6KPWjbGhyh6FzkNr5g== 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=nAIiRvIi1lOxnG91KjnyRmAZG4cwJZ1EK/A8vbDAN40=; b=BgW7C4+FphXMINOIfGOLRvBt4uHROHZb0nUPzbKg+Tf9rX1F/SHbsxEw0roscECLXhIHf6cLz1mIsNABNdvAki8RdVJE6vClLI7hKjoZ7roTr/OCUriOrZI4oEZu0eV7U2rd7AycmTy+W/Pg2Imq0H3wVBAtTxCuXhRdDSY8eCC+uyxT57D0QtVrWFORDFcuOW0zyqyNcg3zGMYbPTySDU0pA0N3+/FTtrBJUpQZKVGJ5ftu5sMnZQf7FRP9W/3hTu5IsHCsKX4tlWSWw1b+AHFIRywf+v182wA3GDaF+xK/h6qGESxizQgxUbGSd8FucQp5TdIX0nuKXDyLBHGaTg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Fri, 23 Aug 2024 10:20:04 +0000 Received: from SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6]) by SEZPR06MB5576.apcprd06.prod.outlook.com ([fe80::5c0a:2748:6a72:99b6%4]) with mapi id 15.20.7875.023; Fri, 23 Aug 2024 10:20:04 +0000 From: Liao Yuanhong To: vkoul@kernel.org Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Liao Yuanhong Subject: [PATCH 6/6] dma:uniphier-mdmac:Use devm_clk_get_enabled() helpers Date: Fri, 23 Aug 2024 18:19:33 +0800 Message-Id: <20240823101933.9517-7-liaoyuanhong@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240823101933.9517-1-liaoyuanhong@vivo.com> References: <20240823101933.9517-1-liaoyuanhong@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404::36) To SEZPR06MB5576.apcprd06.prod.outlook.com (2603:1096:101:c9::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5576:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: 07dd6941-805c-4a5d-ba8d-08dcc35d2796 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uF6iNjdvX3qkVom5zpfZoQdPPjaAWCdQlusT7UNquvme0b/AiYaMfq1TIlDB?= =?us-ascii?Q?jgZkEVwDQsP7OwYKJuaAUo38VH2vsfKh8bH11B2tlEp8h5BEilD5zvSQNJQd?= =?us-ascii?Q?KA4SSvYISH0K8Z/3xkZLyVx8/EsDnsc8w/9bZBePwXVeaSd9TFSWYjdAOp6T?= =?us-ascii?Q?wOAltTLFPC+dIPdxlP/XVh2g7bGRABojaRgGR20yI951pfbGxdJNby6eiAJn?= =?us-ascii?Q?Yrb9FN0hKFVroCRJzlU7tPcUQACk00yWW7patQ3V8gdG6iiHKXJJpsEEUwbP?= =?us-ascii?Q?R9echqlHRW03dEDukE1XXt7JS0UQWSkBnk01+DN0kK6/5CIyHfHXl6YqlVVu?= =?us-ascii?Q?ZcNUnbOql6HAuZMkgmyqlNhj5QT9uHme3HR9S7dqdcwlJMRn41JrQgKBMGBS?= =?us-ascii?Q?2Be0+wicRtZikoj04nMp8e+ub91xKJexNqypnEtChby/QeIGCJhdlSCHyQLU?= =?us-ascii?Q?9f8oRSvl18mGpjKms3H+yrT05G5rfu578Rzr2KlMiHz0ypOU511YYDQhPE8u?= =?us-ascii?Q?4WmTLZvGUX0NTJJ1hWxM//zmXxfSUH1FBS1UZh2meJbO38a6IKmX6smLbpja?= =?us-ascii?Q?J06KMqnTJ29YXU0B1UiCAqLZq0YGnLl+Xbe7QD7BJ8g98RictrjpPWsUvshe?= =?us-ascii?Q?PfVCMn9HCzewIZvvflNcd4rnH3oPyureU4COv3QEbvZAo4dfk/sxmIkVob23?= =?us-ascii?Q?rkhfRW8m2S13MNDevGprY2CLv55lES3z49rSwxRPmYbndpLtzGcUMZ2tvzBc?= =?us-ascii?Q?U5Iw6uCQ3QZ5SbnSuUnH9koqGZIEtm/LBJziagR5uFx12MSgRyquPD/Q041D?= =?us-ascii?Q?TseAq1rOgcHy9KNeWRD50MsmVug1wg1Y8Y32eSttVt+nqPLkVH1ckV6b/6wk?= =?us-ascii?Q?HE8prWdkJzn6MpXwY7VH27r40VL73HeMxlsOHo0VFySm74ZkeidYMPyEG7KB?= =?us-ascii?Q?X2OOGG5al7Ni7LYjuN3rFnEtTZnPYon/SCVkCrkVeN5a0b9ET4o1rWj4QXel?= =?us-ascii?Q?iLXfjYfADgVEYvmCi4Vx6JeoM2SGmu+eoO5KMYfPZ9CV5xvYOclCnEZxVsfO?= =?us-ascii?Q?2XQdPly28rO1uYAT+iNaE81lFI1q8ZoruOV1Lfs1oXkpDpQ36X5Xb+Ob2rfM?= =?us-ascii?Q?MTEp+Yj+tROA/7XhF+oC898urh1JioAO4MLSrirkqPLqlahndJdHXb/wNy/2?= =?us-ascii?Q?mO2VQAsZUTI/c25XXEz0AggsBC/61tcI58CzDCTimUtZZyBCfoeN+RSd0JTu?= =?us-ascii?Q?aOwyWe48/+XFJ3t8NJpxKwhnyBBlPt13TASlZSkhp/vOVafonW9cShOP758B?= =?us-ascii?Q?4S9519iNe+EEK2OHFqaMTwejawi8+Jr037bxwOxOIJwnvHKQRjeYanFUmEgn?= =?us-ascii?Q?KA5TnWu3H3bqeMc906mSGSsfb47o7vSckcgwlKRmOjZJseB/Rg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5576.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QSXd/SvfOAZc527PlfUYXrHxBNO2M6Fw50DL6ANKjK9hJqpcwAMWSTN4d6QW?= =?us-ascii?Q?1RtXOtVsZgYtDoi9zuiiR0qaI62flrMnuZmnPgVttCApUsslwAcNN0RyCAhr?= =?us-ascii?Q?uvG0C32zMum/plUqX3BrYsxB6Ifw74OYdItz/tJO/QixqlhaLYroqfIU++Vq?= =?us-ascii?Q?S0uZ9PX9BYoMzdMH25saoNMxpmskJs8Z5RERWRxi5bxstNJKWXcekrDwjWic?= =?us-ascii?Q?AyR5vs4gRAI1+rfBhMYKcIFp15u0Ntx4uY1kYo45WHRJXNSM1AEertq6QgAX?= =?us-ascii?Q?z5s5DwB0nCJ8PlMj1bptm7KK3QGqevjmuFVIarxt9J9gevN3D23hwoUkImmQ?= =?us-ascii?Q?kTkIiwgmOzrkWD/vKJIw3WbZCSfXQmvZIuBnrRye36yOb15ife44nexiWkSQ?= =?us-ascii?Q?1uVhYmksJi/G/yJ79kQ7w5VdY+n57J3P26X3rjFMl0SM/Jw3P6WtfEAlnZ9l?= =?us-ascii?Q?NMVZPUXD4NR+N9Hc9WfFM/VGAvOD5RFJoT/JWe2LsHFHZKQ2DPISNZbi8m88?= =?us-ascii?Q?T4e5xmaJSWfLFfpX+hAbMiiHXB12j2bRtD6LG57k5bK+wRv4Iy0Bex41+VLt?= =?us-ascii?Q?E/Syqyoc2m3ztsQwtCRTwxriU1PXIXS7ks/yui8V7J7PL1eBiW/Vqm0s7Fp8?= =?us-ascii?Q?E+sbhVhfEmhEUdHO3DSSYNq1Bmn6ZACXfY/zOaLW4WDRcUH7VhV19/fFMWom?= =?us-ascii?Q?3ibiiVsq/4b6D6aoON/4BUUjhuR5iHJYl0ZkwpgSjANQjtg6ihf6AhiOSXqN?= =?us-ascii?Q?8TOJeyj1nq1U6TSyicm3G9atD9EAE6dHxWpC/AVLoiBgIRireCTfV3wROs+y?= =?us-ascii?Q?ZDO1NlK94I9udDtOz0L8BefV0udL5vPo4mK43/CMOpTifyHmdODtNRWjSIh2?= =?us-ascii?Q?uofyjYQUvlXGVWNp/zyDkaJZJSuCg1v9sI1B4lY4o2GqlNXtfA/n7XIU4EM6?= =?us-ascii?Q?HJQGu9z4lAJTIwS+wXhehjeoz4eCC1Ptg6DhHxStpDEW+U6GPJlLWut1TgAp?= =?us-ascii?Q?7GDlrhO+wOzUwhYuvYNHoXIIrWf+sn18UL/TDq62pnDOfiQJfASzRmBrl3Ox?= =?us-ascii?Q?PoYzbfDuQynA2ZWbr7QeLWsrglTHL3d7+oqlaex5BRp1zH1e1aNtuzCNtF1H?= =?us-ascii?Q?sIZi2DjfMLeUTSaMZ19TXm8V1YwyhJPheb15/yaUVwaof/3Q/Cfs7nlhBavA?= =?us-ascii?Q?IkWEomiTRB8M/3Nqxac55knF4fjyJ2mxmTW0kUn7NiOATz5nNuYFwpdCp1CL?= =?us-ascii?Q?0pN9n91Ws04zhInlLfVvF2asxj8l3/f8cu4zS2o5poh0/OxYqNZ4AjAz/TAh?= =?us-ascii?Q?+uzbYWPrP+eJwZXvELqeu77NNRcl+o5owhY8BSHgi4t1k+eZ4bmCRU2w2X08?= =?us-ascii?Q?i0XYwVTaVuLENTuveVjXR5dZSZQMO7rdeno3rCawEz2Oq4FaWmmKoYFjMSSq?= =?us-ascii?Q?soEZn5t6qxJDxv5t96l1RsRrPlACJmpMeowLpPn+SSpiRLpZxvhyiuyR6dYC?= =?us-ascii?Q?BqLpLUxpkhfJrE7WJiLadQBODEsZOpjwmB2YUK/+4TMTGeVo/xPoFFLkZExo?= =?us-ascii?Q?rrS5OmogAlk6MOZ3gp8riX1TA66dWgiXxkXe/g7K?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07dd6941-805c-4a5d-ba8d-08dcc35d2796 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5576.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 10:20:04.5187 (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: 6ezNzFy/r+Mb7tnI2iGa/wNVECQY45slT6XNImwYsxCbi+rtSgQI8Je9xjgZa+8rd5SA6DfHdvgUodYUAKzLyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB5873 Content-Type: text/plain; charset="utf-8" Use devm_clk_get_enabled() instead of clk functions in uniphier-mdmac. Signed-off-by: Liao Yuanhong Reviewed-by: Jonathan Cameron --- drivers/dma/uniphier-mdmac.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/dma/uniphier-mdmac.c b/drivers/dma/uniphier-mdmac.c index ad7125f6e2ca..6b3570440b70 100644 --- a/drivers/dma/uniphier-mdmac.c +++ b/drivers/dma/uniphier-mdmac.c @@ -66,7 +66,6 @@ struct uniphier_mdmac_chan { =20 struct uniphier_mdmac_device { struct dma_device ddev; - struct clk *clk; void __iomem *reg_base; struct uniphier_mdmac_chan channels[]; }; @@ -383,6 +382,7 @@ static int uniphier_mdmac_probe(struct platform_device = *pdev) struct uniphier_mdmac_device *mdev; struct dma_device *ddev; int nr_chans, ret, i; + struct clk *clk; =20 nr_chans =3D platform_irq_count(pdev); if (nr_chans < 0) @@ -401,16 +401,12 @@ static int uniphier_mdmac_probe(struct platform_devic= e *pdev) if (IS_ERR(mdev->reg_base)) return PTR_ERR(mdev->reg_base); =20 - mdev->clk =3D devm_clk_get(dev, NULL); - if (IS_ERR(mdev->clk)) { + clk =3D devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) { dev_err(dev, "failed to get clock\n"); - return PTR_ERR(mdev->clk); + return PTR_ERR(clk); } =20 - ret =3D clk_prepare_enable(mdev->clk); - if (ret) - return ret; - ddev =3D &mdev->ddev; ddev->dev =3D dev; dma_cap_set(DMA_PRIVATE, ddev->cap_mask); @@ -429,12 +425,12 @@ static int uniphier_mdmac_probe(struct platform_devic= e *pdev) for (i =3D 0; i < nr_chans; i++) { ret =3D uniphier_mdmac_chan_init(pdev, mdev, i); if (ret) - goto disable_clk; + return ret; } =20 ret =3D dma_async_device_register(ddev); if (ret) - goto disable_clk; + return ret; =20 ret =3D of_dma_controller_register(dev->of_node, of_dma_xlate_by_chan_id, ddev); @@ -447,9 +443,6 @@ static int uniphier_mdmac_probe(struct platform_device = *pdev) =20 unregister_dmac: dma_async_device_unregister(ddev); -disable_clk: - clk_disable_unprepare(mdev->clk); - return ret; } =20 @@ -482,7 +475,6 @@ static void uniphier_mdmac_remove(struct platform_devic= e *pdev) =20 of_dma_controller_free(pdev->dev.of_node); dma_async_device_unregister(&mdev->ddev); - clk_disable_unprepare(mdev->clk); } =20 static const struct of_device_id uniphier_mdmac_match[] =3D { --=20 2.25.1