Since commit 55b48e23f5c4 ("genirq/devres: Add error handling in
devm_request_*_irq()"), devm_request_irq() automatically logs
detailed error messages on failure. Remove the now-redundant
driver-specific dev_err() calls.Signed-off-by: Pan Chuang <[email protected]> --- drivers/vdpa/octeon_ep/octep_vdpa_main.c | 4 +--- drivers/vdpa/virtio_pci/vp_vdpa.c | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/vdpa/octeon_ep/octep_vdpa_main.c b/drivers/vdpa/octeon_ep/octep_vdpa_main.c index 5b35993750f5..6e32925bc57a 100644 --- a/drivers/vdpa/octeon_ep/octep_vdpa_main.c +++ b/drivers/vdpa/octeon_ep/octep_vdpa_main.c @@ -170,10 +170,8 @@ static int octep_request_irqs(struct octep_hw *oct_hw, irqreturn_t (*irq_handler irq = pci_irq_vector(pdev, idx); ret = devm_request_irq(&pdev->dev, irq, irq_handler, 0, dev_name(&pdev->dev), oct_hw); - if (ret) { - dev_err(&pdev->dev, "Failed to register interrupt handler\n"); + if (ret) goto free_irqs; - } oct_hw->irqs[idx] = irq; } oct_hw->requested_irqs = nb_irqs; diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c index 51ffc245a038..f2eb654b1665 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -189,11 +189,8 @@ static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa) vp_vdpa_vq_handler, 0, vp_vdpa->vring[i].msix_name, &vp_vdpa->vring[i]); - if (ret) { - dev_err(&pdev->dev, - "vp_vdpa: fail to request irq for vq %d\n", i); + if (ret) goto err; - } vp_modern_queue_vector(mdev, i, msix_vec); vp_vdpa->vring[i].irq = irq; msix_vec++; @@ -204,11 +201,8 @@ static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa) irq = pci_irq_vector(pdev, msix_vec); ret = devm_request_irq(&pdev->dev, irq, vp_vdpa_config_handler, 0, vp_vdpa->msix_name, vp_vdpa); - if (ret) { - dev_err(&pdev->dev, - "vp_vdpa: fail to request irq for config: %d\n", ret); - goto err; - } + if (ret) + goto err; vp_modern_config_vector(mdev, msix_vec); vp_vdpa->config_irq = irq; -- 2.34.1
