mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 01:04:08 +08:00
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:
commit
6f119ec8d9
@ -627,10 +627,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
|
||||
struct device *dev = pci->dev;
|
||||
|
||||
pp->irq = platform_get_irq(pdev, 1);
|
||||
if (pp->irq < 0) {
|
||||
dev_err(dev, "missing IRQ resource\n");
|
||||
if (pp->irq < 0)
|
||||
return pp->irq;
|
||||
}
|
||||
|
||||
ret = dra7xx_pcie_init_irq_domain(pp);
|
||||
if (ret < 0)
|
||||
@ -868,10 +866,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
|
||||
pci->ops = &dw_pcie_ops;
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "missing IRQ resource: %d\n", irq);
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
base = devm_platform_ioremap_resource_byname(pdev, "ti_conf");
|
||||
if (IS_ERR(base))
|
||||
|
@ -400,10 +400,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
|
||||
int ret;
|
||||
|
||||
pp->irq = platform_get_irq(pdev, 1);
|
||||
if (pp->irq < 0) {
|
||||
dev_err(dev, "failed to get irq\n");
|
||||
if (pp->irq < 0)
|
||||
return pp->irq;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, pp->irq, exynos_pcie_irq_handler,
|
||||
IRQF_SHARED, "exynos-pcie", ep);
|
||||
if (ret) {
|
||||
@ -413,10 +412,8 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
|
||||
|
||||
if (IS_ENABLED(CONFIG_PCI_MSI)) {
|
||||
pp->msi_irq = platform_get_irq(pdev, 0);
|
||||
if (pp->msi_irq < 0) {
|
||||
dev_err(dev, "failed to get msi irq\n");
|
||||
if (pp->msi_irq < 0)
|
||||
return pp->msi_irq;
|
||||
}
|
||||
}
|
||||
|
||||
pp->ops = &exynos_pcie_host_ops;
|
||||
|
@ -868,10 +868,8 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
|
||||
|
||||
if (IS_ENABLED(CONFIG_PCI_MSI)) {
|
||||
pp->msi_irq = platform_get_irq_byname(pdev, "msi");
|
||||
if (pp->msi_irq < 0) {
|
||||
dev_err(dev, "failed to get MSI irq\n");
|
||||
if (pp->msi_irq < 0)
|
||||
return pp->msi_irq;
|
||||
}
|
||||
}
|
||||
|
||||
pp->ops = &imx6_pcie_host_ops;
|
||||
|
@ -1250,10 +1250,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
|
||||
pci->version = version;
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "missing IRQ resource: %d\n", irq);
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
ret = request_irq(irq, ks_pcie_err_irq_handler, IRQF_SHARED,
|
||||
"ks-pcie-error-irq", ks_pcie);
|
||||
|
@ -488,10 +488,8 @@ static int meson_add_pcie_port(struct meson_pcie *mp,
|
||||
|
||||
if (IS_ENABLED(CONFIG_PCI_MSI)) {
|
||||
pp->msi_irq = platform_get_irq(pdev, 0);
|
||||
if (pp->msi_irq < 0) {
|
||||
dev_err(dev, "failed to get MSI IRQ\n");
|
||||
if (pp->msi_irq < 0)
|
||||
return pp->msi_irq;
|
||||
}
|
||||
}
|
||||
|
||||
pp->ops = &meson_pcie_host_ops;
|
||||
|
@ -248,10 +248,8 @@ static int armada8k_add_pcie_port(struct armada8k_pcie *pcie,
|
||||
pp->ops = &armada8k_pcie_host_ops;
|
||||
|
||||
pp->irq = platform_get_irq(pdev, 0);
|
||||
if (pp->irq < 0) {
|
||||
dev_err(dev, "failed to get irq for port\n");
|
||||
if (pp->irq < 0)
|
||||
return pp->irq;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, pp->irq, armada8k_pcie_irq_handler,
|
||||
IRQF_SHARED, "armada8k-pcie", pcie);
|
||||
|
@ -387,10 +387,8 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
|
||||
|
||||
if (IS_ENABLED(CONFIG_PCI_MSI)) {
|
||||
pp->msi_irq = platform_get_irq_byname(pdev, "msi");
|
||||
if (pp->msi_irq < 0) {
|
||||
dev_err(dev, "failed to get MSI irq\n");
|
||||
if (pp->msi_irq < 0)
|
||||
return pp->msi_irq;
|
||||
}
|
||||
}
|
||||
|
||||
pp->ops = &artpec6_pcie_host_ops;
|
||||
|
@ -399,10 +399,8 @@ static int histb_pcie_probe(struct platform_device *pdev)
|
||||
|
||||
if (IS_ENABLED(CONFIG_PCI_MSI)) {
|
||||
pp->msi_irq = platform_get_irq_byname(pdev, "msi");
|
||||
if (pp->msi_irq < 0) {
|
||||
dev_err(dev, "Failed to get MSI IRQ\n");
|
||||
if (pp->msi_irq < 0)
|
||||
return pp->msi_irq;
|
||||
}
|
||||
}
|
||||
|
||||
hipcie->phy = devm_phy_get(dev, "phy");
|
||||
|
@ -450,11 +450,8 @@ static int kirin_pcie_add_msi(struct dw_pcie *pci,
|
||||
|
||||
if (IS_ENABLED(CONFIG_PCI_MSI)) {
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev,
|
||||
"failed to get MSI IRQ (%d)\n", irq);
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
pci->pp.msi_irq = irq;
|
||||
}
|
||||
|
@ -198,10 +198,9 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie,
|
||||
int ret;
|
||||
|
||||
pp->irq = platform_get_irq(pdev, 0);
|
||||
if (pp->irq < 0) {
|
||||
dev_err(dev, "failed to get irq\n");
|
||||
if (pp->irq < 0)
|
||||
return pp->irq;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler,
|
||||
IRQF_SHARED | IRQF_NO_THREAD,
|
||||
"spear1340-pcie", spear13xx_pcie);
|
||||
|
@ -2189,10 +2189,8 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
pp->irq = platform_get_irq_byname(pdev, "intr");
|
||||
if (pp->irq < 0) {
|
||||
dev_err(dev, "Failed to get \"intr\" interrupt\n");
|
||||
if (pp->irq < 0)
|
||||
return pp->irq;
|
||||
}
|
||||
|
||||
pcie->bpmp = tegra_bpmp_get(dev);
|
||||
if (IS_ERR(pcie->bpmp))
|
||||
|
@ -170,10 +170,9 @@ static int ls_pcie_g4_interrupt_init(struct mobiveil_pcie *mv_pci)
|
||||
int ret;
|
||||
|
||||
pcie->irq = platform_get_irq_byname(pdev, "intr");
|
||||
if (pcie->irq < 0) {
|
||||
dev_err(dev, "Can't get 'intr' IRQ, errno = %d\n", pcie->irq);
|
||||
if (pcie->irq < 0)
|
||||
return pcie->irq;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, pcie->irq, ls_pcie_g4_isr,
|
||||
IRQF_SHARED, pdev->name, pcie);
|
||||
if (ret) {
|
||||
|
@ -519,10 +519,8 @@ static int mobiveil_pcie_integrated_interrupt_init(struct mobiveil_pcie *pcie)
|
||||
mobiveil_pcie_enable_msi(pcie);
|
||||
|
||||
rp->irq = platform_get_irq(pdev, 0);
|
||||
if (rp->irq < 0) {
|
||||
dev_err(dev, "failed to map IRQ: %d\n", rp->irq);
|
||||
if (rp->irq < 0)
|
||||
return rp->irq;
|
||||
}
|
||||
|
||||
/* initialize the IRQ domains */
|
||||
ret = mobiveil_pcie_init_irq_domain(pcie);
|
||||
|
@ -1493,10 +1493,8 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie)
|
||||
|
||||
/* request interrupt */
|
||||
err = platform_get_irq_byname(pdev, "intr");
|
||||
if (err < 0) {
|
||||
dev_err(dev, "failed to get IRQ: %d\n", err);
|
||||
if (err < 0)
|
||||
goto phys_put;
|
||||
}
|
||||
|
||||
pcie->irq = err;
|
||||
|
||||
@ -1711,10 +1709,8 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
|
||||
}
|
||||
|
||||
err = platform_get_irq_byname(pdev, "msi");
|
||||
if (err < 0) {
|
||||
dev_err(dev, "failed to get IRQ: %d\n", err);
|
||||
if (err < 0)
|
||||
goto free_irq_domain;
|
||||
}
|
||||
|
||||
msi->irq = err;
|
||||
|
||||
|
@ -764,10 +764,9 @@ static int v3_pci_probe(struct platform_device *pdev)
|
||||
|
||||
/* Get and request error IRQ resource */
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "unable to obtain PCIv3 error IRQ\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, irq, v3_irq, 0,
|
||||
"PCIv3 error", v3);
|
||||
if (ret < 0) {
|
||||
|
@ -478,8 +478,6 @@ static int xgene_msi_probe(struct platform_device *pdev)
|
||||
for (irq_index = 0; irq_index < NR_HW_IRQS; irq_index++) {
|
||||
virt_msir = platform_get_irq(pdev, irq_index);
|
||||
if (virt_msir < 0) {
|
||||
dev_err(&pdev->dev, "Cannot translate IRQ index %d\n",
|
||||
irq_index);
|
||||
rc = virt_msir;
|
||||
goto error;
|
||||
}
|
||||
|
@ -255,7 +255,6 @@ static int altera_msi_probe(struct platform_device *pdev)
|
||||
|
||||
msi->irq = platform_get_irq(pdev, 0);
|
||||
if (msi->irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to map IRQ: %d\n", msi->irq);
|
||||
ret = msi->irq;
|
||||
goto err;
|
||||
}
|
||||
|
@ -694,7 +694,6 @@ static void altera_pcie_irq_teardown(struct altera_pcie *pcie)
|
||||
|
||||
static int altera_pcie_parse_dt(struct altera_pcie *pcie)
|
||||
{
|
||||
struct device *dev = &pcie->pdev->dev;
|
||||
struct platform_device *pdev = pcie->pdev;
|
||||
|
||||
pcie->cra_base = devm_platform_ioremap_resource_byname(pdev, "Cra");
|
||||
@ -710,10 +709,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)
|
||||
|
||||
/* setup IRQ */
|
||||
pcie->irq = platform_get_irq(pdev, 0);
|
||||
if (pcie->irq < 0) {
|
||||
dev_err(dev, "failed to get IRQ: %d\n", pcie->irq);
|
||||
if (pcie->irq < 0)
|
||||
return pcie->irq;
|
||||
}
|
||||
|
||||
irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie);
|
||||
return 0;
|
||||
|
@ -549,10 +549,8 @@ static int rockchip_pcie_setup_irq(struct rockchip_pcie *rockchip)
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
|
||||
irq = platform_get_irq_byname(pdev, "sys");
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "missing sys IRQ resource\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
err = devm_request_irq(dev, irq, rockchip_pcie_subsys_irq_handler,
|
||||
IRQF_SHARED, "pcie-sys", rockchip);
|
||||
@ -562,20 +560,16 @@ static int rockchip_pcie_setup_irq(struct rockchip_pcie *rockchip)
|
||||
}
|
||||
|
||||
irq = platform_get_irq_byname(pdev, "legacy");
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "missing legacy IRQ resource\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
irq_set_chained_handler_and_data(irq,
|
||||
rockchip_pcie_legacy_int_handler,
|
||||
rockchip);
|
||||
|
||||
irq = platform_get_irq_byname(pdev, "client");
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "missing client IRQ resource\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
err = devm_request_irq(dev, irq, rockchip_pcie_client_irq_handler,
|
||||
IRQF_SHARED, "pcie-client", rockchip);
|
||||
|
@ -273,10 +273,8 @@ static int tango_pcie_probe(struct platform_device *pdev)
|
||||
writel_relaxed(0, pcie->base + SMP8759_ENABLE + offset);
|
||||
|
||||
virq = platform_get_irq(pdev, 1);
|
||||
if (virq < 0) {
|
||||
dev_err(dev, "Failed to map IRQ\n");
|
||||
if (virq < 0)
|
||||
return virq;
|
||||
}
|
||||
|
||||
irq_dom = irq_domain_create_linear(fwnode, MSI_MAX, &dom_ops, pcie);
|
||||
if (!irq_dom) {
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user