mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 13:14:02 +02:00
iio: accel: Remove redundant dev_err()/dev_err_probe()
Since commit
55b48e23f5 ("genirq/devres: Add error handling in devm_request_*_irq()"),
devm_request_irq() and devm_request_threaded_irq() automatically log
detailed error messages on failure. Remove the now-redundant
driver-specific dev_err() and dev_err_probe() calls.
Standardize on if (ret) check rather than if (ret < 0).
Signed-off-by: Pan Chuang <panchuang@vivo.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Joshua Crofts <joshua.crofts1@gmail.com>
Signed-off-by: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>
This commit is contained in:
parent
9e66792003
commit
fc5040337a
|
|
@ -768,8 +768,7 @@ static int adxl355_probe_trigger(struct iio_dev *indio_dev, int irq)
|
|||
ret = devm_request_irq(data->dev, irq, &iio_trigger_generic_data_rdy_poll,
|
||||
IRQF_NO_THREAD, "adxl355_irq", data->dready_trig);
|
||||
if (ret)
|
||||
return dev_err_probe(data->dev, ret, "request irq %d failed\n",
|
||||
irq);
|
||||
return ret;
|
||||
|
||||
ret = devm_iio_trigger_register(data->dev, data->dready_trig);
|
||||
if (ret)
|
||||
|
|
|
|||
|
|
@ -1486,7 +1486,7 @@ int adxl367_probe(struct device *dev, const struct adxl367_ops *ops,
|
|||
adxl367_irq_handler, IRQF_ONESHOT,
|
||||
indio_dev->name, indio_dev);
|
||||
if (ret)
|
||||
return dev_err_probe(st->dev, ret, "Failed to request irq\n");
|
||||
return ret;
|
||||
|
||||
return devm_iio_device_register(dev, indio_dev);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -988,10 +988,8 @@ static int bma180_probe(struct i2c_client *client)
|
|||
iio_trigger_generic_data_rdy_poll,
|
||||
IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
|
||||
"bma180_event", data->trig);
|
||||
if (ret) {
|
||||
dev_err(dev, "unable to request IRQ\n");
|
||||
if (ret)
|
||||
goto err_trigger_free;
|
||||
}
|
||||
|
||||
data->trig->ops = &bma180_trigger_ops;
|
||||
iio_trigger_set_drvdata(data->trig, indio_dev);
|
||||
|
|
|
|||
|
|
@ -544,8 +544,7 @@ int bma220_common_probe(struct device *dev, struct regmap *regmap, int irq)
|
|||
&bma220_irq_handler, IRQF_ONESHOT,
|
||||
indio_dev->name, indio_dev);
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret,
|
||||
"request irq %d failed\n", irq);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = devm_add_action_or_reset(dev, bma220_deinit, data);
|
||||
|
|
|
|||
|
|
@ -1789,8 +1789,7 @@ int bma400_probe(struct device *dev, struct regmap *regmap, int irq,
|
|||
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
|
||||
indio_dev->name, indio_dev);
|
||||
if (ret)
|
||||
return dev_err_probe(data->dev, ret,
|
||||
"request irq %d failed\n", irq);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
|
||||
|
|
|
|||
|
|
@ -1435,7 +1435,7 @@ int kx022a_probe_internal(struct device *dev, const struct kx022a_chip_info *chi
|
|||
&kx022a_irq_thread_handler,
|
||||
IRQF_ONESHOT, name, idev);
|
||||
if (ret)
|
||||
return dev_err_probe(data->dev, ret, "Could not request IRQ\n");
|
||||
return ret;
|
||||
|
||||
ret = devm_iio_trigger_register(dev, indio_trig);
|
||||
if (ret)
|
||||
|
|
|
|||
|
|
@ -420,10 +420,8 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev)
|
|||
NULL, mma9551_event_handler,
|
||||
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
|
||||
"mma9551_event", indio_dev);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "request irq %d failed\n", data->irqs[i]);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
dev_dbg(dev, "gpio resource, no:%d irq:%d\n",
|
||||
desc_to_gpio(gpio), data->irqs[i]);
|
||||
|
|
|
|||
|
|
@ -1099,11 +1099,8 @@ static int mma9553_probe(struct i2c_client *client)
|
|||
mma9553_event_handler,
|
||||
IRQF_TRIGGER_RISING,
|
||||
"mma9553_event", indio_dev);
|
||||
if (ret < 0) {
|
||||
dev_err(&client->dev, "request irq %d failed\n",
|
||||
client->irq);
|
||||
if (ret)
|
||||
goto out_poweroff;
|
||||
}
|
||||
}
|
||||
|
||||
ret = pm_runtime_set_active(&client->dev);
|
||||
|
|
|
|||
|
|
@ -1059,7 +1059,7 @@ static int msa311_setup_interrupts(struct msa311_priv *msa311)
|
|||
msa311_irq_thread, IRQF_ONESHOT,
|
||||
msa311->chip_name, indio_dev);
|
||||
if (err)
|
||||
return dev_err_probe(dev, err, "failed to request IRQ\n");
|
||||
return err;
|
||||
|
||||
trig = devm_iio_trigger_alloc(dev, "%s-new-data", msa311->chip_name);
|
||||
if (!trig)
|
||||
|
|
|
|||
|
|
@ -489,11 +489,8 @@ static int mxc4005_probe(struct i2c_client *client)
|
|||
iio_trigger_generic_data_rdy_poll,
|
||||
IRQF_TRIGGER_FALLING | IRQF_NO_THREAD,
|
||||
"mxc4005_event", data->dready_trig);
|
||||
if (ret) {
|
||||
dev_err(&client->dev,
|
||||
"failed to init threaded irq\n");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
data->dready_trig->ops = &mxc4005_trigger_ops;
|
||||
iio_trigger_set_drvdata(data->dready_trig, indio_dev);
|
||||
|
|
|
|||
|
|
@ -550,11 +550,8 @@ static int stk8312_probe(struct i2c_client *client)
|
|||
IRQF_ONESHOT,
|
||||
"stk8312_event",
|
||||
indio_dev);
|
||||
if (ret < 0) {
|
||||
dev_err(&client->dev, "request irq %d failed\n",
|
||||
client->irq);
|
||||
if (ret)
|
||||
goto err_power_off;
|
||||
}
|
||||
|
||||
data->dready_trig = devm_iio_trigger_alloc(&client->dev,
|
||||
"%s-dev%d",
|
||||
|
|
|
|||
|
|
@ -438,11 +438,8 @@ static int stk8ba50_probe(struct i2c_client *client)
|
|||
stk8ba50_data_rdy_trig_poll,
|
||||
IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
|
||||
"stk8ba50_event", indio_dev);
|
||||
if (ret < 0) {
|
||||
dev_err(&client->dev, "request irq %d failed\n",
|
||||
client->irq);
|
||||
if (ret)
|
||||
goto err_power_off;
|
||||
}
|
||||
|
||||
data->dready_trig = devm_iio_trigger_alloc(&client->dev,
|
||||
"%s-dev%d",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user