Commit e03e3601 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Sebastian Reichel
Browse files

power: supply: lego_ev3: 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 avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 31873dc2

drivers/power/supply/lego_ev3_battery.c

+9 −15
Original line number Diff line number Diff line
@@ -166,27 +166,21 @@ static int lego_ev3_battery_probe(struct platform_device *pdev) 


	batt->iio_v = devm_iio_channel_get(dev, "voltage");

	err = PTR_ERR_OR_ZERO(batt->iio_v);

	if (err) {

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get voltage iio channel\n");

		return err;

	}

	if (err)

		return dev_err_probe(dev, err,

				     "Failed to get voltage iio channel\n");



	batt->iio_i = devm_iio_channel_get(dev, "current");

	err = PTR_ERR_OR_ZERO(batt->iio_i);

	if (err) {

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get current iio channel\n");

		return err;

	}

	if (err)

		return dev_err_probe(dev, err,

				     "Failed to get current iio channel\n");



	batt->rechargeable_gpio = devm_gpiod_get(dev, "rechargeable", GPIOD_IN);

	err = PTR_ERR_OR_ZERO(batt->rechargeable_gpio);

	if (err) {

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get rechargeable gpio\n");

		return err;

	}

	if (err)

		return dev_err_probe(dev, err,

				     "Failed to get rechargeable gpio\n");



	/*

	 * The rechargeable battery indication switch cannot be changed without