Received-SPF: pass (google.com: domain of linux-crypto+bounces-1010-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: ovidiu.panait@windriver.com
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, davem@davemloft.net, festevam@gmail.com
Subject: [PATCH v2 09/14] crypto: sahara - use devm_clk_get_enabled()
Date: Sun, 24 Dec 2023 10:21:39 +0200
Message-Id: <20231224082144.3894863-10-ovidiu.panait@windriver.com>
In-Reply-To: <20231224082144.3894863-1-ovidiu.panait@windriver.com>
References: <20231224082144.3894863-1-ovidiu.panait@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?JqhSB6uaCcNMU8bu89tppxpy69TzwjmrgVicBERvBOj5xbVHu0Q1MWO4SYQi?=
 =?us-ascii?Q?ZDtwbOe1ceS1Z9xPvbHeUpxoY2e+hrxltTPAbFIH1BfpAj2c1Kn1kmDzyxdi?=
 =?us-ascii?Q?6NXjreOu2t0Qk+0hjNjFSY55P1M1x0jvv4wUqiQdtoHrXAWhGs7JEIhFXr19?=
 =?us-ascii?Q?MKZsiHWEqiMh82EhKuYvpZZylrn1JSK5UunsKwed1bErArG7bBex5w14fw+K?=
 =?us-ascii?Q?jteP7FMWI4AoWO2MQS8v4XKBXSlvT97llz6wX4EGESluQqJjZ80UZGaeewpL?=
 =?us-ascii?Q?YI9lsQA+atRoIBQwhoLgqZ2sfbR80udTH8CUjrE/6t9NFr3WFfNJ42SeASno?=
 =?us-ascii?Q?Kdfuf8X0gNaPLJuahILpgWU3LpRXl2UUGYQ7QYW73GNjOad5lhOD8ruenqSO?=
 =?us-ascii?Q?LEnhJESAAQ7dd4c8MMN7H+sYs++WEQc/wTZX0q9mdgqMI0DglDZw35Qi6lZ+?=
 =?us-ascii?Q?GTXma9+jV0qw2JwdgSH1e139smZOky2VSmT6wNPSeBS2U1R+y8mr31jjOe+V?=
 =?us-ascii?Q?KuLDuFd9GFxLQOrqW344bQ4d1a2O9WM8RK6GyfbGCJV1bqJm/VTDjh1ZnHvr?=
 =?us-ascii?Q?Hyp9jpIAZkBYHKgiZEIEde3Qy4nc5kXZ3tEV9dCvU16E4PcHBDVpgCzMyXUq?=
 =?us-ascii?Q?E6EhNG2KkKDqJHt0II96x2t+opZLhNlz7Qx7d+NOyaiQGWZi0h6YuBwuFSHt?=
 =?us-ascii?Q?AnSLXxDBoE6+F9sIekoKfD+4wPtXpSRb8fTWJsk1PQ+LKChsIs6xa9TyhGZi?=
 =?us-ascii?Q?6a0fROyLftQcMjIF2Na4AZ2qpZc4v5Tn8S7N164HYGP3s/qbpf8XnhSIFHwc?=
 =?us-ascii?Q?lVC0578gH3NM+V3rEVbDifF4vHS/k77Z8Re0r0mG92yHOOiMPdg7yXvgTtra?=
 =?us-ascii?Q?n6WymroYPMceCjsjRPxCiiCupJabIMLTF0Ci9Lt1mq07EPeL+4/Zy1QRs3W1?=
 =?us-ascii?Q?DVK1/felZYIt6molMLoof95jSSFU+4F72cIzdCwsDUGHhCCmBmM98uoP4gJJ?=
 =?us-ascii?Q?6AEXby7Rr3TjLxsZBGWxoZflICWaeRjGXAL+4uhbtjyPTjw/bfEwAX/1AqmI?=
 =?us-ascii?Q?DGhP7mqMKKueAZVN9Eef72hy/qqEuMd+N+K4wJf5utrli5srr7R8ZrXmefuD?=
 =?us-ascii?Q?Me7Yaz4X5IX36imqzHKVT1DsAJlunMcMGkGh90ct1dhN1RtSuXy5T4BR9NPR?=
 =?us-ascii?Q?V/dTYWQsJ5qwGWOrqnoGEX4Q97no766/3PqXys8G5FV6DJmnmbF7LOTYjpXa?=
 =?us-ascii?Q?ex+CZckTXIRI8r4e+62CG4ZUykt+MK6BdryM+lCUbS2TOp3V8HGR92ahRISt?=
 =?us-ascii?Q?ni8JzYjNIdv1Gjleu2vgKevot5J8qx9AivDy9G1VbL0DsJYgOBA4+Z5CPrQ1?=
 =?us-ascii?Q?C99W5WifOOxMOgoc4/YJpxvkYjA85Tt+rYpma36AmaAGBa0QfHRSTwfCMz9I?=
 =?us-ascii?Q?8Jdm5ozGzxnh9KfTTQu+2DdqzkkNAINCORxPrTyvGAhX7grH/60D7koC47xH?=
 =?us-ascii?Q?adT9K/xlIkixxSzytaWk7fOlkDlzB5nU0ZSurP7TJcnHq8MlvRUFYFALrSHu?=
 =?us-ascii?Q?DcLI/XDTfrFEfW0QOrnCi/v1qOJ4TmKQbGVEJdlx4c6nV6htvYQR9JC7dEVt?=
 =?us-ascii?Q?qg=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1443a529-7efd-49a7-fa84-08dc04594aa0
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2023 08:21:13.1911
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0EhiLJ8ZpnOPR/RiRxX03PK0Jmh8Q9WT8H3mSv9pn6V5eZWdjPyMoMhqZhFvOlGzT5sB8R1bEZ5haGGSi4hhM8OfYAD3cPP9sXtbuepNHzA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4693
X-Proofpoint-GUID: yeqOHGeonpJs1gb4mOigtsErFJpsZLZc
X-Proofpoint-ORIG-GUID: yeqOHGeonpJs1gb4mOigtsErFJpsZLZc
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 priorityscore=1501
 impostorscore=0 spamscore=0 bulkscore=0 malwarescore=0 clxscore=1015
 phishscore=0 lowpriorityscore=0 mlxlogscore=978 suspectscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.19.0-2311290000 definitions=main-2312240066

From: Ovidiu Panait <ovidiu.panait@windriver.com>

Use devm_clk_get_enabled() helper to simplify probe/remove code. Also, use
dev_err_probe() for error reporting.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 drivers/crypto/sahara.c | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c
index ba7d3a917101..619a1df69410 100644
--- a/drivers/crypto/sahara.c
+++ b/drivers/crypto/sahara.c
@@ -1352,17 +1352,15 @@ static int sahara_probe(struct platform_device *pdev)
 	}
 
 	/* clocks */
