forked from Minki/linux
ASoC: codecs: pcm3168a: Use dev_err_probe() helper
Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/20211214020843.2225831-6-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
edfe9f451a
commit
526f6ca95a
@ -751,21 +751,14 @@ int pcm3168a_probe(struct device *dev, struct regmap *regmap)
|
||||
pcm3168a->gpio_rst = devm_gpiod_get_optional(dev, "reset",
|
||||
GPIOD_OUT_LOW |
|
||||
GPIOD_FLAGS_BIT_NONEXCLUSIVE);
|
||||
if (IS_ERR(pcm3168a->gpio_rst)) {
|
||||
ret = PTR_ERR(pcm3168a->gpio_rst);
|
||||
if (ret != -EPROBE_DEFER )
|
||||
dev_err(dev, "failed to acquire RST gpio: %d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
if (IS_ERR(pcm3168a->gpio_rst))
|
||||
return dev_err_probe(dev, PTR_ERR(pcm3168a->gpio_rst),
|
||||
"failed to acquire RST gpio\n");
|
||||
|
||||
pcm3168a->scki = devm_clk_get(dev, "scki");
|
||||
if (IS_ERR(pcm3168a->scki)) {
|
||||
ret = PTR_ERR(pcm3168a->scki);
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(dev, "failed to acquire clock 'scki': %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (IS_ERR(pcm3168a->scki))
|
||||
return dev_err_probe(dev, PTR_ERR(pcm3168a->scki),
|
||||
"failed to acquire clock 'scki'\n");
|
||||
|
||||
ret = clk_prepare_enable(pcm3168a->scki);
|
||||
if (ret) {
|
||||
@ -781,8 +774,7 @@ int pcm3168a_probe(struct device *dev, struct regmap *regmap)
|
||||
ret = devm_regulator_bulk_get(dev,
|
||||
ARRAY_SIZE(pcm3168a->supplies), pcm3168a->supplies);
|
||||
if (ret) {
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(dev, "failed to request supplies: %d\n", ret);
|
||||
dev_err_probe(dev, ret, "failed to request supplies\n");
|
||||
goto err_clk;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user