diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:23:55 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:23:55 -0500 |
| commit | ee75520eb20cf3c9101742ecb219064ad4c3fec9 (patch) | |
| tree | ec75e46b3dc3078e1d6704c79f4d722df60f38fa /drivers/pci/dwc/pci-dra7xx.c | |
| parent | 199a0253e39dc62f419de1d00a7c7a16f4b0f720 (diff) | |
| parent | 8c934095fa2f336d92b722f49f78ca7abf47e051 (diff) | |
Merge branch 'pci/host-designware' into next
* pci/host-designware:
PCI: dwc: Clear MSI interrupt status after it is handled, not before
PCI: qcom: Allow ->post_init() to fail
PCI: qcom: Don't unroll init if ->init() fails
PCI: dwc: designware: Handle ->host_init() failures
PCI: dwc: designware: Test PCIE_ATU_ENABLE bit specifically
PCI: dwc: designware: Make dw_pcie_prog_*_atu_unroll() static
Diffstat (limited to 'drivers/pci/dwc/pci-dra7xx.c')
| -rw-r--r-- | drivers/pci/dwc/pci-dra7xx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c index f2fc5f47064e..e8c13bb76169 100644 --- a/drivers/pci/dwc/pci-dra7xx.c +++ b/drivers/pci/dwc/pci-dra7xx.c @@ -195,7 +195,7 @@ static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx) dra7xx_pcie_enable_msi_interrupts(dra7xx); } -static void dra7xx_pcie_host_init(struct pcie_port *pp) +static int dra7xx_pcie_host_init(struct pcie_port *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci); @@ -206,6 +206,8 @@ static void dra7xx_pcie_host_init(struct pcie_port *pp) dw_pcie_wait_for_link(pci); dw_pcie_msi_init(pp); dra7xx_pcie_enable_interrupts(dra7xx); + + return 0; } static const struct dw_pcie_host_ops dra7xx_pcie_host_ops = { |