-	dev->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
-	if (IS_ERR(dev->clk_ipg)) {
-		dev_err(&pdev->dev, "Could not get ipg clock\n");
-		return PTR_ERR(dev->clk_ipg);
-	}
+	dev->clk_ipg = devm_clk_get_enabled(&pdev->dev, "ipg");
+	if (IS_ERR(dev->clk_ipg))
+		return dev_err_probe(&pdev->dev, PTR_ERR(dev->clk_ipg),
+				     "Could not get ipg clock\n");
 
-	dev->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
-	if (IS_ERR(dev->clk_ahb)) {
-		dev_err(&pdev->dev, "Could not get ahb clock\n");
-		return PTR_ERR(dev->clk_ahb);
-	}
+	dev->clk_ahb = devm_clk_get_enabled(&pdev->dev, "ahb");
+	if (IS_ERR(dev->clk_ahb))
+		return dev_err_probe(&pdev->dev, PTR_ERR(dev->clk_ahb),
+				     "Could not get ahb clock\n");
 
 	/* Allocate HW descriptors */
 	dev->hw_desc[0] = dmam_alloc_coherent(&pdev->dev,
@@ -1422,13 +1420,6 @@ static int sahara_probe(struct platform_device *pdev)
 
 	init_completion(&dev->dma_completion);
 
-	err = clk_prepare_enable(dev->clk_ipg);
-	if (err)
-		return err;
-	err = clk_prepare_enable(dev->clk_ahb);
-	if (err)
-		goto clk_ipg_disable;
-
 	version = sahara_read(dev, SAHARA_REG_VERSION);
 	if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx27-sahara")) {
 		if (version != SAHARA_VERSION_3)
@@ -1466,9 +1457,6 @@ static int sahara_probe(struct platform_device *pdev)
 err_algs:
 	kthread_stop(dev->kthread);
 	dev_ptr = NULL;
-	clk_disable_unprepare(dev->clk_ahb);
-clk_ipg_disable:
-	clk_disable_unprepare(dev->clk_ipg);
 
 	return err;
 }
@@ -1481,9 +1469,6 @@ static void sahara_remove(struct platform_device *pdev)
 
 	sahara_unregister_algs(dev);
 
-	clk_disable_unprepare(dev->clk_ipg);
-	clk_disable_unprepare(dev->clk_ahb);
-
 	dev_ptr = NULL;
 }
 
-- 
2.34.1