Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christophe JAILLET and committed by
Lee Jones
26e4462d f190b489

+7 -12
+7 -12
drivers/mfd/wcd934x.c
··· 227 227 "Failed to get IRQ\n"); 228 228 229 229 ddata->extclk = devm_clk_get(dev, "extclk"); 230 - if (IS_ERR(ddata->extclk)) { 231 - dev_err(dev, "Failed to get extclk"); 232 - return PTR_ERR(ddata->extclk); 233 - } 230 + if (IS_ERR(ddata->extclk)) 231 + return dev_err_probe(dev, PTR_ERR(ddata->extclk), 232 + "Failed to get extclk"); 234 233 235 234 ddata->supplies[0].supply = "vdd-buck"; 236 235 ddata->supplies[1].supply = "vdd-buck-sido"; ··· 238 239 ddata->supplies[4].supply = "vdd-io"; 239 240 240 241 ret = regulator_bulk_get(dev, WCD934X_MAX_SUPPLY, ddata->supplies); 241 - if (ret) { 242 - dev_err(dev, "Failed to get supplies: err = %d\n", ret); 243 - return ret; 244 - } 242 + if (ret) 243 + return dev_err_probe(dev, ret, "Failed to get supplies\n"); 245 244 246 245 ret = regulator_bulk_enable(WCD934X_MAX_SUPPLY, ddata->supplies); 247 - if (ret) { 248 - dev_err(dev, "Failed to enable supplies: err = %d\n", ret); 249 - return ret; 250 - } 246 + if (ret) 247 + return dev_err_probe(dev, ret, "Failed to enable supplies\n"); 251 248 252 249 /* 253 250 * For WCD934X, it takes about 600us for the Vout_A and