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: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c
index 436eb9f3d68e2b33d24f01957b8e2ceb8e1ac50f..e60f72780ab09b8671e8dc4033bf74935d8aec9e 100644 (file)
--- a/drivers/pci/controller/cadence/pcie-cadence-host.c
+++ b/drivers/pci/controller/cadence/pcie-cadence-host.c
@@ -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)

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index f9fa7b1f429df8084e5f1203411223882c9a6429..7461357d98f6d3371434006e026705152499db37 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -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)

diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
index 2954d6ad8333e0de2e5b123a7fc3277249ba17c6..33ab36d73906e172848a8729269d666f52791858 100644 (file)
--- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
+++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
@@ -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) {

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 7ee14cfb7f5a8cfa30f84195cf54774ce6fb609d..795e7632b06804f2702a743c604b5aa14448440b 100644 (file)
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -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) {

diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
index 94f6ab5fff7068f6bd26ef917978e510a28ed4c4..da3cd216da0078edc7b17471a67f1fa845020710 100644 (file)
--- a/drivers/pci/controller/pci-ftpci100.c
+++ b/drivers/pci/controller/pci-ftpci100.c
@@ -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;

diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
index 509624175260abf148edeb85510fefa88d063132..6ce34a1deecb2cd306f93fbd3b7ed113ef6f5cd7 100644 (file)
--- a/drivers/pci/controller/pci-host-common.c
+++ b/drivers/pci/controller/pci-host-common.c
@@ -77,8 +77,6 @@ int pci_host_common_probe(struct platform_device *pdev)
 
        bridge->sysdata = cfg;
        bridge->ops = (struct pci_ops *)&ops->pci_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        platform_set_drvdata(pdev, bridge);
 

diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index db93823a2dcb1d7638aa397a2ede3dad70086e5a..12d30fb6ae6ee873f9521f30a87e65ebcf9c0732 100644 (file)
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -1118,8 +1118,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
 
        bridge->sysdata = pcie;
        bridge->ops = &mvebu_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
        bridge->align_resource = mvebu_pcie_align_resource;
        bridge->msi = pcie->msi;
 

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index c75ee4bb914e1be46c708ec6f3a096f6f9dccca0..2789d5500f2c993e6e09e4a510bdfa81449eab17 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -2707,7 +2707,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
 
        host->ops = &tegra_pcie_ops;
        host->map_irq = tegra_pcie_map_irq;
-       host->swizzle_irq = pci_common_swizzle;
 
        err = pci_host_probe(host);
        if (err < 0) {

diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index 1a2cbc56b34b11a7bc95f010d2e831939cff1483..a38a416bcf3b06e20e1843ba470400408a75aa8c 100644 (file)
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -722,8 +722,6 @@ static int v3_pci_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        host->ops = &v3_pci_ops;
-       host->map_irq = of_irq_parse_and_map_pci;
-       host->swizzle_irq = pci_common_swizzle;
        v3 = pci_host_bridge_priv(host);
        host->sysdata = v3;
        v3->dev = dev;

diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
index fb45f8d158feceda02d616f204e74a19df1871ca..653d5d0ecf817cb8ba61fbc15dab4a5cd91b21e3 100644 (file)
--- a/drivers/pci/controller/pci-versatile.c
+++ b/drivers/pci/controller/pci-versatile.c
@@ -149,8 +149,6 @@ static int versatile_pci_probe(struct platform_device *pdev)
        pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
        bridge->ops = &pci_versatile_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        return pci_host_probe(bridge);
 }

diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 190234b7a3a9c06b2b604d14802b1844ccb00bb1..8e0db84f089da3bd30ffd522c9497a962ae040be 100644 (file)
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -620,8 +620,6 @@ static int xgene_pcie_probe(struct platform_device *pdev)
 
        bridge->sysdata = port;
        bridge->ops = &xgene_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        return pci_host_probe(bridge);
 }

diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
index d93489e8978ecd9dcc38ab580af62e68bb7422af..70c04829b81996da583e3893f1de347f45d123ea 100644 (file)
--- a/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@ -809,8 +809,6 @@ static int altera_pcie_probe(struct platform_device *pdev)
        bridge->sysdata = pcie;
        bridge->busnr = pcie->root_bus_nr;
        bridge->ops = &altera_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        return pci_host_probe(bridge);
 }

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index f0f283ec17a06d1be5cb020a684c88330290c925..85fa7d54f11fb5b09c1a81d1e4fd3e82461070b5 100644 (file)
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -991,8 +991,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 
        bridge->ops = &brcm_pcie_ops;
        bridge->sysdata = pcie;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        platform_set_drvdata(pdev, pcie);
 

