diff options
Diffstat (limited to 'drivers/pci/dwc/pci-exynos.c')
-rw-r--r-- | drivers/pci/dwc/pci-exynos.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c index c78c06552590..5596fdedbb94 100644 --- a/drivers/pci/dwc/pci-exynos.c +++ b/drivers/pci/dwc/pci-exynos.c | |||
@@ -581,13 +581,15 @@ static int exynos_pcie_link_up(struct dw_pcie *pci) | |||
581 | return 0; | 581 | return 0; |
582 | } | 582 | } |
583 | 583 | ||
584 | static void exynos_pcie_host_init(struct pcie_port *pp) | 584 | static int exynos_pcie_host_init(struct pcie_port *pp) |
585 | { | 585 | { |
586 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); | 586 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); |
587 | struct exynos_pcie *ep = to_exynos_pcie(pci); | 587 | struct exynos_pcie *ep = to_exynos_pcie(pci); |
588 | 588 | ||
589 | exynos_pcie_establish_link(ep); | 589 | exynos_pcie_establish_link(ep); |
590 | exynos_pcie_enable_interrupts(ep); | 590 | exynos_pcie_enable_interrupts(ep); |
591 | |||
592 | return 0; | ||
591 | } | 593 | } |
592 | 594 | ||
593 | static const struct dw_pcie_host_ops exynos_pcie_host_ops = { | 595 | static const struct dw_pcie_host_ops exynos_pcie_host_ops = { |
@@ -605,9 +607,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, | |||
605 | int ret; | 607 | int ret; |
606 | 608 | ||
607 | pp->irq = platform_get_irq(pdev, 1); | 609 | pp->irq = platform_get_irq(pdev, 1); |
608 | if (!pp->irq) { | 610 | if (pp->irq < 0) { |
609 | dev_err(dev, "failed to get irq\n"); | 611 | dev_err(dev, "failed to get irq\n"); |
610 | return -ENODEV; | 612 | return pp->irq; |
611 | } | 613 | } |
612 | ret = devm_request_irq(dev, pp->irq, exynos_pcie_irq_handler, | 614 | ret = devm_request_irq(dev, pp->irq, exynos_pcie_irq_handler, |
613 | IRQF_SHARED, "exynos-pcie", ep); | 615 | IRQF_SHARED, "exynos-pcie", ep); |
@@ -618,9 +620,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, | |||
618 | 620 | ||
619 | if (IS_ENABLED(CONFIG_PCI_MSI)) { | 621 | if (IS_ENABLED(CONFIG_PCI_MSI)) { |
620 | pp->msi_irq = platform_get_irq(pdev, 0); | 622 | pp->msi_irq = platform_get_irq(pdev, 0); |
621 | if (!pp->msi_irq) { | 623 | if (pp->msi_irq < 0) { |
622 | dev_err(dev, "failed to get msi irq\n"); | 624 | dev_err(dev, "failed to get msi irq\n"); |
623 | return -ENODEV; | 625 | return pp->msi_irq; |
624 | } | 626 | } |
625 | 627 | ||
626 | ret = devm_request_irq(dev, pp->msi_irq, | 628 | ret = devm_request_irq(dev, pp->msi_irq, |