Skip to contentSkip to conversation

mailbox: sprd: Use devm_clk_get_enabled() helpers

PATCH Superseded Huan Yang 2 participants 2 messages Aug 20, 2024

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Huan Yang

author
#0 lore raw

PATCH 1/1 mailbox: sprd: Use devm_clk_get_enabled() helpers

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

---
 drivers/mailbox/sprd-mailbox.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/mailbox/sprd-mailbox.c +1 -18
index 9ae57de77d4d..dca83026928f 100644
@@ -291,13 +291,6 @@ static const struct mbox_chan_ops sprd_mbox_ops = {
 	.shutdown	= sprd_mbox_shutdown,
 };
 
-static void sprd_mbox_disable(void *data)
-{
-	struct sprd_mbox_priv *priv = data;
-
-	clk_disable_unprepare(priv->clk);
-}
-
 static int sprd_mbox_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -331,22 +324,12 @@ static int sprd_mbox_probe(struct platform_device *pdev)
 	if (IS_ERR(priv->outbox_base))
 		return PTR_ERR(priv->outbox_base);
 
-	priv->clk = devm_clk_get(dev, "enable");
+	priv->clk = devm_clk_get_enabled(dev, "enable");
 	if (IS_ERR(priv->clk)) {
 		dev_err(dev, "failed to get mailbox clock\n");
 		return PTR_ERR(priv->clk);
 	}
 
-	ret = clk_prepare_enable(priv->clk);
-	if (ret)
-		return ret;
-
-	ret = devm_add_action_or_reset(dev, sprd_mbox_disable, priv);
-	if (ret) {
-		dev_err(dev, "failed to add mailbox disable action\n");
-		return ret;
-	}
-
 	inbox_irq = platform_get_irq_byname(pdev, "inbox");
 	if (inbox_irq < 0)
 		return inbox_irq;
Signature · 1 line
2.45.2
#1 lore raw

Le 20/08/2024 à 12:22, Huan Yang a écrit :

Quoted 9 lines

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

---

Hi,

if you want to go 1 step further, I think that 'clk' can now also be removed from struct sprd_mbox_priv.

Just my 2c.

CJ

Quoted 45 lines
  drivers/mailbox/sprd-mailbox.c | 19 +------------------
  1 file changed, 1 insertion(+), 18 deletions(-)
drivers/mailbox/sprd-mailbox.c +1 -18
index 9ae57de77d4d..dca83026928f 100644
@@ -291,13 +291,6 @@ static const struct mbox_chan_ops sprd_mbox_ops = {
  	.shutdown	= sprd_mbox_shutdown,
  };
 
-static void sprd_mbox_disable(void *data)
-{
-	struct sprd_mbox_priv *priv = data;
-
-	clk_disable_unprepare(priv->clk);
-}
-
  static int sprd_mbox_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
@@ -331,22 +324,12 @@ static int sprd_mbox_probe(struct platform_device *pdev)
  	if (IS_ERR(priv->outbox_base))
  		return PTR_ERR(priv->outbox_base);
 
-	priv->clk = devm_clk_get(dev, "enable");
+	priv->clk = devm_clk_get_enabled(dev, "enable");
  	if (IS_ERR(priv->clk)) {
  		dev_err(dev, "failed to get mailbox clock\n");
  		return PTR_ERR(priv->clk);
  	}
 
-	ret = clk_prepare_enable(priv->clk);
-	if (ret)
-		return ret;
-
-	ret = devm_add_action_or_reset(dev, sprd_mbox_disable, priv);
-	if (ret) {
-		dev_err(dev, "failed to add mailbox disable action\n");
-		return ret;
-	}
-
  	inbox_irq = platform_get_irq_byname(pdev, "inbox");
  	if (inbox_irq < 0)
  		return inbox_irq;