diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:28:48 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:28:48 -0500 |
| commit | 74716ff7abb483111eb44104b05799226e69b4b3 (patch) | |
| tree | a7ab49ff409f9a5e7089d0af6d967ea5a2716f9a /drivers/pci/host/pcie-iproc.c | |
| parent | 14d8d776aeda8e367a9354b6cb6a0696671630c9 (diff) | |
| parent | 6c994c504fa21843c667edece593dbfa4634b046 (diff) | |
Merge branch '6c994c504fa2'
- exclude af3c73473d10 ("PCI: Improve host drivers compile test
coverage") from lorenzo/pci/host/misc to avoid build failure
* commit '6c994c504fa2':
PCI: v3-semi: Remove unnecessary semicolon
PCI: rcar: Remove unnecessary semicolon
PCI: faraday: Make struct faraday_pci_variant static
PCI: kirin: Make struct kirin_pcie_driver static
PCI: kirin: Fix missing dependency on PCI_MSI_IRQ_DOMAIN
PCI: iproc: Remove dependency on ARM specific struct pci_sys_data
PCI: kirin: Remove unnecessary asm/compiler.h include
PCI: tegra: Add PCI_MSI_IRQ_DOMAIN kconfig dependency
PCI: vmd: Fix malformed Kconfig default
Diffstat (limited to 'drivers/pci/host/pcie-iproc.c')
| -rw-r--r-- | drivers/pci/host/pcie-iproc.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index cbb095481cdc..3c76c5fa4f32 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -377,14 +377,7 @@ static const u16 iproc_pcie_reg_paxc_v2[] = { static inline struct iproc_pcie *iproc_data(struct pci_bus *bus) { - struct iproc_pcie *pcie; -#ifdef CONFIG_ARM - struct pci_sys_data *sys = bus->sysdata; - - pcie = sys->private_data; -#else - pcie = bus->sysdata; -#endif + struct iproc_pcie *pcie = bus->sysdata; return pcie; } @@ -1331,7 +1324,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) { struct device *dev; int ret; - void *sysdata; struct pci_bus *child; struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); @@ -1376,13 +1368,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) goto err_power_off_phy; } -#ifdef CONFIG_ARM - pcie->sysdata.private_data = pcie; - sysdata = &pcie->sysdata; -#else - sysdata = pcie; -#endif - ret = iproc_pcie_check_link(pcie); if (ret) { dev_err(dev, "no PCIe EP device detected\n"); @@ -1399,7 +1384,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) host->busnr = 0; host->dev.parent = dev; host->ops = &iproc_pcie_ops; - host->sysdata = sysdata; + host->sysdata = pcie; host->map_irq = pcie->map_irq; host->swizzle_irq = pci_common_swizzle; |