openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Bjorn Helgaas 2017-09-07 13:23:55 -05:00
parent ee75520eb2 2f3ec75245
commit 51386202a5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/dwc/pci-dra7xx.c
View File

@ -240,7 +240,7 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)
return -ENODEV; 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); &intx_domain_ops, pp);
if (!dra7xx->irq_domain) { if (!dra7xx->irq_domain) {
dev_err(dev, "Failed to get a INTx IRQ domain\n"); 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); pp->irq = platform_get_irq(pdev, 1);
if (pp->irq < 0) { if (pp->irq < 0) {
dev_err(dev, "missing IRQ resource\n"); dev_err(dev, "missing IRQ resource\n");
return -EINVAL; return pp->irq;
} }
ret = devm_request_irq(dev, pp->irq, dra7xx_pcie_msi_irq_handler, 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); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(dev, "missing IRQ resource\n"); dev_err(dev, "missing IRQ resource: %d\n", irq);
return -EINVAL; return irq;
} }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf");