public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

siox: Simplify error handling via dev_err_probe()

Browse source 
commit a787e5400a ("driver core: add device probe log helper")
introduced a helper for a common error checking pattern.  Use it.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
Link: https://lore.kernel.org/r/20210616061736.3786173-2-t.scherer@eckelmann.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thorsten Scherer 2021-06-16 08:17:36 +02:00 • committed by Greg Kroah-Hartman
parent 1e2658aef5
commit 75020f2df6
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/siox/siox-bus-gpio.c
View file

@ -102,29 +102,29 @@ static int siox_gpio_probe(struct platform_device *pdev)
ddata->din = devm_gpiod_get(dev, "din", GPIOD_IN); ddata->din = devm_gpiod_get(dev, "din", GPIOD_IN);
if (IS_ERR(ddata->din)) { if (IS_ERR(ddata->din)) {
ret = PTR_ERR(ddata->din); ret = dev_err_probe(dev, PTR_ERR(ddata->din),
dev_err(dev, "Failed to get %s GPIO: %d\n", "din", ret); "Failed to get din GPIO\n");
goto err; goto err;
} }
ddata->dout = devm_gpiod_get(dev, "dout", GPIOD_OUT_LOW); ddata->dout = devm_gpiod_get(dev, "dout", GPIOD_OUT_LOW);
if (IS_ERR(ddata->dout)) { if (IS_ERR(ddata->dout)) {
ret = PTR_ERR(ddata->dout); ret = dev_err_probe(dev, PTR_ERR(ddata->dout),
dev_err(dev, "Failed to get %s GPIO: %d\n", "dout", ret); "Failed to get dout GPIO\n");
goto err; goto err;
} }
ddata->dclk = devm_gpiod_get(dev, "dclk", GPIOD_OUT_LOW); ddata->dclk = devm_gpiod_get(dev, "dclk", GPIOD_OUT_LOW);
if (IS_ERR(ddata->dclk)) { if (IS_ERR(ddata->dclk)) {
ret = PTR_ERR(ddata->dclk); ret = dev_err_probe(dev, PTR_ERR(ddata->dclk),
dev_err(dev, "Failed to get %s GPIO: %d\n", "dclk", ret); "Failed to get dclk GPIO\n");
goto err; goto err;
} }
ddata->dld = devm_gpiod_get(dev, "dld", GPIOD_OUT_LOW); ddata->dld = devm_gpiod_get(dev, "dld", GPIOD_OUT_LOW);
if (IS_ERR(ddata->dld)) { if (IS_ERR(ddata->dld)) {
ret = PTR_ERR(ddata->dld); ret = dev_err_probe(dev, PTR_ERR(ddata->dld),
dev_err(dev, "Failed to get %s GPIO: %d\n", "dld", ret); "Failed to get dld GPIO\n");
goto err; goto err;
} }
@ -134,7 +134,8 @@ static int siox_gpio_probe(struct platform_device *pdev)
ret = siox_master_register(smaster); ret = siox_master_register(smaster);
if (ret) { if (ret) {
dev_err(dev, "Failed to register siox master: %d\n", ret); dev_err_probe(dev, ret,
"Failed to register siox master\n");
err: err:
siox_master_put(smaster); siox_master_put(smaster);
} }