Commit b64aa11e authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: Set bridge map_irq and swizzle_irq to default functions 

The majority of DT based host drivers use the default .map_irq() and
.swizzle_irq() functions, so let's initialize the function pointers to
the default and drop setting them in the host drivers.

Drivers like iProc which don't support legacy interrupts need to set
.map_irq() back to NULL.

Link: https://lore.kernel.org/r/20200722022514.1283916-20-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
parent 669cbc70

drivers/pci/controller/cadence/pcie-cadence-host.c

+0 −2
Original line number Diff line number Diff line
@@ -231,8 +231,6 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) 
		goto err_init;



	bridge->ops = &cdns_pcie_host_ops;

	bridge->map_irq = of_irq_parse_and_map_pci;

	bridge->swizzle_irq = pci_common_swizzle;



	ret = pci_host_probe(bridge);

	if (ret < 0)

drivers/pci/controller/dwc/pcie-designware-host.c

+0 −2
Original line number Diff line number Diff line
@@ -470,8 +470,6 @@ int dw_pcie_host_init(struct pcie_port *pp) 


	bridge->sysdata = pp;

	bridge->ops = &dw_pcie_ops;

	bridge->map_irq = of_irq_parse_and_map_pci;

	bridge->swizzle_irq = pci_common_swizzle;



	ret = pci_scan_root_bus_bridge(bridge);

	if (ret)

drivers/pci/controller/mobiveil/pcie-mobiveil-host.c

+0 −2
Original line number Diff line number Diff line
@@ -596,8 +596,6 @@ int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie) 
	/* Initialize bridge */

	bridge->sysdata = pcie;

	bridge->ops = &mobiveil_pcie_ops;

	bridge->map_irq = of_irq_parse_and_map_pci;

	bridge->swizzle_irq = pci_common_swizzle;



	ret = mobiveil_bringup_link(pcie);

	if (ret) {

drivers/pci/controller/pci-aardvark.c

+0 −2
Original line number Diff line number Diff line
@@ -1175,8 +1175,6 @@ static int advk_pcie_probe(struct platform_device *pdev) 


	bridge->sysdata = pcie;

	bridge->ops = &advk_pcie_ops;

	bridge->map_irq = of_irq_parse_and_map_pci;

	bridge->swizzle_irq = pci_common_swizzle;



	ret = pci_host_probe(bridge);

	if (ret < 0) {

drivers/pci/controller/pci-ftpci100.c

+0 −2
Original line number Diff line number Diff line
@@ -437,8 +437,6 @@ static int faraday_pci_probe(struct platform_device *pdev) 
		return -ENOMEM;



	host->ops = &faraday_pci_ops;

	host->map_irq = of_irq_parse_and_map_pci;

	host->swizzle_irq = pci_common_swizzle;

	p = pci_host_bridge_priv(host);

	host->sysdata = p;

	p->dev = dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE