PCI: dwc: ep: Remove dw_pcie_ep_init_notify() wrapper

Mani-Sadhasivam · bjorn-helgaas · commit 245b9ebf7b8e · 2024-07-09T18:20:21.000-05:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ static int dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx,`
`474`	`474`	`return ret;`
`475`	`475`	`}`
`476`	`476`
`477`		`- dw_pcie_ep_init_notify(ep);`
	`477`	`+ pci_epc_init_notify(ep->epc);`
`478`	`478`
`479`	`479`	`return 0;`
`480`	`480`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1131,7 +1131,7 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie,`
`1131`	`1131`	`return ret;`
`1132`	`1132`	`}`
`1133`	`1133`
`1134`		`- dw_pcie_ep_init_notify(ep);`
	`1134`	`+ pci_epc_init_notify(ep->epc);`
`1135`	`1135`
`1136`	`1136`	`/* Start LTSSM. */`
`1137`	`1137`	`imx6_pcie_ltssm_enable(dev);`
Original file line number	Diff line number	Diff line change
`@@ -1293,7 +1293,7 @@ static int ks_pcie_probe(struct platform_device *pdev)`
`1293`	`1293`	`goto err_ep_init;`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`		`- dw_pcie_ep_init_notify(&pci->ep);`
	`1296`	`+ pci_epc_init_notify(pci->ep.epc);`
`1297`	`1297`
`1298`	`1298`	`break;`
`1299`	`1299`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)`
`286`	`286`	`return ret;`
`287`	`287`	`}`
`288`	`288`
`289`		`- dw_pcie_ep_init_notify(&pci->ep);`
	`289`	`+ pci_epc_init_notify(pci->ep.epc);`
`290`	`290`
`291`	`291`	`return ls_pcie_ep_interrupt_init(pcie, pdev);`
`292`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev)`
`452`	`452`	`return ret;`
`453`	`453`	`}`
`454`	`454`
`455`		`- dw_pcie_ep_init_notify(&pci->ep);`
	`455`	`+ pci_epc_init_notify(pci->ep.epc);`
`456`	`456`
`457`	`457`	`break;`
`458`	`458`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)`
`154`	`154`	`dw_pcie_ep_deinit(&pci->ep);`
`155`	`155`	`}`
`156`	`156`
`157`		`- dw_pcie_ep_init_notify(&pci->ep);`
	`157`	`+ pci_epc_init_notify(pci->ep.epc);`
`158`	`158`
`159`	`159`	`break;`
`160`	`160`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,6 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep);`
`684`	`684`	`void dw_pcie_ep_linkdown(struct dw_pcie_ep *ep);`
`685`	`685`	`int dw_pcie_ep_init(struct dw_pcie_ep *ep);`
`686`	`686`	`int dw_pcie_ep_init_registers(struct dw_pcie_ep *ep);`
`687`		`-void dw_pcie_ep_init_notify(struct dw_pcie_ep *ep);`
`688`	`687`	`void dw_pcie_ep_deinit(struct dw_pcie_ep *ep);`
`689`	`688`	`void dw_pcie_ep_cleanup(struct dw_pcie_ep *ep);`
`690`	`689`	`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)`
`716`	`715`	`return 0;`
`717`	`716`	`}`
`718`	`717`
`719`		`-static inline void dw_pcie_ep_init_notify(struct dw_pcie_ep *ep)`
`720`		`-{`
`721`		`-}`
`722`		`-`
`723`	`718`	`static inline void dw_pcie_ep_deinit(struct dw_pcie_ep *ep)`
`724`	`719`	`{`
`725`	`720`	`}`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ static int keembay_pcie_probe(struct platform_device *pdev)`
`442`	`442`	`return ret;`
`443`	`443`	`}`
`444`	`444`
`445`		`- dw_pcie_ep_init_notify(&pci->ep);`
	`445`	`+ pci_epc_init_notify(pci->ep.epc);`
`446`	`446`
`447`	`447`	`break;`
`448`	`448`	`default:`