mfd: wcd934x: Simplify with dev_err_probe()
Use dev_err_probe() to simplify code, save a few LoC and be consistent with error codes handling in messages. It also filters -EPROBE_DEFER that can be returned by devm_clk_get(). Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/73fdc6ecf619f80fad126abca11fb579d3d87f64.1684565021.git.christophe.jaillet@wanadoo.fr Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Родитель
f190b4891a
Коммит
26e4462d7c
|
@ -227,10 +227,9 @@ static int wcd934x_slim_probe(struct slim_device *sdev)
|
|||
"Failed to get IRQ\n");
|
||||
|
||||
ddata->extclk = devm_clk_get(dev, "extclk");
|
||||
if (IS_ERR(ddata->extclk)) {
|
||||
dev_err(dev, "Failed to get extclk");
|
||||
return PTR_ERR(ddata->extclk);
|
||||
}
|
||||
if (IS_ERR(ddata->extclk))
|
||||
return dev_err_probe(dev, PTR_ERR(ddata->extclk),
|
||||
"Failed to get extclk");
|
||||
|
||||
ddata->supplies[0].supply = "vdd-buck";
|
||||
ddata->supplies[1].supply = "vdd-buck-sido";
|
||||
|
@ -239,16 +238,12 @@ static int wcd934x_slim_probe(struct slim_device *sdev)
|
|||
ddata->supplies[4].supply = "vdd-io";
|
||||
|
||||
ret = regulator_bulk_get(dev, WCD934X_MAX_SUPPLY, ddata->supplies);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to get supplies: err = %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret, "Failed to get supplies\n");
|
||||
|
||||
ret = regulator_bulk_enable(WCD934X_MAX_SUPPLY, ddata->supplies);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to enable supplies: err = %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret, "Failed to enable supplies\n");
|
||||
|
||||
/*
|
||||
* For WCD934X, it takes about 600us for the Vout_A and
|
||||
|
|
Загрузка…
Ссылка в новой задаче