From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 5 Aug 2020 23:24:22 +0000 (-0500)
Subject: Merge branch 'pci/irq-error'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f119ec8d9c8f68c0432d902312045a699c3e52a;p=linux.git

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

6f119ec8d9c8f68c0432d902312045a699c3e52a
diff --cc drivers/pci/controller/dwc/pci-dra7xx.c
index 5fda5f4d68b10,66465dd698584..dc387724cf08f
--- a/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/pci-v3-semi.c
index a38a416bcf3b0,2a19f2a989453..1f54334f09f7a
--- a/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.c
index 70c04829b8199,f6d73d282230f..523bd928b380a
--- a/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);