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

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: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Krzysztof Kozlowski and committed by
Sebastian Reichel
e03e3601 31873dc2

+9 -15
+9 -15
drivers/power/supply/lego_ev3_battery.c
··· 166 166 167 167 batt->iio_v = devm_iio_channel_get(dev, "voltage"); 168 168 err = PTR_ERR_OR_ZERO(batt->iio_v); 169 - if (err) { 170 - if (err != -EPROBE_DEFER) 171 - dev_err(dev, "Failed to get voltage iio channel\n"); 172 - return err; 173 - } 169 + if (err) 170 + return dev_err_probe(dev, err, 171 + "Failed to get voltage iio channel\n"); 174 172 175 173 batt->iio_i = devm_iio_channel_get(dev, "current"); 176 174 err = PTR_ERR_OR_ZERO(batt->iio_i); 177 - if (err) { 178 - if (err != -EPROBE_DEFER) 179 - dev_err(dev, "Failed to get current iio channel\n"); 180 - return err; 181 - } 175 + if (err) 176 + return dev_err_probe(dev, err, 177 + "Failed to get current iio channel\n"); 182 178 183 179 batt->rechargeable_gpio = devm_gpiod_get(dev, "rechargeable", GPIOD_IN); 184 180 err = PTR_ERR_OR_ZERO(batt->rechargeable_gpio); 185 - if (err) { 186 - if (err != -EPROBE_DEFER) 187 - dev_err(dev, "Failed to get rechargeable gpio\n"); 188 - return err; 189 - } 181 + if (err) 182 + return dev_err_probe(dev, err, 183 + "Failed to get rechargeable gpio\n"); 190 184 191 185 /* 192 186 * The rechargeable battery indication switch cannot be changed without