Use dev_err_probe() to simplify the error path and unify a message
template.
Using this helper is totally fine even if err is known to never
be -EPROBE_DEFER.
The benefit compared to a normal dev_err() is the standardized format
of the error code, it being emitted symbolically and the fact that
the error code is returned which allows more compact error paths.
Signed-off-by: Shen Lichuan <shenlichuan@xxxxxxxx>
---
drivers/net/ieee802154/at86rf230.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index f632b0cfd5ae..3fb536734034 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1532,11 +1532,9 @@ static int at86rf230_probe(struct spi_device *spi)
rc = device_property_read_u8(&spi->dev, "xtal-trim", &xtal_trim);
if (rc < 0) {
- if (rc != -EINVAL) {
- dev_err(&spi->dev,
- "failed to parse xtal-trim: %d\n", rc);
- return rc;
- }
+ if (rc != -EINVAL)
+ return dev_err_probe(&spi->dev, rc,
+ "failed to parse xtal-trim\n");
xtal_trim = 0;
}
@@ -1576,9 +1574,8 @@ static int at86rf230_probe(struct spi_device *spi)
lp->regmap = devm_regmap_init_spi(spi, &at86rf230_regmap_spi_config);
if (IS_ERR(lp->regmap)) {
- rc = PTR_ERR(lp->regmap);
- dev_err(&spi->dev, "Failed to allocate register map: %d\n",
- rc);
+ dev_err_probe(&spi->dev, PTR_ERR(lp->regmap),
+ "Failed to allocate register map\n");
goto free_dev;
}
--
2.17.1
