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

iio: light: 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:47 +08:00 committed by Jonathan Cameron
parent 7963090626
commit 9cf89c342b
19 changed files with 20 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iio/light/adux1020.c
View File

@ -808,10 +808,8 @@ static int adux1020_probe(struct i2c_client *client)
NULL, adux1020_interrupt_handler,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
ADUX1020_DRV_NAME, indio_dev);
if (ret) {
dev_err(&client->dev, "irq request error %d\n", -ret);
if (ret)
return ret;
}
}
return devm_iio_device_register(&client->dev, indio_dev);

7
drivers/iio/light/apds9160.c
View File

@ -1545,11 +1545,8 @@ static int apds9160_probe(struct i2c_client *client)
apds9160_irq_handler,
IRQF_ONESHOT, "apds9160_event",
indio_dev);
if (ret) {
return dev_err_probe(dev, ret,
"request irq (%d) failed\n",
client->irq);
}
if (ret)
return ret;
} else {
indio_dev->info = &apds9160_info_no_events;
indio_dev->channels = apds9160_channels_without_events;

4
drivers/iio/light/apds9300.c
View File

@ -432,10 +432,8 @@ static int apds9300_probe(struct i2c_client *client)
NULL, apds9300_interrupt_handler,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"apds9300_event", indio_dev);
if (ret) {
dev_err(&client->dev, "irq request error %d\n", -ret);
if (ret)
goto err;
}
}
ret = iio_device_register(indio_dev);

3
drivers/iio/light/apds9306.c
View File

@ -1286,8 +1286,7 @@ static int apds9306_probe(struct i2c_client *client)
apds9306_irq_handler, IRQF_ONESHOT,
"apds9306_event", indio_dev);
if (ret)
return dev_err_probe(dev, ret,
"failed to assign interrupt.\n");
return ret;
} else {
indio_dev->info = &apds9306_info_no_events;
indio_dev->channels = apds9306_channels_without_events;

4
drivers/iio/light/apds9960.c
View File

@ -1098,10 +1098,8 @@ static int apds9960_probe(struct i2c_client *client)
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"apds9960_event",
indio_dev);
if (ret) {
dev_err(&client->dev, "request irq (%d) failed\n", client->irq);
if (ret)
goto error_power_down;
}
ret = iio_device_register(indio_dev);
if (ret)

3
drivers/iio/light/bh1745.c
View File

@ -784,8 +784,7 @@ static int bh1745_setup_triggered_buffer(struct iio_dev *indio_dev,
IRQF_ONESHOT,
"bh1745_interrupt", indio_dev);
if (ret)
return dev_err_probe(dev, ret,
"Request for IRQ failed\n");
return ret;
}
return 0;

4
drivers/iio/light/cm3605.c
View File

@ -232,10 +232,8 @@ static int cm3605_probe(struct platform_device *pdev)
ret = devm_request_threaded_irq(dev, irq, cm3605_prox_irq,
NULL, 0, "cm3605", indio_dev);
if (ret) {
dev_err(dev, "unable to request IRQ\n");
if (ret)
goto out_disable_aset;
}
/* Just name the trigger the same as the driver */
led_trigger_register_simple("cm3605", &cm3605->led);

4
drivers/iio/light/gp2ap002.c
View File

