Since commit 55b48e23f5c4 ("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() calls.
Signed-off-by: Pan Chuang <panchuang@vivo.com>
---
drivers/bluetooth/btmrvl_sdio.c | 5 -----
drivers/bluetooth/hci_nokia.c | 4 +---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 93932a0d8625..a84275b8833a 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -93,11 +93,6 @@ static int btmrvl_sdio_probe_of(struct device *dev,
ret = devm_request_irq(dev, cfg->irq_bt,
btmrvl_wake_irq_bt,
IRQF_NO_AUTOEN, "bt_wake", card);
- if (ret) {
- dev_err(dev,
- "Failed to request irq_bt %d (%d)\n",
- cfg->irq_bt, ret);
- }
/* Configure wakeup (enabled by default) */
ret = devm_device_init_wakeup(dev);
diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index 1e65b541f8ad..2dc3d97bcca1 100644
--- a/drivers/bluetooth/hci_nokia.c
+++ b/drivers/bluetooth/hci_nokia.c
@@ -709,10 +709,8 @@ static int nokia_bluetooth_serdev_probe(struct serdev_device *serdev)
wakeup_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"wakeup", btdev);
- if (err) {
- dev_err(dev, "could request wakeup irq: %d", err);
+ if (err)
return err;
- }
btdev->wakeup_bt = devm_gpiod_get(dev, "bluetooth-wakeup",
GPIOD_OUT_LOW);
--
2.34.1