diff --git a/drivers/pci/controller/pcie-iproc-platform.c b/drivers/pci/controller/pcie-iproc-platform.c
index 7c10c1cb6f65d05d18fff8037659abe7d196f743..a956b0c18bd1b2a8640179506e41505fbba7119d 100644 (file)
--- a/drivers/pci/controller/pcie-iproc-platform.c
+++ b/drivers/pci/controller/pcie-iproc-platform.c
@@ -99,9 +99,10 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
        switch (pcie->type) {
        case IPROC_PCIE_PAXC:
        case IPROC_PCIE_PAXC_V2:
+               pcie->map_irq = 0;
                break;
        default:
-               pcie->map_irq = of_irq_parse_and_map_pci;
+               break;
        }
 
        ret = iproc_pcie_setup(pcie, &bridge->windows);

diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
index e98dafd0fff4a292540f9a81e4aa4dd3d63846d9..905e938082432be3dfceed29cefe4f1e7d68aad6 100644 (file)
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -1526,7 +1526,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
        host->ops = &iproc_pcie_ops;
        host->sysdata = pcie;
        host->map_irq = pcie->map_irq;
-       host->swizzle_irq = pci_common_swizzle;
 
        ret = pci_host_probe(host);
        if (ret < 0) {

diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index a745f35a83962c724a7066b4cfc4e13669773108..cf4c18f0c25ab002aaf03f3a83232e5c694b31df 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -1083,8 +1083,6 @@ static int mtk_pcie_probe(struct platform_device *pdev)
                return err;
 
        host->ops = pcie->soc->ops;
-       host->map_irq = of_irq_parse_and_map_pci;
-       host->swizzle_irq = pci_common_swizzle;
        host->sysdata = pcie;
 
        err = pci_host_probe(host);

diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
index 67f2a9d3bc298ca5ea965fff0a95a555dcd3a94d..f6f41db31d47bcf122d0832b963af158f1ef31ef 100644 (file)
--- a/drivers/pci/controller/pcie-rcar-host.c
+++ b/drivers/pci/controller/pcie-rcar-host.c
@@ -294,8 +294,6 @@ static int rcar_pcie_enable(struct rcar_pcie_host *host)
 
        bridge->sysdata = host;
        bridge->ops = &rcar_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
        if (IS_ENABLED(CONFIG_PCI_MSI))
                bridge->msi = &host->msi.chip;
 

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index fed4f6cd1b7bf86871f328f7fbd0ddedd3b11f1d..153bc95ab29f8b39b78ed978f50c513451401445 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -1001,8 +1001,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
 
        bridge->sysdata = rockchip;
        bridge->ops = &rockchip_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        err = pci_host_probe(bridge);
        if (err < 0)

diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index 7e7c23c555c7c3eadc19d9bea1ec2466e4e2e7ed..97305bfe81b59e6efacdb1dae85638a4fc1a9643 100644 (file)
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -846,8 +846,6 @@ static int nwl_pcie_probe(struct platform_device *pdev)
 
        bridge->sysdata = pcie;
        bridge->ops = &nwl_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                err = nwl_pcie_enable_msi(pcie);

diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
index f8b8ccea5cbc7c62c140157583b99216908a4041..8523be61bba58b851814e13ab0b29b279cd6744c 100644 (file)
--- a/drivers/pci/controller/pcie-xilinx.c
+++ b/drivers/pci/controller/pcie-xilinx.c
@@ -643,8 +643,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
 
        bridge->sysdata = port;
        bridge->ops = &xilinx_pcie_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
 #ifdef CONFIG_PCI_MSI
        xilinx_pcie_msi_chip.dev = dev;

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 5e06aae1b4cdd575aa49931ee214ff93e10d39bc..8f478d92319625c9c37c98610b39310e4fa5312a 100644 (file)
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -569,6 +569,9 @@ int devm_of_pci_bridge_init(struct device *dev, struct pci_host_bridge *bridge)
        if (!dev->of_node)
                return 0;
 
+       bridge->swizzle_irq = pci_common_swizzle;
+       bridge->map_irq = of_irq_parse_and_map_pci;
+
        return pci_parse_request_of_pci_ranges(dev, bridge);
 }