summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2020-10-21 09:58:44 -0500
committerBjorn Helgaas <bhelgaas@google.com>2020-10-21 09:58:44 -0500
commit28e34e751f6c50098d9bcecb30c97634b6126730 (patch)
tree52ea60796c662488e7a7263adabdd2b3cf688178 /drivers
parent4c0e51f8054c82065dca9669739573390f25743c (diff)
parent7d69b117c31305a36a72f337e80860478a5c8e4a (diff)
Merge branch 'remotes/lorenzo/pci/xilinx'
- Remove leftover bridge initialization (Lorenzo Pieralisi) * remotes/lorenzo/pci/xilinx: PCI: xilinx-cpm: Remove leftover bridge initialization
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/controller/pcie-xilinx-cpm.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/controller/pcie-xilinx-cpm.c
index f3082de44e8a..f92e0152e65e 100644
--- a/drivers/pci/controller/pcie-xilinx-cpm.c
+++ b/drivers/pci/controller/pcie-xilinx-cpm.c
@@ -572,12 +572,8 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev)
goto err_setup_irq;
}
- bridge->dev.parent = dev;
bridge->sysdata = port->cfg;
- bridge->busnr = port->cfg->busr.start;
bridge->ops = (struct pci_ops *)&pci_generic_ecam_ops.pci_ops;
- bridge->map_irq = of_irq_parse_and_map_pci;
- bridge->swizzle_irq = pci_common_swizzle;
err = pci_host_probe(bridge);
if (err < 0)