Skip to contentSkip to conversation

ASoC: cirrus: ep93xx-i2s: Clean up resource management

PATCH New [email protected] 1 participant 3 messages Nov 17

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ASoC: cirrus: ep93xx-i2s: Clean up resource management

From: bui duc phuc <[email protected]>

Hi all,

This series simplifies IRQ error checking and clock resource management in the ep93xx-i2s driver.

Compile-tested only.

Best regards,
Phuc

bui duc phuc (2):
ASoC: cirrus: ep93xx-i2s: Simplify platform_get_irq() error check
ASoC: cirrus: ep93xx-i2s: Use devm_clk_get()

 sound/soc/cirrus/ep93xx-i2s.c | 51 +++++++++--------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 ASoC: cirrus: ep93xx-i2s: Simplify platform_get_irq() error check

From: bui duc phuc <[email protected]>

platform_get_irq() is documented to return a non-zero IRQ number on success and a negative error number on failure. Drop the special handling of a zero return value and check only for irq < 0.

---
 sound/soc/cirrus/ep93xx-i2s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/cirrus/ep93xx-i2s.c +2 -2
index 97816fb75368..8dcfc6717e19 100644
@@ -462,8 +462,8 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
 
 	if (IS_ENABLED(CONFIG_SND_EP93XX_SOC_I2S_WATCHDOG)) {
 		int irq = platform_get_irq(pdev, 0);
-		if (irq <= 0)
-			return irq < 0 ? irq : -ENODEV;
+		if (irq < 0)
+			return irq;
 
 		err = devm_request_irq(&pdev->dev, irq, ep93xx_i2s_interrupt, 0,
 				       pdev->name, info);
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 ASoC: cirrus: ep93xx-i2s: Use devm_clk_get()

In reply to [email protected]

From: bui duc phuc <[email protected]>

Use devm_clk_get() to manage clock references automatically, simplifying the error path in probe() and allowing the remove() callback to be dropped.

---
 sound/soc/cirrus/ep93xx-i2s.c | 47 ++++++++---------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)
sound/soc/cirrus/ep93xx-i2s.c +11 -36
index 8dcfc6717e19..f2d55763a02d 100644
@@ -471,54 +471,30 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
 			return err;
 	}
 
-	info->mclk = clk_get(&pdev->dev, "mclk");
-	if (IS_ERR(info->mclk)) {
-		err = PTR_ERR(info->mclk);
-		goto fail;
-	}
+	info->mclk = devm_clk_get(&pdev->dev, "mclk");
+	if (IS_ERR(info->mclk))
+		return PTR_ERR(info->mclk);
 
-	info->sclk = clk_get(&pdev->dev, "sclk");
-	if (IS_ERR(info->sclk)) {
-		err = PTR_ERR(info->sclk);
-		goto fail_put_mclk;
-	}
+	info->sclk = devm_clk_get(&pdev->dev, "sclk");
+	if (IS_ERR(info->sclk))
+		return PTR_ERR(info->sclk);
 
-	info->lrclk = clk_get(&pdev->dev, "lrclk");
-	if (IS_ERR(info->lrclk)) {
-		err = PTR_ERR(info->lrclk);
-		goto fail_put_sclk;
-	}
+	info->lrclk = devm_clk_get(&pdev->dev, "lrclk");
+	if (IS_ERR(info->lrclk))
+		return PTR_ERR(info->lrclk);
 
 	dev_set_drvdata(&pdev->dev, info);
 
 	err = devm_snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
 					 &ep93xx_i2s_dai, 1);
 	if (err)
-		goto fail_put_lrclk;
+		return err;
 
 	err = devm_ep93xx_pcm_platform_register(&pdev->dev);
 	if (err)
-		goto fail_put_lrclk;
+		return err;
 
 	return 0;
-
-fail_put_lrclk:
-	clk_put(info->lrclk);
-fail_put_sclk:
-	clk_put(info->sclk);
-fail_put_mclk:
-	clk_put(info->mclk);
-fail:
-	return err;
-}
-
-static void ep93xx_i2s_remove(struct platform_device *pdev)
-{
-	struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
-
-	clk_put(info->lrclk);
-	clk_put(info->sclk);
-	clk_put(info->mclk);
 }
 
 static const struct of_device_id ep93xx_i2s_of_ids[] = {
@@ -529,7 +505,6 @@ MODULE_DEVICE_TABLE(of, ep93xx_i2s_of_ids);
 
 static struct platform_driver ep93xx_i2s_driver = {
 	.probe	= ep93xx_i2s_probe,
-	.remove = ep93xx_i2s_remove,
 	.driver	= {
 		.name	= "ep93xx-i2s",
 		.of_match_table = ep93xx_i2s_of_ids,
Signature · 1 line
2.43.0