Skip to content

Commit 2333abb

Browse files
Sheetalbroonie
authored andcommitted
ASoC: tegra: Use dev_err_probe() in OPE, PEQ and MBDRC drivers
Log errors in the Tegra210 OPE, PEQ and MBDRC probe paths using dev_err_probe(). Drop redundant dev_err() at tegra210_peq_regmap_init() and tegra210_mbdrc_regmap_init() call sites in ope_probe() since these functions already log errors internally. Signed-off-by: Sheetal <sheetal@nvidia.com> Link: https://patch.msgid.link/20260401112500.4076861-3-sheetal@nvidia.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 00d6070 commit 2333abb

3 files changed

Lines changed: 24 additions & 32 deletions

File tree

sound/soc/tegra/tegra210_mbdrc.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -988,14 +988,14 @@ int tegra210_mbdrc_regmap_init(struct platform_device *pdev)
988988

989989
child = of_get_child_by_name(dev->of_node, "dynamic-range-compressor");
990990
if (!child)
991-
return -ENODEV;
991+
return dev_err_probe(dev, -ENODEV,
992+
"missing 'dynamic-range-compressor' DT child node\n");
992993

993994
err = of_address_to_resource(child, 0, &mem);
994995
of_node_put(child);
995-
if (err < 0) {
996-
dev_err(dev, "fail to get MBDRC resource\n");
997-
return err;
998-
}
996+
if (err < 0)
997+
return dev_err_probe(dev, err,
998+
"failed to get MBDRC resource\n");
999999

10001000
mem.flags = IORESOURCE_MEM;
10011001
regs = devm_ioremap_resource(dev, &mem);
@@ -1004,10 +1004,9 @@ int tegra210_mbdrc_regmap_init(struct platform_device *pdev)
10041004

10051005
ope->mbdrc_regmap = devm_regmap_init_mmio(dev, regs,
10061006
&tegra210_mbdrc_regmap_cfg);
1007-
if (IS_ERR(ope->mbdrc_regmap)) {
1008-
dev_err(dev, "regmap init failed\n");
1009-
return PTR_ERR(ope->mbdrc_regmap);
1010-
}
1007+
if (IS_ERR(ope->mbdrc_regmap))
1008+
return dev_err_probe(dev, PTR_ERR(ope->mbdrc_regmap),
1009+
"MBDRC regmap init failed\n");
10111010

10121011
regcache_cache_only(ope->mbdrc_regmap, true);
10131012

sound/soc/tegra/tegra210_ope.c

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -318,34 +318,28 @@ static int tegra210_ope_probe(struct platform_device *pdev)
318318

319319
ope->regmap = devm_regmap_init_mmio(dev, regs,
320320
&tegra210_ope_regmap_config);
321-
if (IS_ERR(ope->regmap)) {
322-
dev_err(dev, "regmap init failed\n");
323-
return PTR_ERR(ope->regmap);
324-
}
321+
if (IS_ERR(ope->regmap))
322+
return dev_err_probe(dev, PTR_ERR(ope->regmap),
323+
"regmap init failed\n");
325324

326325
regcache_cache_only(ope->regmap, true);
327326

328327
dev_set_drvdata(dev, ope);
329328

330329
err = tegra210_peq_regmap_init(pdev);
331-
if (err < 0) {
332-
dev_err(dev, "PEQ init failed\n");
330+
if (err < 0)
333331
return err;
334-
}
335332

336333
err = tegra210_mbdrc_regmap_init(pdev);
337-
if (err < 0) {
338-
dev_err(dev, "MBDRC init failed\n");
334+
if (err < 0)
339335
return err;
340-
}
341336

342337
err = devm_snd_soc_register_component(dev, &tegra210_ope_cmpnt,
343338
tegra210_ope_dais,
344339
ARRAY_SIZE(tegra210_ope_dais));
345-
if (err) {
346-
dev_err(dev, "can't register OPE component, err: %d\n", err);
347-
return err;
348-
}
340+
if (err)
341+
return dev_err_probe(dev, err,
342+
"can't register OPE component\n");
349343

350344
pm_runtime_enable(dev);
351345

sound/soc/tegra/tegra210_peq.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,25 +408,24 @@ int tegra210_peq_regmap_init(struct platform_device *pdev)
408408

409409
child = of_get_child_by_name(dev->of_node, "equalizer");
410410
if (!child)
411-
return -ENODEV;
411+
return dev_err_probe(dev, -ENODEV,
412+
"missing 'equalizer' DT child node\n");
412413

413414
err = of_address_to_resource(child, 0, &mem);
414415
of_node_put(child);
415-
if (err < 0) {
416-
dev_err(dev, "fail to get PEQ resource\n");
417-
return err;
418-
}
416+
if (err < 0)
417+
return dev_err_probe(dev, err,
418+
"failed to get PEQ resource\n");
419419

420420
mem.flags = IORESOURCE_MEM;
421421
regs = devm_ioremap_resource(dev, &mem);
422422
if (IS_ERR(regs))
423423
return PTR_ERR(regs);
424424
ope->peq_regmap = devm_regmap_init_mmio(dev, regs,
425425
&tegra210_peq_regmap_config);
426-
if (IS_ERR(ope->peq_regmap)) {
427-
dev_err(dev, "regmap init failed\n");
428-
return PTR_ERR(ope->peq_regmap);
429-
}
426+
if (IS_ERR(ope->peq_regmap))
427+
return dev_err_probe(dev, PTR_ERR(ope->peq_regmap),
428+
"PEQ regmap init failed\n");
430429

431430
regcache_cache_only(ope->peq_regmap, true);
432431

0 commit comments

Comments
 (0)