drivers/iio/proximity/irsd200.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
Since `dev_err_probe()` already prints the error code, there is no need
to additionally print it in the error message. Therefore, just remove
them.
Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
---
drivers/iio/proximity/irsd200.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/proximity/irsd200.c b/drivers/iio/proximity/irsd200.c
index b0ffd3574013..011b506f4542 100644
--- a/drivers/iio/proximity/irsd200.c
+++ b/drivers/iio/proximity/irsd200.c
@@ -881,9 +881,8 @@ static int irsd200_probe(struct i2c_client *client)
ret = devm_regulator_get_enable(data->dev, "vdd");
if (ret)
- return dev_err_probe(
- data->dev, ret,
- "Could not get and enable regulator (%d)\n", ret);
+ return dev_err_probe(data->dev, ret,
+ "Could not get and enable regulator\n");
ret = irsd200_setup(data);
if (ret)
@@ -901,17 +900,15 @@ static int irsd200_probe(struct i2c_client *client)
ret = devm_iio_triggered_buffer_setup(data->dev, indio_dev, NULL,
irsd200_trigger_handler, NULL);
if (ret)
- return dev_err_probe(
- data->dev, ret,
- "Could not setup iio triggered buffer (%d)\n", ret);
+ return dev_err_probe(data->dev, ret,
+ "Could not setup iio triggered buffer\n");
ret = devm_request_threaded_irq(data->dev, client->irq, NULL,
irsd200_irq_thread,
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
NULL, indio_dev);
if (ret)
- return dev_err_probe(data->dev, ret,
- "Could not request irq (%d)\n", ret);
+ return dev_err_probe(data->dev, ret, "Could not request irq\n");
trigger = devm_iio_trigger_alloc(data->dev, "%s-dev%d", indio_dev->name,
iio_device_id(indio_dev));
@@ -925,14 +922,12 @@ static int irsd200_probe(struct i2c_client *client)
ret = devm_iio_trigger_register(data->dev, trigger);
if (ret)
return dev_err_probe(data->dev, ret,
- "Could not register iio trigger (%d)\n",
- ret);
+ "Could not register iio trigger\n");
ret = devm_iio_device_register(data->dev, indio_dev);
if (ret)
return dev_err_probe(data->dev, ret,
- "Could not register iio device (%d)\n",
- ret);
+ "Could not register iio device\n");
return 0;
}
base-commit: d76bb1ebb5587f66b0f8b8099bfbb44722bc08b3
--
2.39.5
On Fri, 16 May 2025 19:18:56 +0200 Waqar Hameed <waqar.hameed@axis.com> wrote: > Since `dev_err_probe()` already prints the error code, there is no need > to additionally print it in the error message. Therefore, just remove > them. > > Signed-off-by: Waqar Hameed <waqar.hameed@axis.com> Applied. Thanks. Note that I'm now queuing stuff up for 6.17 unless the 6.15 release is delayed for some reason. That means I'll only push out as testing and will be rebasing on 6.16-rc1 Jonathan > --- > drivers/iio/proximity/irsd200.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/drivers/iio/proximity/irsd200.c b/drivers/iio/proximity/irsd200.c > index b0ffd3574013..011b506f4542 100644 > --- a/drivers/iio/proximity/irsd200.c > +++ b/drivers/iio/proximity/irsd200.c > @@ -881,9 +881,8 @@ static int irsd200_probe(struct i2c_client *client) > > ret = devm_regulator_get_enable(data->dev, "vdd"); > if (ret) > - return dev_err_probe( > - data->dev, ret, > - "Could not get and enable regulator (%d)\n", ret); > + return dev_err_probe(data->dev, ret, > + "Could not get and enable regulator\n"); > > ret = irsd200_setup(data); > if (ret) > @@ -901,17 +900,15 @@ static int irsd200_probe(struct i2c_client *client) > ret = devm_iio_triggered_buffer_setup(data->dev, indio_dev, NULL, > irsd200_trigger_handler, NULL); > if (ret) > - return dev_err_probe( > - data->dev, ret, > - "Could not setup iio triggered buffer (%d)\n", ret); > + return dev_err_probe(data->dev, ret, > + "Could not setup iio triggered buffer\n"); > > ret = devm_request_threaded_irq(data->dev, client->irq, NULL, > irsd200_irq_thread, > IRQF_TRIGGER_RISING | IRQF_ONESHOT, > NULL, indio_dev); > if (ret) > - return dev_err_probe(data->dev, ret, > - "Could not request irq (%d)\n", ret); > + return dev_err_probe(data->dev, ret, "Could not request irq\n"); > > trigger = devm_iio_trigger_alloc(data->dev, "%s-dev%d", indio_dev->name, > iio_device_id(indio_dev)); > @@ -925,14 +922,12 @@ static int irsd200_probe(struct i2c_client *client) > ret = devm_iio_trigger_register(data->dev, trigger); > if (ret) > return dev_err_probe(data->dev, ret, > - "Could not register iio trigger (%d)\n", > - ret); > + "Could not register iio trigger\n"); > > ret = devm_iio_device_register(data->dev, indio_dev); > if (ret) > return dev_err_probe(data->dev, ret, > - "Could not register iio device (%d)\n", > - ret); > + "Could not register iio device\n"); > > return 0; > } > > base-commit: d76bb1ebb5587f66b0f8b8099bfbb44722bc08b3
© 2016 - 2025 Red Hat, Inc.