From patchwork Tue Aug 27 09:57:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 13779186 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89D21C52D6F for ; Tue, 27 Aug 2024 09:51:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=loKZ3Jg1P258pXcp3YCt+6qnQHyeqRZ5FiyqwfFFhhU=; b=miyr+kRKNiZKH/jN62UqBcpj3v +KPs5N/8tTyavLdqD2AfpwFxEzk4wA/Nr40mfF395Haz+bQVsSXUllqIJ7/ctGMpChXTAGesGnYYZ Zgn+ts90Jb0RfZ/qCDCQzEqXdS5Xip8YT0qKYnPpOx4dpIO8HblfFlQIU1wajJ8b21Mi6aGXsIDGO 1wEbFjqTl7Keg3eiXKVUXxJWYZo/T994dmSig99jMrnPigGpEiwtdyf8RtPMeG9AkXqR75I2PPskv gO4el/SWyoZ61RUql7rUTLirELO+9idK6bjWzZrtzySPzobw7r29xHkLDJ/Wsl3QW33C+eFCu75Fb ly8LG1Og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sisr8-0000000AfTx-14nK; Tue, 27 Aug 2024 09:51:18 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sisj6-0000000AdG1-2XV0 for linux-arm-kernel@bombadil.infradead.org; Tue, 27 Aug 2024 09:43:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=loKZ3Jg1P258pXcp3YCt+6qnQHyeqRZ5FiyqwfFFhhU=; b=UZkoV8mZ+CG9yz9iDQV9cSnZO2 jkAbW4twYm8TbK/dSMtH5CJXG+VfrJbh+QXU3duL3ponB08ZcWiQxBY2DR0d4gTh90gmxRboiEeG3 9WpdCT/HueMo5FpXBhIt5a3dFv4z2W7CSm7dSFyBR2Dx3PHlnQZ+vPIyF9LiILvu96qAiU+4ZjUKF q5Y5siH5LeYl/76ObpMfzW2cQyIWjWHuNE7HIjDg/VY+baw4+5FAZ04Xq/3LlFzExBKY1Q5TEDX5V BTx/XlPQnFgr6y/rcePEbwNnTyM+Mrr4/hA8/XGLxQhMpvBJwvwrh216c+qTfoOCdFkByxZPNjxOK MEsOaYFQ==; Received: from mail-sgaapc01on20606.outbound.protection.outlook.com ([2a01:111:f400:feab::606] helo=APC01-SG2-obe.outbound.protection.outlook.com) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sisj3-0000000Ar65-17MK for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 09:42:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hwHk+GqvtI3HEVAtOEpovTFa6tzOkOfoiQNiVWu4wvIrebJflPxcq+onAxDeD4ezkBk0P2G4OsBTobAtzL67HTla3KFzUmvYM0UzQL4oCWArCmmPnZxrz5ENsyL6eZUe9qbygFFNlA/TB2DeO/1s5NzeSDkmNGwPfTGfIXfhTHgI4idzXM3NwQfoA7ZmEqDVTKP7Ub1qHf2vSvYYe14Uo7iXWl2pxm4eBiMjoYqfPOQTRJtXIK9PCyAgfVf/9mnd57zLkAHSyWjRsETbiGosb7/OMXi/nEfVziYYIRuFGeudV+d1nGq/hL86lwfyShgzae+znvqpfFA6N5xyoHGsSg== 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=loKZ3Jg1P258pXcp3YCt+6qnQHyeqRZ5FiyqwfFFhhU=; b=AntMXu/Hxece4NyI6wiHCbixUdHM/A7N8Zf1ggffJU3HUtMb0xQWnMGWuPa+SB8qgQEO7E10yX1Zl0PfUw4WGpawawy2byyY5g+qmsjkRbN1JrjBLGuSTxwO9eYd0/fjUjxXNOsVw02mR343vm2Dr3k+WXmesrJbIF5xWGLgattar1MZ60Tbln9+eJYWSv0xnJfOKnkTT/9WoFPJ6Tb4bau2aBergVz4XILi+o+I0e6tHern03dP3EaUD7yoRcbOrPaQxnQAOXngFbZSrQtrVFPV/MfgPRoxX58HrYfK5icAWczXYABoZLGiaHdnrdpLc9Qf3R/eTIAmyfJSz01QGQ== 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=loKZ3Jg1P258pXcp3YCt+6qnQHyeqRZ5FiyqwfFFhhU=; b=GyYLYFFs2fYub5IdVSNekgcJcn5yAnqd96V0a7zDqopfYoOmYw44IkQl0omWTmdw8xN8tkhbLqV4mN0ZvkZGDeqazfc5rNH3cO4dkRylNhBLHlQduAph0ZWaSLgcebQknVB7qO58j3byUa1ZPJaKMv9Uo5J50hTS60NTwdRxvoOS1NeuCMnXoU2I5lUbVSYWKZ4qNU/8MIkW7//tDAwuUjSrhxUUQUOKn98LM86pU0DV922iPt8pO61qxHWIATkkO6LzhtABb+13monTnnR3RLtIAFTc+MfH58+xGGzN7A+yfJW/hOUCCj62UMAsPJrdeDfV/bxyrgk1ECdnvB+Elg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by TYZPR06MB5734.apcprd06.prod.outlook.com (2603:1096:400:281::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.24; Tue, 27 Aug 2024 09:42:53 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::8c74:6703:81f7:9535]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::8c74:6703:81f7:9535%7]) with mapi id 15.20.7897.021; Tue, 27 Aug 2024 09:42:53 +0000 From: Yangtao Li To: clement.leger@bootlin.com, andrew@lunn.ch, f.fainelli@gmail.com, olteanv@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ulli.kroll@googlemail.com, linus.walleij@linaro.org, marcin.s.wojtas@gmail.com, linux@armlinux.org.uk, alexandre.torgue@foss.st.com, joabreu@synopsys.com, mcoquelin.stm32@gmail.com, hkallweit1@gmail.com, u.kleine-koenig@pengutronix.de, jacob.e.keller@intel.com, justinstitt@google.com, sd@queasysnail.net, horms@kernel.org Cc: linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Yangtao Li Subject: [net-next v3 9/9] net: marvell: pxa168_eth: Convert to devm_clk_get_enabled() Date: Tue, 27 Aug 2024 03:57:12 -0600 Message-Id: <20240827095712.2672820-10-frank.li@vivo.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240827095712.2672820-1-frank.li@vivo.com> References: <20240827095712.2672820-1-frank.li@vivo.com> X-ClientProxiedBy: SI2PR02CA0053.apcprd02.prod.outlook.com (2603:1096:4:196::16) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|TYZPR06MB5734:EE_ X-MS-Office365-Filtering-Correlation-Id: 2300050a-1963-451e-acac-08dcc67c9f7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: EmPvyhko7dfPYZb8SeFkqpfCgWtq4VkejUzPjSWu/EnXwBIJfXIg5zF339ccm2VZdWlQ2TKgBZQBJsFmwlEC3mRP9SRj4IdOjG6W7Dm9rXXgOfIo03spaUdD0X2xsZvlDjrrOXoP0mvEkos1qCDMEzM9VNaiQ1fRgYsvkcnW8q39JJC6f9IdSrXjd3EipMHOf3g+0oFZrq7m1uv6Ux5ZwbSjn+ZUA4uSoz/f6Tzk/E41zOH2NJiI+hAsM763H6NRKoHkSzZf+sysQKWNLiCCoNw4oWBGiBrkgosPpXUsgmh9WbwsBWHL/cRq21P4wiVme7zB9I8USBYA3cwD0cABnPW6WFrMsaRtIQROY8sIoZGABwxZ0+6phDT9M/pcvcgDDCTAwkgT/C3oHYG4poqquzjQZ7XiIWTxwmfqoRi4kjFMkROZCbu88pBryaEcC/7S4/sb4v3SKcmFHiA1BHNFBCqIA3PznJ4e1aCsN/3oDyo78crSBVWIgLS8x+f5wDKsUKT8ru6/aw+Bm5Lr+NtWrNP8Xs96IiAnKViA82pMCCG48+aXKxVIcKLvWJnRVIyMaYajAuXzumMDctq1T6RAt7NsmvSBBJkNAG3IWklWMPobFaLLBn/dZ6lTFnsCKIB4ZFnBj6oGDcj9zSD6iVPbsK69m2QY1tsXxP8VEj2AJm57EAeDtMbOWR88Lb5r5MpxzaVLfOwL2fu4TzOUtZFFjD1SAXgBA3mbXFRI67ZKK7gMCvi8dwQ/AOPyk5J5hOz+2ev4/lxFhgddNZiHhbAtqWoM4kZ83cQa6chpxZwwCjk2eHoJSN0iV+o87V0WIqz/qZe4ALbLxQQdZd30nObUc+UdxV2sIafq2p8YhQ15MHe9jqq13sdsBCVTREZqzA/U0c2JTx8/ayPR4xXpwWiQK3JPLHcIdXYw8FBb2VClYKl2WnBk25Zq+C0OhaXBD7IzbDM7FwqF+l94OEPEmVEH4QPSsmnEpKqVlyNIIeuOTGbDA9kBEzEpgd5egriIU104VdjRhvfAcXy7jwacpJPH0MOJkCCVDPs5gRwUYO9oB3yJtTbVGqLg3Sh9nFJPFEBXq3MyVFxeQDFLkn7rurOcJn2VVpLHOZU8IA90sjzbD3gbU5KjBcekPn4h/0uq5yp16C1URRIYD1L7IrF8vmNNTbWeS3pcQOXerSSK+WwQ7bxXPBTQ3SyWv0x9sx5kzn0EIUWBOo582ZAmcGyg5VoxcTSnWAWmEuL7LDhlutnnPz3NZPG1reHSYLeuAzLq+Mg0aWQw0o9LAr/q2QDhdY3deo3/RyYoDz8BBEmjQz6+NLSkIrIXsfgMIwelCfVasxrT2A7T3TEiRlWJEZTzefpa9PAaJ7u6PZ8Qt2VLa+QT33oQVV5Z9jZCBgQp59ySG0AQNRvvutCvLoogCi6XJY1+xPj+w8vgc4tycb7m+7ijoZY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(7416014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YIDQB1GhOUHvjOuGaDZNgZVExRU+pc+OxHOkTv34zXoR9uXKAsQyDvOwqYlTKv74xdPNFFGiNzxxznZ0V0rJcb/z8G1Q/D82W6EnGnBNSkYUCRzLhbh+51aL+i2kvfAPrLag9pYPgyn61EUbwHqsGIg/KGimqsenMsWn96NrYmr51yUAqkMgGfhtyIUBZbeHUxzwljtoVBhw9n1cXRoUVvnNXU5ZKSlSNGKz3Xb1FztlfiqNVlBQR1dpKTws2sgYf+WbALCyOcy9OIdUaFPXCI0QDHFaQ7GvP6OEs0jpKvwFxnT0IASj4ApRjfzs7lX/zO3beACHF3BJOS4Kr2hnqGKMtFsXq7oft1FnBv+RqYUUdUPupE6GZeSf73/bHswhiXiYQGeY087qgfr+Z+kNEs4jlCtUTBXiAxq4EzE+sbDD5WLGoOtENLKtLJzbIRIO5adjPTumBEpWYg5jHyBAqbnjSJl6q6FMPhL0KizgcsYjXfKn+R/bF+r9o6bVoRcZHHlEiqw6EWfGDQvRMPSf7qJ+ZEMkoqu9+Bq3xLzFcCB/rINS5lwsKNq7nXEOUbeVPBpFA6cMqpErzOn4OE3ugAfAUSMM4zxvapVaKihLb9XHh18ixquB5lamiGDgEaVoq9RH4Cwir8q9GSkfc1sspwhflR8t8NZFN12uiN21lxvGr1DzXhxmWlvtcFnsC2e2l4Mzweg3SOzGbBC7Wa/nmlQnVF07SHPPEi6OCDqiGjT1DF8V3ufVfLBPQwrKHmcqqO9Blfu7+IcAxncG5H6T+Ac8vFhT+CaVA+KI1aEGqwdhACBUS7RYizB7sVhlrHTzl1P+cunFg/UjFWuzGh5QLAVvSiuDEuN/6REJUD23HYWSbU8neEnh7HRiwqqD6y7SXXe9VPO9gQ3+xaocv8AtpN86XCFxBXRxwoZ55Z2DMRkFST/70SLIXY86U2GiCet6cf8BJ3Zr5px2cptKHxEipsgliUHaYdtwaBkbIIC8oFe+9rgD+XHtAcG6KFEPh6ypV3aW+nsxCB1mAcKOaJmlp+Ty2xr1Rgm7grkbJKrtMYxieKLvtXKU4K9YdaG/wI/fN3XZ4T9mipHDMbZ89lr63j0AQSvGl88G1S0pPVLaSnJ/h0FjaYfOnxT552ZipwV1iyrCw3z7bRxYiZ5stVasMd/EGklgdBJt6hJ12SSJUKE+9X+3SkGFbE4/a2bVQb4aeA9/zSSqwhKgWewWFiXJ8BERDfoYTUNeFzX69wjg/ONmF41o8FaAY4Yir+zE+HqNIsybH7g8Dpxf5gvIMXeIhTJKX5Hy0YSW3skU+HR6Mr48GiAIw4ikZAUGVBBFlcp7Dkn3Pc/OICPx44Fyme0NSyn8DtwAP33A2DXkT+aYidx39jeN3Uq5MZgEsi3NS6bEJxK5dRI7U0o519hbGsoEAArzNiUKnT6oby43SjOlAAWdJ8srHfFXvxww2W+s9IhRLyY5GVmeHabpylVVF8Vj9Qw8MIRgaMskr7CCfpf7Nh99K17/IJC9n14DOCalJdfE7fh5OgZLT519SD+tqIzbLygodlJpS4J+9tnqE2BOjHtyGy/G0WtzzlaKYgnchBJN X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2300050a-1963-451e-acac-08dcc67c9f7e X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2024 09:42:53.5264 (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: KnQGE2Og8283HW4EoODAnKWWEx2eM67AUosbCNvqNoL3mB27Zr+GR1eXZOoeB1/vLC5Ngon2r+bya+nK+Fv+/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5734 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_104257_598379_D11EF263 X-CRM114-Status: GOOD ( 12.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert devm_clk_get(), clk_prepare_enable() to a single call to devm_clk_get_enabled(), as this is exactly what this function does. Signed-off-by: Yangtao Li --- drivers/net/ethernet/marvell/pxa168_eth.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 1a59c952aa01..bad91cc705e8 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -237,8 +237,6 @@ struct pxa168_eth_private { struct timer_list timeout; struct mii_bus *smi_bus; - /* clock */ - struct clk *clk; struct pxa168_eth_platform_data *pd; /* * Ethernet controller base address. @@ -1394,23 +1392,19 @@ static int pxa168_eth_probe(struct platform_device *pdev) printk(KERN_NOTICE "PXA168 10/100 Ethernet Driver\n"); - clk = devm_clk_get(&pdev->dev, NULL); + clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(clk)) { dev_err(&pdev->dev, "Fast Ethernet failed to get clock\n"); - return -ENODEV; + return PTR_ERR(clk); } - clk_prepare_enable(clk); dev = alloc_etherdev(sizeof(struct pxa168_eth_private)); - if (!dev) { - err = -ENOMEM; - goto err_clk; - } + if (!dev) + return -ENOMEM; platform_set_drvdata(pdev, dev); pep = netdev_priv(dev); pep->dev = dev; - pep->clk = clk; pep->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(pep->base)) { @@ -1523,8 +1517,6 @@ static int pxa168_eth_probe(struct platform_device *pdev) mdiobus_free(pep->smi_bus); err_netdev: free_netdev(dev); -err_clk: - clk_disable_unprepare(clk); return err; } @@ -1542,7 +1534,6 @@ static void pxa168_eth_remove(struct platform_device *pdev) if (dev->phydev) phy_disconnect(dev->phydev); - clk_disable_unprepare(pep->clk); mdiobus_unregister(pep->smi_bus); mdiobus_free(pep->smi_bus); unregister_netdev(dev);