hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/drivers/power/supply/lego_ev3_battery.c
....@@ -166,27 +166,21 @@
166166
167167 batt->iio_v = devm_iio_channel_get(dev, "voltage");
168168 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");
174172
175173 batt->iio_i = devm_iio_channel_get(dev, "current");
176174 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");
182178
183179 batt->rechargeable_gpio = devm_gpiod_get(dev, "rechargeable", GPIOD_IN);
184180 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");
190184
191185 /*
192186 * The rechargeable battery indication switch cannot be changed without