@ -573,10 +573,8 @@ static int gp2ap002_probe(struct i2c_client *client)
ret = devm_request_threaded_irq(dev, client->irq, NULL,
gp2ap002_prox_irq, IRQF_ONESHOT,
"gp2ap002", indio_dev);
if (ret) {
dev_err(dev, "unable to request IRQ\n");
if (ret)
goto out_put_pm;
}
gp2ap002->irq = client->irq;
/*

3
drivers/iio/light/ltr390.c
View File

@ -838,8 +838,7 @@ static int ltr390_probe(struct i2c_client *client)
"ltr390_thresh_event",
indio_dev);
if (ret)
return dev_err_probe(dev, ret,
"request irq (%d) failed\n", client->irq);
return ret;
}
ret = ltr390_pm_init(data);

5
drivers/iio/light/ltr501.c
View File

@ -1537,11 +1537,8 @@ static int ltr501_probe(struct i2c_client *client)
IRQF_ONESHOT,
"ltr501_thresh_event",
indio_dev);
if (ret) {
dev_err(&client->dev, "request irq (%d) failed\n",
client->irq);
if (ret)
return ret;
}
} else {
indio_dev->info = data->chip_info->info_no_irq;
}

2
drivers/iio/light/opt4060.c
View File

@ -1200,7 +1200,7 @@ static int opt4060_setup_trigger(struct opt4060_chip *chip, struct iio_dev *idev
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
name, idev);
if (ret)
return dev_err_probe(chip->dev, ret, "Could not request IRQ\n");
return ret;
init_completion(&chip->completion);

5
drivers/iio/light/rpr0521.c
View File

@ -987,11 +987,8 @@ static int rpr0521_probe(struct i2c_client *client)
rpr0521_drdy_irq_handler, rpr0521_drdy_irq_thread,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"rpr0521_event", indio_dev);
if (ret < 0) {
dev_err(&client->dev, "request irq %d for trigger0 failed\n",
client->irq);
if (ret)
goto err_pm_disable;
}
ret = devm_iio_trigger_register(indio_dev->dev.parent,
data->drdy_trigger0);

4
drivers/iio/light/si1145.c
View File

@ -1251,10 +1251,8 @@ static int si1145_probe_trigger(struct iio_dev *indio_dev)
IRQF_TRIGGER_FALLING | IRQF_NO_THREAD,
"si1145_irq",
trig);
if (ret < 0) {
dev_err(&client->dev, "irq request failed\n");
if (ret)
return ret;
}
ret = devm_iio_trigger_register(&client->dev, trig);
if (ret)

5
drivers/iio/light/st_uvis25_core.c
View File

@ -196,11 +196,8 @@ static int st_uvis25_allocate_trigger(struct iio_dev *iio_dev)
st_uvis25_trigger_handler_thread,
irq_type | IRQF_ONESHOT,
iio_dev->name, hw);
if (err) {
dev_err(dev, "failed to request trigger irq %d\n",
hw->irq);
if (err)
return err;
}
hw->trig = devm_iio_trigger_alloc(dev, "%s-trigger",
iio_dev->name);

5
drivers/iio/light/stk3310.c
View File

@ -673,11 +673,8 @@ 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);
if (ret)
goto err_standby;
}
}
ret = iio_device_register(indio_dev);

2
drivers/iio/light/tsl2563.c
View File

@ -754,7 +754,7 @@ static int tsl2563_probe(struct i2c_client *client)
"tsl2563_event",
indio_dev);
if (err)
return dev_err_probe(dev, err, "irq request error\n");
return err;
}
err = tsl2563_configure(chip);

5
drivers/iio/light/tsl2772.c
View File

@ -1849,11 +1849,8 @@ static int tsl2772_probe(struct i2c_client *clientp)
IRQF_ONESHOT,
"TSL2772_event",
indio_dev);
if (ret) {
dev_err(&clientp->dev,
"%s: irq request failed\n", __func__);
if (ret)
return ret;
}
} else {
indio_dev->channels = chip->chip_info->channel_without_events;
}

4
drivers/iio/light/veml6030.c
View File

@ -921,9 +921,7 @@ static int veml6030_set_info(struct iio_dev *indio_dev)
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
indio_dev->name, indio_dev);
if (ret < 0)
return dev_err_probe(&client->dev, ret,
"irq %d request failed\n",
client->irq);
return ret;
indio_dev->info = &veml6030_info;
} else {

2
drivers/iio/light/vl6180.c
View File

@ -721,7 +721,7 @@ static int vl6180_probe(struct i2c_client *client)
IRQF_ONESHOT,
indio_dev->name, indio_dev);
if (ret)
return dev_err_probe(&client->dev, ret, "devm_request_irq error\n");
return ret;
init_completion(&data->completion);