[PATCH] scsi: hisi_sas: Remove redundant dev_err()

[Pan Chuang]

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@xxxxxxxx>
---
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 15 +++------------
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |  8 --------
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 17 ++++-------------
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index fa94d7110714..17974a57014e 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1638,11 +1638,8 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
 
 			rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
 					      DRV_NAME " phy", phy);
-			if (rc) {
-				dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",
-					irq, rc);
+			if (rc)
 				return rc;
-			}
 		}
 	}
 
@@ -1654,11 +1651,8 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
 
 		rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,
 				      DRV_NAME " cq", &hisi_hba->cq[i]);
-		if (rc) {
-			dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",
-				irq, rc);
+		if (rc)
 			return rc;
-		}
 	}
 
 	idx = (hisi_hba->n_phy * HISI_SAS_PHY_INT_NR) + hisi_hba->queue_count;
@@ -1669,11 +1663,8 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
 
 		rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
 				      DRV_NAME " fatal", hisi_hba);
-		if (rc) {
-			dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",
-				irq, rc);
+		if (rc)
 			return rc;
-		}
 	}
 
 	hisi_hba->cq_nvecs = hisi_hba->queue_count;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index f3516a0611dd..a7d7f3091026 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -3338,8 +3338,6 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
 		rc = devm_request_irq(dev, irq, phy_interrupts[i], 0,
 				      DRV_NAME " phy", hisi_hba);
 		if (rc) {
-			dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",
-				irq, rc);
 			rc = -ENOENT;
 			goto err_out;
 		}
@@ -3352,8 +3350,6 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
 		rc = devm_request_irq(dev, irq, sata_int_v2_hw, 0,
 				      DRV_NAME " sata", phy);
 		if (rc) {
-			dev_err(dev, "irq init: could not request sata interrupt %d, rc=%d\n",
-				irq, rc);
 			rc = -ENOENT;
 			goto err_out;
 		}
@@ -3364,8 +3360,6 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
 		rc = devm_request_irq(dev, irq, fatal_interrupts[fatal_no], 0,
 				      DRV_NAME " fatal", hisi_hba);
 		if (rc) {
-			dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",
-				irq, rc);
 			rc = -ENOENT;
 			goto err_out;
 		}
@@ -3380,8 +3374,6 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
 					       cq_thread_v2_hw, IRQF_ONESHOT,
 					       DRV_NAME " cq", cq);
 		if (rc) {
-			dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",
-					cq->irq_no, rc);
 			rc = -ENOENT;
 			goto err_out;
 		}
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 213d5b5dea94..b9dc28cbf785 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2631,26 +2631,20 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
 	rc = devm_request_irq(dev, pci_irq_vector(pdev, IRQ_PHY_UP_DOWN_INDEX),
 			      int_phy_up_down_bcast_v3_hw, 0,
 			      DRV_NAME " phy", hisi_hba);
-	if (rc) {
-		dev_err(dev, "could not request phy interrupt, rc=%d\n", rc);
+	if (rc)
 		return -ENOENT;
-	}
 
 	rc = devm_request_irq(dev, pci_irq_vector(pdev, IRQ_CHL_INDEX),
 			      int_chnl_int_v3_hw, 0,
 			      DRV_NAME " channel", hisi_hba);
-	if (rc) {
-		dev_err(dev, "could not request chnl interrupt, rc=%d\n", rc);
+	if (rc)
 		return -ENOENT;
-	}
 
 	rc = devm_request_irq(dev, pci_irq_vector(pdev, IRQ_AXI_INDEX),
 			      fatal_axi_int_v3_hw, 0,
 			      DRV_NAME " fatal", hisi_hba);
-	if (rc) {
-		dev_err(dev, "could not request fatal interrupt, rc=%d\n", rc);
+	if (rc)
 		return -ENOENT;
-	}
 
 	if (hisi_sas_intr_conv)
 		dev_info(dev, "Enable interrupt converge\n");
@@ -2668,11 +2662,8 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
 				      cq_thread_v3_hw,
 				      irqflags,
 				      DRV_NAME " cq", cq);
-		if (rc) {
-			dev_err(dev, "could not request cq%d interrupt, rc=%d\n",
-				i, rc);
+		if (rc)
 			return -ENOENT;
-		}
 		cq->irq_mask = pci_irq_get_affinity(pdev, i + BASE_VECTORS_V3_HW);
 		if (!cq->irq_mask) {
 			dev_err(dev, "could not get cq%d irq affinity!\n", i);
-- 
2.34.1