summaryrefslogtreecommitdiffstats
path: root/drivers/pci/controller/dwc/pcie-artpec6.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2020-08-05 18:24:22 -0500
committerBjorn Helgaas <bhelgaas@google.com>2020-08-05 18:24:22 -0500
commit6f119ec8d9c8f68c0432d902312045a699c3e52a (patch)
tree37a77220c6301b947b778a45e314719e20028a79 /drivers/pci/controller/dwc/pcie-artpec6.c
parent65c2bc6ce972e7aee1523a0702d0eeac0570a01f (diff)
parentcaecb05c800081c57907749f787f05f62011564e (diff)
downloadlinux-6f119ec8d9c8f68c0432d902312045a699c3e52a.tar.bz2
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()
Diffstat (limited to 'drivers/pci/controller/dwc/pcie-artpec6.c')
-rw-r--r--drivers/pci/controller/dwc/pcie-artpec6.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
index 7d2cfa288b01..97d50bb50f06 100644
--- a/drivers/pci/controller/dwc/pcie-artpec6.c
+++ b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -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;