PCI: dwc: Rename .ep_init to .init in struct dw_pcie_ep_ops

shimoday · kwilczynski · commit 756dcb5a820a · 2024-01-06T07:51:08.000Z
Since the name of the dw_pcie_ep_ops struct makes it obvious that it's for the PCIe Endpoint, rename the struct member .ep_init to .init. [kwilczynski: commit log] Suggested-by: Serge Semin <fancer.lancer@gmail.com> Suggested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/linux-pci/20231220053829.1921187-3-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Serge Semin <fancer.lancer@gmail.com> Reviewed-by: Srikanth Thokala <srikanth.thokala@intel.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -436,7 +436,7 @@ dra7xx_pcie_get_features(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops pcie_ep_ops = {
-	.ep_init = dra7xx_pcie_ep_init,
+	.init = dra7xx_pcie_ep_init,
 	.raise_irq = dra7xx_pcie_raise_irq,
 	.get_features = dra7xx_pcie_get_features,
 };
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1093,7 +1093,7 @@ imx6_pcie_ep_get_features(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops pcie_ep_ops = {
-	.ep_init = imx6_pcie_ep_init,
+	.init = imx6_pcie_ep_init,
 	.raise_irq = imx6_pcie_ep_raise_irq,
 	.get_features = imx6_pcie_ep_get_features,
 };
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
@@ -944,7 +944,7 @@ ks_pcie_am654_get_features(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops ks_pcie_am654_ep_ops = {
-	.ep_init = ks_pcie_am654_ep_init,
+	.init = ks_pcie_am654_ep_init,
 	.raise_irq = ks_pcie_am654_raise_irq,
 	.get_features = &ks_pcie_am654_get_features,
 };
diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
@@ -195,7 +195,7 @@ static unsigned int ls_pcie_ep_func_conf_select(struct dw_pcie_ep *ep,
 }
 
 static const struct dw_pcie_ep_ops ls_pcie_ep_ops = {
-	.ep_init = ls_pcie_ep_init,
+	.init = ls_pcie_ep_init,
 	.raise_irq = ls_pcie_ep_raise_irq,
 	.get_features = ls_pcie_ep_get_features,
 	.func_conf_select = ls_pcie_ep_func_conf_select,
diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -370,7 +370,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
 }
 
 static const struct dw_pcie_ep_ops pcie_ep_ops = {
-	.ep_init = artpec6_pcie_ep_init,
+	.init = artpec6_pcie_ep_init,
 	.raise_irq = artpec6_pcie_raise_irq,
 };
 
diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -795,8 +795,8 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
 		list_add_tail(&ep_func->list, &ep->func_list);
 	}
 
-	if (ep->ops->ep_init)
-		ep->ops->ep_init(ep);
+	if (ep->ops->init)
+		ep->ops->init(ep);
 
 	ret = pci_epc_mem_init(epc, ep->phys_base, ep->addr_size,
 			       ep->page_size);
diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
@@ -74,7 +74,7 @@ dw_plat_pcie_get_features(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops pcie_ep_ops = {
-	.ep_init = dw_plat_pcie_ep_init,
+	.init = dw_plat_pcie_ep_init,
 	.raise_irq = dw_plat_pcie_ep_raise_irq,
 	.get_features = dw_plat_pcie_get_features,
 };
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
@@ -332,7 +332,7 @@ struct dw_pcie_rp {
 
 struct dw_pcie_ep_ops {
 	void	(*pre_init)(struct dw_pcie_ep *ep);
-	void	(*ep_init)(struct dw_pcie_ep *ep);
+	void	(*init)(struct dw_pcie_ep *ep);
 	void	(*deinit)(struct dw_pcie_ep *ep);
 	int	(*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
 			     enum pci_epc_irq_type type, u16 interrupt_num);
diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
@@ -325,7 +325,7 @@ keembay_pcie_get_features(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops keembay_pcie_ep_ops = {
-	.ep_init	= keembay_pcie_ep_init,
+	.init	= keembay_pcie_ep_init,
 	.raise_irq	= keembay_pcie_ep_raise_irq,
 	.get_features	= keembay_pcie_get_features,
 };
diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
@@ -796,7 +796,7 @@ static void qcom_pcie_ep_init(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops pci_ep_ops = {
-	.ep_init = qcom_pcie_ep_init,
+	.init = qcom_pcie_ep_init,
 	.raise_irq = qcom_pcie_ep_raise_irq,
 	.get_features = qcom_pcie_epc_get_features,
 };
diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@ -408,7 +408,7 @@ static unsigned int rcar_gen4_pcie_ep_get_dbi2_offset(struct dw_pcie_ep *ep,
 
 static const struct dw_pcie_ep_ops pcie_ep_ops = {
 	.pre_init = rcar_gen4_pcie_ep_pre_init,
-	.ep_init = rcar_gen4_pcie_ep_init,
+	.init = rcar_gen4_pcie_ep_init,
 	.deinit = rcar_gen4_pcie_ep_deinit,
 	.raise_irq = rcar_gen4_pcie_ep_raise_irq,
 	.get_features = rcar_gen4_pcie_ep_get_features,
diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
@@ -284,7 +284,7 @@ uniphier_pcie_get_features(struct dw_pcie_ep *ep)
 }
 
 static const struct dw_pcie_ep_ops uniphier_pcie_ep_ops = {
-	.ep_init = uniphier_pcie_ep_init,
+	.init = uniphier_pcie_ep_init,
 	.raise_irq = uniphier_pcie_ep_raise_irq,
 	.get_features = uniphier_pcie_get_features,
 };

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ dra7xx_pcie_get_features(struct dw_pcie_ep *ep)`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`static const struct dw_pcie_ep_ops pcie_ep_ops = {`
`439`		`- .ep_init = dra7xx_pcie_ep_init,`
	`439`	`+ .init = dra7xx_pcie_ep_init,`
`440`	`440`	`.raise_irq = dra7xx_pcie_raise_irq,`
`441`	`441`	`.get_features = dra7xx_pcie_get_features,`
`442`	`442`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,7 @@ imx6_pcie_ep_get_features(struct dw_pcie_ep *ep)`
`1093`	`1093`	`}`
`1094`	`1094`
`1095`	`1095`	`static const struct dw_pcie_ep_ops pcie_ep_ops = {`
`1096`		`- .ep_init = imx6_pcie_ep_init,`
	`1096`	`+ .init = imx6_pcie_ep_init,`
`1097`	`1097`	`.raise_irq = imx6_pcie_ep_raise_irq,`
`1098`	`1098`	`.get_features = imx6_pcie_ep_get_features,`
`1099`	`1099`	`};`
Original file line number	Diff line number	Diff line change
`@@ -944,7 +944,7 @@ ks_pcie_am654_get_features(struct dw_pcie_ep *ep)`
`944`	`944`	`}`
`945`	`945`
`946`	`946`	`static const struct dw_pcie_ep_ops ks_pcie_am654_ep_ops = {`
`947`		`- .ep_init = ks_pcie_am654_ep_init,`
	`947`	`+ .init = ks_pcie_am654_ep_init,`
`948`	`948`	`.raise_irq = ks_pcie_am654_raise_irq,`
`949`	`949`	`.get_features = &ks_pcie_am654_get_features,`
`950`	`950`	`};`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ static unsigned int ls_pcie_ep_func_conf_select(struct dw_pcie_ep *ep,`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`static const struct dw_pcie_ep_ops ls_pcie_ep_ops = {`
`198`		`- .ep_init = ls_pcie_ep_init,`
	`198`	`+ .init = ls_pcie_ep_init,`
`199`	`199`	`.raise_irq = ls_pcie_ep_raise_irq,`
`200`	`200`	`.get_features = ls_pcie_ep_get_features,`
`201`	`201`	`.func_conf_select = ls_pcie_ep_func_conf_select,`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`static const struct dw_pcie_ep_ops pcie_ep_ops = {`
`373`		`- .ep_init = artpec6_pcie_ep_init,`
	`373`	`+ .init = artpec6_pcie_ep_init,`
`374`	`374`	`.raise_irq = artpec6_pcie_raise_irq,`
`375`	`375`	`};`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -795,8 +795,8 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)`
`795`	`795`	`list_add_tail(&ep_func->list, &ep->func_list);`
`796`	`796`	`}`
`797`	`797`
`798`		`- if (ep->ops->ep_init)`
`799`		`- ep->ops->ep_init(ep);`
	`798`	`+ if (ep->ops->init)`
	`799`	`+ ep->ops->init(ep);`
`800`	`800`
`801`	`801`	`ret = pci_epc_mem_init(epc, ep->phys_base, ep->addr_size,`
`802`	`802`	`ep->page_size);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ dw_plat_pcie_get_features(struct dw_pcie_ep *ep)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`static const struct dw_pcie_ep_ops pcie_ep_ops = {`
`77`		`- .ep_init = dw_plat_pcie_ep_init,`
	`77`	`+ .init = dw_plat_pcie_ep_init,`
`78`	`78`	`.raise_irq = dw_plat_pcie_ep_raise_irq,`
`79`	`79`	`.get_features = dw_plat_pcie_get_features,`
`80`	`80`	`};`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ keembay_pcie_get_features(struct dw_pcie_ep *ep)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`static const struct dw_pcie_ep_ops keembay_pcie_ep_ops = {`
`328`		`- .ep_init = keembay_pcie_ep_init,`
	`328`	`+ .init = keembay_pcie_ep_init,`
`329`	`329`	`.raise_irq = keembay_pcie_ep_raise_irq,`
`330`	`330`	`.get_features = keembay_pcie_get_features,`
`331`	`331`	`};`
Original file line number	Diff line number	Diff line change
`@@ -796,7 +796,7 @@ static void qcom_pcie_ep_init(struct dw_pcie_ep *ep)`
`796`	`796`	`}`
`797`	`797`
`798`	`798`	`static const struct dw_pcie_ep_ops pci_ep_ops = {`
`799`		`- .ep_init = qcom_pcie_ep_init,`
	`799`	`+ .init = qcom_pcie_ep_init,`
`800`	`800`	`.raise_irq = qcom_pcie_ep_raise_irq,`
`801`	`801`	`.get_features = qcom_pcie_epc_get_features,`
`802`	`802`	`};`