Using dev_err_probe instead of dev_err and return makes the errors
easier to understand by including the error name, and saves a little
code.
Signed-off-by: Aren Moynihan <a...@peacevolution.org>
---
Notes:
Changes in v4:
- Get a struct device ahead of time so it can be passed as "dev"
instead of "&client->dev"
No changes in v3
Added in v2
drivers/iio/light/stk3310.c | 61 ++++++++++++++++---------------------
1 file changed, 26 insertions(+), 35 deletions(-)
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index f93689c61f44..c9a3f02bdd80 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -61,12 +61,12 @@
#define STK3310_REGFIELD(name) \
do { \
data->reg_##name = \
- devm_regmap_field_alloc(&client->dev, regmap, \
+ devm_regmap_field_alloc(dev, regmap, \
stk3310_reg_field_##name); \
- if (IS_ERR(data->reg_##name)) { \
- dev_err(&client->dev, "reg field alloc failed.\n"); \
- return PTR_ERR(data->reg_##name); \
- } \
+ if (IS_ERR(data->reg_##name)) \
+ return dev_err_probe(dev, \
+ PTR_ERR(data->reg_##name), \
+ "reg field alloc failed.\n"); \
} while (0)
static const struct reg_field stk3310_reg_field_state =
@@ -517,10 +517,8 @@ static int stk3310_init(struct iio_dev *indio_dev)
state = STK3310_STATE_EN_ALS | STK3310_STATE_EN_PS;
ret = stk3310_set_state(data, state);
- if (ret < 0) {
- dev_err(&client->dev, "failed to enable sensor");
- return ret;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "failed to enable sensor\n");
ret = devm_add_action_or_reset(&client->dev, stk3310_set_state_disable,
data);
if (ret)
@@ -529,9 +527,9 @@ static int stk3310_init(struct iio_dev *indio_dev)
/* Enable PS interrupts */
ret = regmap_field_write(data->reg_int_ps, STK3310_PSINT_EN);
if (ret < 0)
- dev_err(&client->dev, "failed to enable interrupts!\n");
+ return dev_err_probe(dev, ret, "failed to enable
interrupts!\n");
- return ret;
+ return 0;
}
static bool stk3310_is_volatile_reg(struct device *dev, unsigned int reg)
@@ -560,14 +558,14 @@ static const struct regmap_config stk3310_regmap_config =
{
static int stk3310_regmap_init(struct stk3310_data *data)
{
struct regmap *regmap;
- struct i2c_client *client;
+ struct i2c_client *client = data->client;
+ struct device *dev = &client->dev;
- client = data->client;
regmap = devm_regmap_init_i2c(client, &stk3310_regmap_config);
- if (IS_ERR(regmap)) {
- dev_err(&client->dev, "regmap initialization failed.\n");
- return PTR_ERR(regmap);
- }
+ if (IS_ERR(regmap))
+ return dev_err_probe(dev, PTR_ERR(regmap),
+ "regmap initialization failed.\n");
+
data->regmap = regmap;
STK3310_REGFIELD(state);
@@ -654,12 +652,11 @@ static int stk3310_probe(struct i2c_client *client)
int ret;
struct iio_dev *indio_dev;
struct stk3310_data *data;
+ struct device *dev = &client->dev;
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
- if (!indio_dev) {
- dev_err(&client->dev, "iio allocation failed!\n");
- return -ENOMEM;
- }
+ if (!indio_dev)
+ return dev_err_probe(dev, -ENOMEM, "iio allocation failed!\n");
data = iio_priv(indio_dev);
data->client = client;
@@ -675,7 +672,7 @@ static int stk3310_probe(struct i2c_client *client)
ret = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(data->supplies),
data->supplies);
if (ret)
- return dev_err_probe(&client->dev, ret, "get regulators
failed\n");
+ return dev_err_probe(dev, ret, "get regulators failed\n");
ret = stk3310_regmap_init(data);
if (ret < 0)
@@ -689,13 +686,11 @@ static int stk3310_probe(struct i2c_client *client)
ret = stk3310_regulators_enable(data);
if (ret)
- return dev_err_probe(&client->dev, ret,
- "regulator enable failed\n");
+ return dev_err_probe(dev, ret, "regulator enable failed\n");
ret = devm_add_action_or_reset(&client->dev,
stk3310_regulators_disable, data);
if (ret)
- return dev_err_probe(&client->dev, ret,
- "failed to register regulator cleanup\n");
+ return dev_err_probe(dev, ret, "failed to register regulator
cleanup\n");
ret = stk3310_init(indio_dev);
if (ret < 0)
@@ -708,18 +703,14 @@ static int stk3310_probe(struct i2c_client *client)
IRQF_TRIGGER_FALLING |
IRQF_ONESHOT,
STK3310_EVENT, indio_dev);
- if (ret < 0) {
- dev_err(&client->dev, "request irq %d failed\n",
- client->irq);
- return ret;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "request irq %d
failed\n",
+ client->irq);
}
ret = devm_iio_device_register(&client->dev, indio_dev);
- if (ret < 0) {
- dev_err(&client->dev, "device_register failed\n");
- return ret;
- }
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "device_register failed\n");
return 0;
}
--
2.47.0
