Commit 3bdb1255 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Jonathan Cameron
Browse files

iio: accel: bma180: Simplify with dev_err_probe() 



Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and also it prints the error value.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20200829064726.26268-1-krzk@kernel.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent dc3ebfca

drivers/iio/accel/bma180.c

+8 −12
Original line number Diff line number Diff line
@@ -1000,19 +1000,15 @@ static int bma180_probe(struct i2c_client *client, 
		return ret;



	data->vdd_supply = devm_regulator_get(dev, "vdd");

	if (IS_ERR(data->vdd_supply)) {

		if (PTR_ERR(data->vdd_supply) != -EPROBE_DEFER)

			dev_err(dev, "Failed to get vdd regulator %d\n",

				(int)PTR_ERR(data->vdd_supply));

		return PTR_ERR(data->vdd_supply);

	}

	if (IS_ERR(data->vdd_supply))

		return dev_err_probe(dev, PTR_ERR(data->vdd_supply),

				     "Failed to get vdd regulator\n");



	data->vddio_supply = devm_regulator_get(dev, "vddio");

	if (IS_ERR(data->vddio_supply)) {

		if (PTR_ERR(data->vddio_supply) != -EPROBE_DEFER)

			dev_err(dev, "Failed to get vddio regulator %d\n",

				(int)PTR_ERR(data->vddio_supply));

		return PTR_ERR(data->vddio_supply);

	}

	if (IS_ERR(data->vddio_supply))

		return dev_err_probe(dev, PTR_ERR(data->vddio_supply),

				     "Failed to get vddio regulator\n");



	/* Typical voltage 2.4V these are min and max */

	ret = regulator_set_voltage(data->vdd_supply, 1620000, 3600000);

	if (ret)