Merge branch 'pci/irq-error'
- Remove redundant logging for platform_get_irq() errors (Krzysztof Wilczyński) * pci/irq-error: PCI: Remove dev_err() when handing an error from platform_get_irq()
This commit is contained in:
@@ -583,7 +583,6 @@ static int nwl_pcie_enable_msi(struct nwl_pcie *pcie)
|
||||
/* Get msi_1 IRQ number */
|
||||
msi->irq_msi1 = platform_get_irq_byname(pdev, "msi1");
|
||||
if (msi->irq_msi1 < 0) {
|
||||
dev_err(dev, "failed to get IRQ#%d\n", msi->irq_msi1);
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
@@ -594,7 +593,6 @@ static int nwl_pcie_enable_msi(struct nwl_pcie *pcie)
|
||||
/* Get msi_0 IRQ number */
|
||||
msi->irq_msi0 = platform_get_irq_byname(pdev, "msi0");
|
||||
if (msi->irq_msi0 < 0) {
|
||||
dev_err(dev, "failed to get IRQ#%d\n", msi->irq_msi0);
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
@@ -725,11 +723,8 @@ static int nwl_pcie_bridge_init(struct nwl_pcie *pcie)
|
||||
|
||||
/* Get misc IRQ number */
|
||||
pcie->irq_misc = platform_get_irq_byname(pdev, "misc");
|
||||
if (pcie->irq_misc < 0) {
|
||||
dev_err(dev, "failed to get misc IRQ %d\n",
|
||||
pcie->irq_misc);
|
||||
if (pcie->irq_misc < 0)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = devm_request_irq(dev, pcie->irq_misc,
|
||||
nwl_pcie_misc_handler, IRQF_SHARED,
|
||||
@@ -794,10 +789,8 @@ static int nwl_pcie_parse_dt(struct nwl_pcie *pcie,
|
||||
|
||||
/* Get intx IRQ number */
|
||||
pcie->irq_intx = platform_get_irq_byname(pdev, "intx");
|
||||
if (pcie->irq_intx < 0) {
|
||||
dev_err(dev, "failed to get intx IRQ %d\n", pcie->irq_intx);
|
||||
if (pcie->irq_intx < 0)
|
||||
return pcie->irq_intx;
|
||||
}
|
||||
|
||||
irq_set_chained_handler_and_data(pcie->irq_intx,
|
||||
nwl_pcie_leg_handler, pcie);
|
||||
|
Reference in New Issue
Block a user