github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: proximity: Remove redundant dev_err()/dev_err_probe()

Browse Source 
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 error check on if (ret) 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:
Pan Chuang 2026-07-24 11:03:46 +08:00 committed by Jonathan Cameron
parent bd402b8ac0
commit 7963090626
9 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iio/proximity/as3935.c
View File

@ -428,10 +428,8 @@ static int as3935_probe(struct spi_device *spi)
dev_name(dev),
indio_dev);
if (ret) {
dev_err(dev, "unable to request irq\n");
if (ret)
return ret;
}
ret = devm_iio_device_register(dev, indio_dev);
if (ret < 0) {

2
drivers/iio/proximity/d3323aa.c
View File

@ -771,7 +771,7 @@ static int d3323aa_probe(struct platform_device *pdev)
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
dev_name(dev), indio_dev);
if (ret)
return dev_err_probe(dev, ret, "Could not request IRQ\n");
return ret;
ret = d3323aa_setup(indio_dev, D3323AA_LP_FILTER_FREQ_DEFAULT_IDX,
D3323AA_FILTER_GAIN_DEFAULT_IDX,

2
drivers/iio/proximity/hx9023s.c
View File

@ -1139,7 +1139,7 @@ static int hx9023s_probe(struct i2c_client *client)
IRQF_ONESHOT,
"hx9023s_event", indio_dev);
if (ret)
return dev_err_probe(dev, ret, "irq request failed\n");
return ret;
data->trig = devm_iio_trigger_alloc(dev, "%s-dev%d",
indio_dev->name,

2
drivers/iio/proximity/irsd200.c
View File

@ -910,7 +910,7 @@ static int irsd200_probe(struct i2c_client *client)
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
NULL, indio_dev);
if (ret)
return dev_err_probe(data->dev, ret, "Could not request irq\n");
return ret;
trigger = devm_iio_trigger_alloc(data->dev, "%s-dev%d", indio_dev->name,
iio_device_id(indio_dev));

4
drivers/iio/proximity/mb1232.c
View File

@ -213,10 +213,8 @@ static int mb1232_probe(struct i2c_client *client)
if (data->irqnr > 0) {
ret = devm_request_irq(dev, data->irqnr, mb1232_handle_irq,
IRQF_TRIGGER_FALLING, id->name, indio_dev);
if (ret < 0) {
dev_err(dev, "request_irq: %d\n", ret);
if (ret)
return ret;
}
}
ret = devm_iio_triggered_buffer_setup(dev, indio_dev,

4
drivers/iio/proximity/srf04.c
View File

@ -303,10 +303,8 @@ static int srf04_probe(struct platform_device *pdev)
ret = devm_request_irq(dev, data->irqnr, srf04_handle_irq,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
pdev->name, indio_dev);
if (ret < 0) {
dev_err(data->dev, "request_irq: %d\n", ret);
if (ret)
return ret;
}
platform_set_drvdata(pdev, indio_dev);

2
drivers/iio/proximity/sx_common.c
View File

@ -517,7 +517,7 @@ int sx_common_probe(struct i2c_client *client,
IRQF_ONESHOT,
"sx_event", indio_dev);
if (ret)
return dev_err_probe(dev, ret, "No IRQ\n");
return ret;
data->trig = devm_iio_trigger_alloc(dev, "%s-dev%d",
indio_dev->name,

6
drivers/iio/proximity/vcnl3020.c
View File

@ -638,12 +638,8 @@ static int vcnl3020_probe(struct i2c_client *client)
NULL, vcnl3020_handle_irq_thread,
IRQF_ONESHOT, indio_dev->name,
indio_dev);
if (rc) {
dev_err(&client->dev,
"Error (%d) irq request failed (%u)\n", rc,
client->irq);
if (rc)
return rc;
}
}
return devm_iio_device_register(&client->dev, indio_dev);

4
drivers/iio/proximity/vl53l0x-i2c.c
View File

@ -127,10 +127,8 @@ static int vl53l0x_configure_irq(struct i2c_client *client,
ret = devm_request_threaded_irq(&client->dev, client->irq,
NULL, vl53l0x_threaded_irq,
irq_flags | IRQF_ONESHOT, indio_dev->name, indio_dev);
if (ret) {
dev_err(&client->dev, "devm_request_irq error: %d\n", ret);
if (ret)
return ret;
}
ret = i2c_smbus_write_byte_data(data->client,
VL_REG_SYSTEM_INTERRUPT_CONFIG_GPIO,