Commit 51386202 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-dra7xx' into next 

* pci/host-dra7xx:
  PCI: dra7xx: Fix platform_get_irq() error handling
  PCI: dra7xx: Propagate platform_get_irq() errors in dra7xx_pcie_probe()
  PCI: dra7xx: Use PCI_NUM_INTX
parents ee75520e 2f3ec752

drivers/pci/dwc/pci-dra7xx.c

+4 −4
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) 
		return -ENODEV;

	}



	dra7xx->irq_domain = irq_domain_add_linear(pcie_intc_node, 4,

	dra7xx->irq_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,

						   &intx_domain_ops, pp);

	if (!dra7xx->irq_domain) {

		dev_err(dev, "Failed to get a INTx IRQ domain\n");
@@ -437,7 +437,7 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
	pp->irq = platform_get_irq(pdev, 1);

	if (pp->irq < 0) {

		dev_err(dev, "missing IRQ resource\n");

		return -EINVAL;

		return pp->irq;

	}



	ret = devm_request_irq(dev, pp->irq, dra7xx_pcie_msi_irq_handler,
@@ -618,8 +618,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 


	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "missing IRQ resource\n");

		return -EINVAL;

		dev_err(dev, "missing IRQ resource: %d\n", irq);

		return irq;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf");