Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: magnetometer: yamaha-yas530: Use dev_err_probe()
Unify error message format by using dev_err_probe().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220831141530.80572-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Andy Shevchenko
and committed by
Jonathan Cameron
d05d7377
ff1c17e9
+6
-10
+6
-10
drivers/iio/magnetometer/yamaha-yas530.c
+6
-10
drivers/iio/magnetometer/yamaha-yas530.c
···
1415
1415
return dev_err_probe(dev, ret, "cannot get regulators\n");
1416
1416
1417
1417
ret = regulator_bulk_enable(ARRAY_SIZE(yas5xx->regs), yas5xx->regs);
1418
-
if (ret) {
1419
-
dev_err(dev, "cannot enable regulators\n");
1420
-
return ret;
1421
-
}
1418
+
if (ret)
1419
+
return dev_err_probe(dev, ret, "cannot enable regulators\n");
1422
1420
1423
1421
/* See comment in runtime resume callback */
1424
1422
usleep_range(31000, 40000);
···
1424
1426
/* This will take the device out of reset if need be */
1425
1427
yas5xx->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
1426
1428
if (IS_ERR(yas5xx->reset)) {
1427
-
ret = dev_err_probe(dev, PTR_ERR(yas5xx->reset),
1428
-
"failed to get reset line\n");
1429
+
ret = dev_err_probe(dev, PTR_ERR(yas5xx->reset), "failed to get reset line\n");
1429
1430
goto reg_off;
1430
1431
}
1431
1432
1432
1433
yas5xx->map = devm_regmap_init_i2c(i2c, &yas5xx_regmap_config);
1433
1434
if (IS_ERR(yas5xx->map)) {
1434
-
dev_err(dev, "failed to allocate register map\n");
1435
-
ret = PTR_ERR(yas5xx->map);
1435
+
ret = dev_err_probe(dev, PTR_ERR(yas5xx->map), "failed to allocate register map\n");
1436
1436
goto assert_reset;
1437
1437
}
1438
1438
···
1480
1484
yas5xx_handle_trigger,
1481
1485
NULL);
1482
1486
if (ret) {
1483
-
dev_err(dev, "triggered buffer setup failed\n");
1487
+
dev_err_probe(dev, ret, "triggered buffer setup failed\n");
1484
1488
goto assert_reset;
1485
1489
}
1486
1490
1487
1491
ret = iio_device_register(indio_dev);
1488
1492
if (ret) {
1489
-
dev_err(dev, "device register failed\n");
1493
+
dev_err_probe(dev, ret, "device register failed\n");
1490
1494
goto cleanup_buffer;
1491
1495
}
1492
1496