Commit 75020f2d authored by Thorsten Scherer's avatar Thorsten Scherer Committed by Greg Kroah-Hartman
Browse files

siox: Simplify error handling via dev_err_probe() 



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

Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThorsten Scherer <t.scherer@eckelmann.de>
Link: https://lore.kernel.org/r/20210616061736.3786173-2-t.scherer@eckelmann.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e2658ae

drivers/siox/siox-bus-gpio.c

+10 −9
Original line number Diff line number Diff line
@@ -102,29 +102,29 @@ static int siox_gpio_probe(struct platform_device *pdev) 


	ddata->din = devm_gpiod_get(dev, "din", GPIOD_IN);

	if (IS_ERR(ddata->din)) {

		ret = PTR_ERR(ddata->din);

		dev_err(dev, "Failed to get %s GPIO: %d\n", "din", ret);

		ret = dev_err_probe(dev, PTR_ERR(ddata->din),

				    "Failed to get din GPIO\n");

		goto err;

	}



	ddata->dout = devm_gpiod_get(dev, "dout", GPIOD_OUT_LOW);

	if (IS_ERR(ddata->dout)) {

		ret = PTR_ERR(ddata->dout);

		dev_err(dev, "Failed to get %s GPIO: %d\n", "dout", ret);

		ret = dev_err_probe(dev, PTR_ERR(ddata->dout),

				    "Failed to get dout GPIO\n");

		goto err;

	}



	ddata->dclk = devm_gpiod_get(dev, "dclk", GPIOD_OUT_LOW);

	if (IS_ERR(ddata->dclk)) {

		ret = PTR_ERR(ddata->dclk);

		dev_err(dev, "Failed to get %s GPIO: %d\n", "dclk", ret);

		ret = dev_err_probe(dev, PTR_ERR(ddata->dclk),

				    "Failed to get dclk GPIO\n");

		goto err;

	}



	ddata->dld = devm_gpiod_get(dev, "dld", GPIOD_OUT_LOW);

	if (IS_ERR(ddata->dld)) {

		ret = PTR_ERR(ddata->dld);

		dev_err(dev, "Failed to get %s GPIO: %d\n", "dld", ret);

		ret = dev_err_probe(dev, PTR_ERR(ddata->dld),

				    "Failed to get dld GPIO\n");

		goto err;

	}
@@ -134,7 +134,8 @@ static int siox_gpio_probe(struct platform_device *pdev) 


	ret = siox_master_register(smaster);

	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:

		siox_master_put(smaster);

	}