[PATCH v2 1/2] ASoC: atmel-classd: Simplify probe error handling
From: phucduc . bui
Date: Sun Nov 15 2026 - 23:27:33 EST
From: bui duc phuc <phucduc.bui@xxxxxxxxx>
Use dev_err_probe() for clock acquisition and regmap initialization
to suppress probe deferral logs and simplify error handling.
Also remove the unnecessary cleanup label, as all resources are
managed by devm.
Signed-off-by: bui duc phuc <phucduc.bui@xxxxxxxxx>
---
Change in v2:
- Use dev_err_probe() for devm_regmap_init_mmio() error handling.
sound/soc/atmel/atmel-classd.c | 37 ++++++++++++----------------------
1 file changed, 13 insertions(+), 24 deletions(-)
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 746e6bbbf423..59490e9effab 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -547,18 +547,14 @@ static int atmel_classd_probe(struct platform_device *pdev)
return dd->irq;
dd->pclk = devm_clk_get(dev, "pclk");
- if (IS_ERR(dd->pclk)) {
- ret = PTR_ERR(dd->pclk);
- dev_err(dev, "failed to get peripheral clock: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(dd->pclk))
+ return dev_err_probe(dev, PTR_ERR(dd->pclk),
+ "failed to get peripheral clock\n");
dd->gclk = devm_clk_get(dev, "gclk");
- if (IS_ERR(dd->gclk)) {
- ret = PTR_ERR(dd->gclk);
- dev_err(dev, "failed to get GCK clock: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(dd->gclk))
+ return dev_err_probe(dev, PTR_ERR(dd->gclk),
+ "failed to get GCK clock\n");
io_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(io_base))
@@ -569,11 +565,9 @@ static int atmel_classd_probe(struct platform_device *pdev)
dd->regmap = devm_regmap_init_mmio(dev, io_base,
&atmel_classd_regmap_config);
- if (IS_ERR(dd->regmap)) {
- ret = PTR_ERR(dd->regmap);
- dev_err(dev, "failed to init register map: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(dd->regmap))
+ return dev_err_probe(dev, PTR_ERR(dd->regmap),
+ "failed to init register map\n");
ret = devm_snd_soc_register_component(dev,
&atmel_classd_cpu_dai_component,
@@ -593,29 +587,24 @@ static int atmel_classd_probe(struct platform_device *pdev)
/* register sound card */
card = devm_kzalloc_obj(dev, *card);
- if (!card) {
- ret = -ENOMEM;
- goto unregister_codec;
- }
+ if (!card)
+ return -ENOMEM;
snd_soc_card_set_drvdata(card, dd);
ret = atmel_classd_asoc_card_init(dev, card);
if (ret) {
dev_err(dev, "failed to init sound card\n");
- goto unregister_codec;
+ return ret;
}
ret = devm_snd_soc_register_card(dev, card);
if (ret) {
dev_err(dev, "failed to register sound card: %d\n", ret);
- goto unregister_codec;
+ return ret;
}
return 0;
-
-unregister_codec:
- return ret;
}
static struct platform_driver atmel_classd_driver = {
--
2.43.0