PCI: dwc: ep: Remove dw_pcie_ep_init_notify() wrapper

Currently dw_pcie_ep_init_notify() wrapper just calls pci_epc_init_notify()
directly, so this wrapper provides no benefit to the glue drivers.

Remove it and call pci_epc_init_notify() directly from glue drivers.

Suggested-by: Bjorn Helgaas <helgaas@kernel.org>
Link: https://lore.kernel.org/linux-pci/20240606-pci-deinit-v1-1-4395534520dc@linaro.org
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Niklas Cassel <cassel@kernel.org>

diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
index d2d17d37d3e0b5adfd30c9c348a0be29b795bff8..e491d0ff3962755ab08e36354650dc4477423faf 100644 (file)
--- a/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -474,7 +474,7 @@ static int dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx,
                return ret;
        }
 
-       dw_pcie_ep_init_notify(ep);
+       pci_epc_init_notify(ep->epc);
 
        return 0;
 }

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 917c69edee1d54199cdf19106af61d9578359159..a876b8e6e741c0102e341e81f571f628567f433b 100644 (file)
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1131,7 +1131,7 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie,
                return ret;
        }
 
-       dw_pcie_ep_init_notify(ep);
+       pci_epc_init_notify(ep->epc);
 
        /* Start LTSSM. */
        imx6_pcie_ltssm_enable(dev);

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index d3a7d14ee685a1d63c5b0ba13b540c54293d13e7..ca1054f5c79a832d61d092375b62eab52c32e3b9 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -1293,7 +1293,7 @@ static int ks_pcie_probe(struct platform_device *pdev)
                        goto err_ep_init;
                }
 
-               dw_pcie_ep_init_notify(&pci->ep);
+               pci_epc_init_notify(pci->ep.epc);
 
                break;
        default:

diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
index 7dde6d5fa4d858d2b817796ee90da7f971cbe7ac..35bb481564c75b04c91290fcc955d515bdf5c539 100644 (file)
--- a/drivers/pci/controller/dwc/pci-layerscape-ep.c
+++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c
@@ -286,7 +286,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
                return ret;
        }
 
-       dw_pcie_ep_init_notify(&pci->ep);
+       pci_epc_init_notify(pci->ep.epc);
 
        return ls_pcie_ep_interrupt_init(pcie, pdev);
 }

diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
index a4630b92489bf4033bf2d636bb235b64b3537dff..dc8dd7f27b78fe0f704da8579d1547d3c7277c6b 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-artpec6.c
+++ b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -452,7 +452,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
                        return ret;
                }
 
-               dw_pcie_ep_init_notify(&pci->ep);
+               pci_epc_init_notify(pci->ep.epc);
 
                break;
        default:

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 705533e789f35ecd5f292381d4b119c6b8ba8cc9..bdbdd099405a15da95fdd5a1aef8e75d4e120e99 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -15,18 +15,6 @@
 #include <linux/pci-epc.h>
 #include <linux/pci-epf.h>
 
