Commit 28e34e75 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/xilinx' 

- Remove leftover bridge initialization (Lorenzo Pieralisi)

* remotes/lorenzo/pci/xilinx:
  PCI: xilinx-cpm: Remove leftover bridge initialization
parents 4c0e51f8 7d69b117

drivers/pci/controller/pcie-xilinx-cpm.c

+0 −4
Original line number Diff line number Diff line
@@ -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)