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()

diff --cc drivers/pci/controller/dwc/pci-dra7xx.c
index 5fda5f4,66465dd..dc38772
--- 1/drivers/pci/controller/dwc/pci-dra7xx.c
--- 2/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@@ -625,12 -626,11 +625,10 @@@ static int __init dra7xx_add_pcie_port(
        struct dw_pcie *pci = dra7xx->pci;
        struct pcie_port *pp = &pci->pp;
        struct device *dev = pci->dev;
 -      struct resource *res;
  
        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)

diff --cc drivers/pci/controller/dwc/pci-exynos.c
Simple merge

diff --cc drivers/pci/controller/dwc/pci-imx6.c
Simple merge

diff --cc drivers/pci/controller/dwc/pci-keystone.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-armada8k.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-artpec6.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-histb.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-kirin.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-spear13xx.c
Simple merge

diff --cc drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
Simple merge

diff --cc drivers/pci/controller/pci-tegra.c
Simple merge

diff --cc drivers/pci/controller/pci-v3-semi.c
index a38a416,2a19f2a..1f54334
--- 1/drivers/pci/controller/pci-v3-semi.c
--- 2/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@@ -762,12 -770,16 +762,11 @@@ static int v3_pci_probe(struct platform
        if (IS_ERR(v3->config_base))
                return PTR_ERR(v3->config_base);
  
 -      ret = pci_parse_request_of_pci_ranges(dev, &host->windows,
 -                                            &host->dma_ranges, NULL);
 -      if (ret)
 -              return ret;
 -
        /* 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) {

diff --cc drivers/pci/controller/pcie-altera-msi.c
Simple merge

diff --cc drivers/pci/controller/pcie-altera.c
index 70c0482,f6d73d2..523bd92
--- 1/drivers/pci/controller/pcie-altera.c
--- 2/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@@ -694,10 -694,13 +694,9 @@@ static void altera_pcie_irq_teardown(st
  
  static int altera_pcie_parse_dt(struct altera_pcie *pcie)
  {
--      struct device *dev = &pcie->pdev->dev;
        struct platform_device *pdev = pcie->pdev;
 -      struct resource *cra;
 -      struct resource *hip;
  
 -      cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra");
 -      pcie->cra_base = devm_ioremap_resource(dev, cra);
 +      pcie->cra_base = devm_platform_ioremap_resource_byname(pdev, "Cra");
        if (IS_ERR(pcie->cra_base))
                return PTR_ERR(pcie->cra_base);
  

diff --cc drivers/pci/controller/pcie-rockchip-host.c
Simple merge

diff --cc drivers/pci/controller/pcie-xilinx-nwl.c
Simple merge