-/**
- * dw_pcie_ep_init_notify - Notify EPF drivers about EPC initialization complete
- * @ep: DWC EP device
- */
-void dw_pcie_ep_init_notify(struct dw_pcie_ep *ep)
-{
-       struct pci_epc *epc = ep->epc;
-
-       pci_epc_init_notify(epc);
-}
-EXPORT_SYMBOL_GPL(dw_pcie_ep_init_notify);
-
 /**
  * dw_pcie_ep_get_func_from_ep - Get the struct dw_pcie_ep_func corresponding to
  *                              the endpoint function

diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
index 8490c5d6ff9f92aa084e5fb497124df296769341..771b9d9be077bf887ec7d3f86f4b46fe7f03cf84 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-plat.c
+++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
@@ -154,7 +154,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)
                        dw_pcie_ep_deinit(&pci->ep);
                }
 
-               dw_pcie_ep_init_notify(&pci->ep);
+               pci_epc_init_notify(pci->ep.epc);
 
                break;
        default:

diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 5822eb09ead7896218afb79aaf7973e27fa875e0..069c72f318a74dde4af3920bb8429dd4a9649abd 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -684,7 +684,6 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep);
 void dw_pcie_ep_linkdown(struct dw_pcie_ep *ep);
 int dw_pcie_ep_init(struct dw_pcie_ep *ep);
 int dw_pcie_ep_init_registers(struct dw_pcie_ep *ep);
-void dw_pcie_ep_init_notify(struct dw_pcie_ep *ep);
 void dw_pcie_ep_deinit(struct dw_pcie_ep *ep);
 void dw_pcie_ep_cleanup(struct dw_pcie_ep *ep);
 int dw_pcie_ep_raise_intx_irq(struct dw_pcie_ep *ep, u8 func_no);
@@ -716,10 +715,6 @@ static inline int dw_pcie_ep_init_registers(struct dw_pcie_ep *ep)
        return 0;
 }
 
-static inline void dw_pcie_ep_init_notify(struct dw_pcie_ep *ep)
-{
-}
-
 static inline void dw_pcie_ep_deinit(struct dw_pcie_ep *ep)
 {
 }

diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
index 98bbc83182b45ce5f23446f58c8cd0a9e05a5847..278205db60a2ed57a92b04ad8858bdca50b7197b 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-keembay.c
+++ b/drivers/pci/controller/dwc/pcie-keembay.c
@@ -442,7 +442,7 @@ static int keembay_pcie_probe(struct platform_device *pdev)
                        return ret;
                }
 
-               dw_pcie_ep_init_notify(&pci->ep);
+               pci_epc_init_notify(pci->ep.epc);
 
                break;
        default:

diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
index b6a5010cc1a7995cd14ab773e82c52d59a6b9f4f..2324e56c9bfc48cbfa8852eb522d37dd9b5e57c2 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
+++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
@@ -482,7 +482,7 @@ static int qcom_pcie_perst_deassert(struct dw_pcie *pci)
        val &= ~PARF_MSTR_AXI_CLK_EN;
        writel_relaxed(val, pcie_ep->parf + PARF_MHI_CLOCK_RESET_CTRL);
 
-       dw_pcie_ep_init_notify(&pcie_ep->pci.ep);
+       pci_epc_init_notify(pcie_ep->pci.ep.epc);
 
        /* Enable LTSSM */
        val = readl_relaxed(pcie_ep->parf + PARF_LTSSM);

diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
index cfeccc2f9ee1d15bf664a9585cfafdd8a894d41f..237a6a8818de201188bfa46166a79752e6adc7bd 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
+++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@ -437,7 +437,7 @@ static int rcar_gen4_add_dw_pcie_ep(struct rcar_gen4_pcie *rcar)
                rcar_gen4_pcie_ep_deinit(rcar);
        }
 
-       dw_pcie_ep_init_notify(ep);
+       pci_epc_init_notify(ep->epc);
 
        return ret;
 }

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index 4b28f8beedfedd1af60cb1b441eddca401d3cf2b..4ca7404246a32b51124f8fe1e4a9192d7fb9fa01 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1904,7 +1904,7 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie)
                goto fail_init_complete;
        }
 
-       dw_pcie_ep_init_notify(ep);
+       pci_epc_init_notify(ep->epc);
 
        /* Program the private control to allow sending LTR upstream */
        if (pcie->of_data->has_ltr_req_fix) {

diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
index a2b844268e2857d6bfdd50783d6ad31c224bc601..d6e73811216e2e827dce7bfd2bd43ab1ddc781a7 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
@@ -410,7 +410,7 @@ static int uniphier_pcie_ep_probe(struct platform_device *pdev)
                return ret;
        }
 
-       dw_pcie_ep_init_notify(&priv->pci.ep);
+       pci_epc_init_notify(priv->pci.ep.epc);
 
        return 0;
 }