Skip to contentSkip to conversation

mailbox: sprd: Use devm_clk_get_enabled() helpers

PATCH In review Huan Yang 2 participants 2 messages Aug 22, 2024 – Aug 27, 2024

Subsystems (2)
lore
Share & tools
lore

Huan Yang

author
#0 lore raw

PATCH v3 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().

Due to clk only used in probe, not in suspend\resume, this pointer can remove from sprd_mbox_priv to save a little memory.

---
v2 -> v3: remove unneccessary suggested-by, add v2 marked reviewed tag v1 -> v2: remove clk pointer from sprd_mbox_priv

 drivers/mailbox/sprd-mailbox.c | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)
drivers/mailbox/sprd-mailbox.c +4 -21
index 9ae57de77d4d..ee8539dfcef5 100644
@@ -62,7 +62,6 @@ struct sprd_mbox_priv {
 	void __iomem		*outbox_base;
 	/*  Base register address for supplementary outbox */
 	void __iomem		*supp_base;
-	struct clk		*clk;
 	u32			outbox_fifo_depth;
 
 	struct mutex		lock;
@@ -291,19 +290,13 @@ 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;
 	struct sprd_mbox_priv *priv;
 	int ret, inbox_irq, outbox_irq, supp_irq;
 	unsigned long id, supp;
+	struct clk *clk;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
@@ -331,20 +324,10 @@ 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");
-	if (IS_ERR(priv->clk)) {
+	clk = devm_clk_get_enabled(dev, "enable");
+	if (IS_ERR(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;
+		return PTR_ERR(clk);
 	}
 
 	inbox_irq = platform_get_irq_byname(pdev, "inbox");
Signature · 1 line
2.45.2
Reviewed-by on v3 1/1
#1 lore raw
Quoted 5 lines · Huan Yang

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.

Quoted 7 lines

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

Due to clk only used in probe, not in suspend\resume, this pointer can remove from sprd_mbox_priv to save a little memory.

LGTM. Thanks.

Quoted 64 lines

---
v2 -> v3: remove unneccessary suggested-by, add v2 marked reviewed tag v1 -> v2: remove clk pointer from sprd_mbox_priv

  drivers/mailbox/sprd-mailbox.c | 25 ++++---------------------
  1 file changed, 4 insertions(+), 21 deletions(-)
drivers/mailbox/sprd-mailbox.c +4 -21
index 9ae57de77d4d..ee8539dfcef5 100644
@@ -62,7 +62,6 @@ struct sprd_mbox_priv {
  	void __iomem		*outbox_base;
  	/*  Base register address for supplementary outbox */
  	void __iomem		*supp_base;
-	struct clk		*clk;
  	u32			outbox_fifo_depth;
 
  	struct mutex		lock;
@@ -291,19 +290,13 @@ 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;
  	struct sprd_mbox_priv *priv;
  	int ret, inbox_irq, outbox_irq, supp_irq;
  	unsigned long id, supp;
+	struct clk *clk;
 
  	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
  	if (!priv)
@@ -331,20 +324,10 @@ 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");
-	if (IS_ERR(priv->clk)) {
+	clk = devm_clk_get_enabled(dev, "enable");
+	if (IS_ERR(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;
+		return PTR_ERR(clk);
  	}
 
  	inbox_irq = platform_get_irq_byname(pdev, "inbox");