diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 14:28:45 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 14:28:45 -0400 |
| commit | 1ad9a8730e8fd15c6f2ed2230e38a61c3a61d438 (patch) | |
| tree | 9bc5e197aac73b91a8c039a57ea1568fba4f3af2 /drivers/pci/dwc/pci-layerscape.c | |
| parent | f3c91098a444c905b69a83a4947d9dbc774f986d (diff) | |
| parent | 1f319cb0538a10339d1ca73ee124331d611b43bf (diff) | |
Merge branch 'lorenzo/pci/dwc-msi'
* lorenzo/pci/dwc-msi:
PCI: dwc: Expand maximum number of MSI IRQs from 32 to 256
PCI: dwc: Remove old MSI IRQs API
PCI: dwc: Move MSI IRQs allocation to IRQ domains hierarchical API
Diffstat (limited to 'drivers/pci/dwc/pci-layerscape.c')
| -rw-r--r-- | drivers/pci/dwc/pci-layerscape.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c index a7b4159631ae..3724d3ef7008 100644 --- a/drivers/pci/dwc/pci-layerscape.c +++ b/drivers/pci/dwc/pci-layerscape.c | |||
| @@ -182,8 +182,7 @@ static int ls1021_pcie_host_init(struct pcie_port *pp) | |||
| 182 | return ls_pcie_host_init(pp); | 182 | return ls_pcie_host_init(pp); |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | static int ls_pcie_msi_host_init(struct pcie_port *pp, | 185 | static int ls_pcie_msi_host_init(struct pcie_port *pp) |
| 186 | struct msi_controller *chip) | ||
| 187 | { | 186 | { |
| 188 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); | 187 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); |
| 189 | struct device *dev = pci->dev; | 188 | struct device *dev = pci->dev; |