Skip to content

Commit b663b79

Browse files
Anson-HuangShawn Guo
authored andcommitted
soc: imx: gpcv2: Use dev_err_probe() to simplify error handling
dev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Reviewed-by: Guido Günther <agx@sigxcpu.org> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent 9123e3a commit b663b79

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

drivers/soc/imx/gpcv2.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -487,22 +487,17 @@ static int imx_pgc_domain_probe(struct platform_device *pdev)
487487

488488
domain->regulator = devm_regulator_get_optional(domain->dev, "power");
489489
if (IS_ERR(domain->regulator)) {
490-
if (PTR_ERR(domain->regulator) != -ENODEV) {
491-
if (PTR_ERR(domain->regulator) != -EPROBE_DEFER)
492-
dev_err(domain->dev, "Failed to get domain's regulator\n");
493-
return PTR_ERR(domain->regulator);
494-
}
490+
if (PTR_ERR(domain->regulator) != -ENODEV)
491+
return dev_err_probe(domain->dev, PTR_ERR(domain->regulator),
492+
"Failed to get domain's regulator\n");
495493
} else if (domain->voltage) {
496494
regulator_set_voltage(domain->regulator,
497495
domain->voltage, domain->voltage);
498496
}
499497

500498
ret = imx_pgc_get_clocks(domain);
501-
if (ret) {
502-
if (ret != -EPROBE_DEFER)
503-
dev_err(domain->dev, "Failed to get domain's clocks\n");
504-
return ret;
505-
}
499+
if (ret)
500+
return dev_err_probe(domain->dev, ret, "Failed to get domain's clocks\n");
506501

507502
ret = pm_genpd_init(&domain->genpd, NULL, true);
508503
if (ret) {

0 commit comments

Comments
 (0)