On Thu, Jun 06, 2024 at 12:56:34PM +0530, Manivannan Sadhasivam wrote:
> Currently dw_pcie_ep_init_notify() wrapper just calls pci_epc_init_notify()
> directly. So this wrapper provides no benefit to the glue drivers.
>
> So let's remove it and call pci_epc_init_notify() directly from glue
> drivers.
>
> Suggested-by: Bjorn Helgaas <helg...@kernel.org>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasi...@linaro.org>
Reviewed-by: Frank Li <frank...@nxp.com>
> ---
> drivers/pci/controller/dwc/pci-dra7xx.c | 2 +-
> drivers/pci/controller/dwc/pci-imx6.c | 2 +-
> drivers/pci/controller/dwc/pci-keystone.c | 2 +-
> drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +-
> drivers/pci/controller/dwc/pcie-artpec6.c | 2 +-
> drivers/pci/controller/dwc/pcie-designware-ep.c | 12 ------------
> drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +-
> drivers/pci/controller/dwc/pcie-designware.h | 5 -----
> drivers/pci/controller/dwc/pcie-keembay.c | 2 +-
> drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +-
> drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 +-
> drivers/pci/controller/dwc/pcie-tegra194.c | 2 +-
> drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2 +-
> 13 files changed, 11 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c
> b/drivers/pci/controller/dwc/pci-dra7xx.c
> index d2d17d37d3e0..e491d0ff3962 100644
> --- 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 917c69edee1d..a876b8e6e741 100644
> --- 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 d3a7d14ee685..ca1054f5c79a 100644
> --- 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 7dde6d5fa4d8..35bb481564c7 100644
> --- 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 a4630b92489b..dc8dd7f27b78 100644
> --- 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 47391d7d3a73..2e69f81baf99 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
> @@ -27,18 +27,6 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)
> }
> EXPORT_SYMBOL_GPL(dw_pcie_ep_linkup);
>
> -/**
> - * 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 8490c5d6ff9f..771b9d9be077 100644
> --- 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 f8e5431a207b..49ae845a3662 100644
> --- a/drivers/pci/controller/dwc/pcie-designware.h
> +++ b/drivers/pci/controller/dwc/pcie-designware.h
> @@ -670,7 +670,6 @@ static inline void __iomem
> *dw_pcie_own_conf_map_bus(struct pci_bus *bus,
> void dw_pcie_ep_linkup(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);
> @@ -698,10 +697,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 98bbc83182b4..278205db60a2 100644
> --- 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 1ecf602c225a..4d2d7457dcb3 100644
> --- 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 cfeccc2f9ee1..237a6a8818de 100644
> --- 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 93f5433c5c55..432ed9d9a463 100644
> --- a/drivers/pci/controller/dwc/pcie-tegra194.c
> +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
> @@ -1903,7 +1903,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 a2b844268e28..d6e73811216e 100644
> --- 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;
> }
>
> --
> 2.25.1
>
