Commit ab17122e authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw() 

After commit 6c11dc06 ("scsi: hisi_sas: Fix IRQ checks") we have the
error codes returned by platform_get_irq() ready for the propagation
upsream in interrupt_init_v1_hw() -- that will fix still broken deferred
probing. Let's propagate the error codes from devm_request_irq() as well
since I don't see the reason to override them with -ENOENT...

Link: https://lore.kernel.org/r/49ba93a3-d427-7542-d85a-b74fe1a33a73@omp.ru


Acked-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8f942f9d

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+6 −6
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
			if (irq < 0) {

				dev_err(dev, "irq init: fail map phy interrupt %d\n",

					idx);

				return -ENOENT;

				return irq;

			}



			rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
@@ -1657,7 +1657,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
			if (rc) {

				dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",

					irq, rc);

				return -ENOENT;

				return rc;

			}

		}

	}
@@ -1668,7 +1668,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
		if (irq < 0) {

			dev_err(dev, "irq init: could not map cq interrupt %d\n",

				idx);

			return -ENOENT;

			return irq;

		}



		rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,
@@ -1676,7 +1676,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
		if (rc) {

			dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",

				irq, rc);

			return -ENOENT;

			return rc;

		}

	}
@@ -1686,7 +1686,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
		if (irq < 0) {

			dev_err(dev, "irq init: could not map fatal interrupt %d\n",

				idx);

			return -ENOENT;

			return irq;

		}



		rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
@@ -1694,7 +1694,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
		if (rc) {

			dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",

				irq, rc);

			return -ENOENT;

			return rc;

		}

	}