Skip to content

Commit 756dcb5

Browse files
shimodaykwilczynski
authored andcommitted
PCI: dwc: Rename .ep_init to .init in struct dw_pcie_ep_ops
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 <[email protected]> Suggested-by: Manivannan Sadhasivam <[email protected]> Link: https://lore.kernel.org/linux-pci/[email protected] Signed-off-by: Yoshihiro Shimoda <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> Reviewed-by: Manivannan Sadhasivam <[email protected]> Reviewed-by: Serge Semin <[email protected]> Reviewed-by: Srikanth Thokala <[email protected]> Acked-by: Jesper Nilsson <[email protected]> Acked-by: Kunihiko Hayashi <[email protected]>
1 parent aea370b commit 756dcb5

12 files changed

+13
-13
lines changed

drivers/pci/controller/dwc/pci-dra7xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ dra7xx_pcie_get_features(struct dw_pcie_ep *ep)
436436
}
437437

438438
static const struct dw_pcie_ep_ops pcie_ep_ops = {
439-
.ep_init = dra7xx_pcie_ep_init,
439+
.init = dra7xx_pcie_ep_init,
440440
.raise_irq = dra7xx_pcie_raise_irq,
441441
.get_features = dra7xx_pcie_get_features,
442442
};

drivers/pci/controller/dwc/pci-imx6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ imx6_pcie_ep_get_features(struct dw_pcie_ep *ep)
10931093
}
10941094

10951095
static const struct dw_pcie_ep_ops pcie_ep_ops = {
1096-
.ep_init = imx6_pcie_ep_init,
1096+
.init = imx6_pcie_ep_init,
10971097
.raise_irq = imx6_pcie_ep_raise_irq,
10981098
.get_features = imx6_pcie_ep_get_features,
10991099
};

drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ ks_pcie_am654_get_features(struct dw_pcie_ep *ep)
944944
}
945945

946946
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,
948948
.raise_irq = ks_pcie_am654_raise_irq,
949949
.get_features = &ks_pcie_am654_get_features,
950950
};

drivers/pci/controller/dwc/pci-layerscape-ep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static unsigned int ls_pcie_ep_func_conf_select(struct dw_pcie_ep *ep,
195195
}
196196

197197
static const struct dw_pcie_ep_ops ls_pcie_ep_ops = {
198-
.ep_init = ls_pcie_ep_init,
198+
.init = ls_pcie_ep_init,
199199
.raise_irq = ls_pcie_ep_raise_irq,
200200
.get_features = ls_pcie_ep_get_features,
201201
.func_conf_select = ls_pcie_ep_func_conf_select,

drivers/pci/controller/dwc/pcie-artpec6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
370370
}
371371

372372
static const struct dw_pcie_ep_ops pcie_ep_ops = {
373-
.ep_init = artpec6_pcie_ep_init,
373+
.init = artpec6_pcie_ep_init,
374374
.raise_irq = artpec6_pcie_raise_irq,
375375
};
376376

drivers/pci/controller/dwc/pcie-designware-ep.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,8 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
795795
list_add_tail(&ep_func->list, &ep->func_list);
796796
}
797797

798-
if (ep->ops->ep_init)
799-
ep->ops->ep_init(ep);
798+
if (ep->ops->init)
799+
ep->ops->init(ep);
800800

801801
ret = pci_epc_mem_init(epc, ep->phys_base, ep->addr_size,
802802
ep->page_size);

drivers/pci/controller/dwc/pcie-designware-plat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ dw_plat_pcie_get_features(struct dw_pcie_ep *ep)
7474
}
7575

7676
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,
7878
.raise_irq = dw_plat_pcie_ep_raise_irq,
7979
.get_features = dw_plat_pcie_get_features,
8080
};

drivers/pci/controller/dwc/pcie-designware.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ struct dw_pcie_rp {
332332

333333
struct dw_pcie_ep_ops {
334334
void (*pre_init)(struct dw_pcie_ep *ep);
335-
void (*ep_init)(struct dw_pcie_ep *ep);
335+
void (*init)(struct dw_pcie_ep *ep);
336336
void (*deinit)(struct dw_pcie_ep *ep);
337337
int (*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
338338
enum pci_epc_irq_type type, u16 interrupt_num);

drivers/pci/controller/dwc/pcie-keembay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ keembay_pcie_get_features(struct dw_pcie_ep *ep)
325325
}
326326

327327
static const struct dw_pcie_ep_ops keembay_pcie_ep_ops = {
328-
.ep_init = keembay_pcie_ep_init,
328+
.init = keembay_pcie_ep_init,
329329
.raise_irq = keembay_pcie_ep_raise_irq,
330330
.get_features = keembay_pcie_get_features,
331331
};

drivers/pci/controller/dwc/pcie-qcom-ep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static void qcom_pcie_ep_init(struct dw_pcie_ep *ep)
796796
}
797797

798798
static const struct dw_pcie_ep_ops pci_ep_ops = {
799-
.ep_init = qcom_pcie_ep_init,
799+
.init = qcom_pcie_ep_init,
800800
.raise_irq = qcom_pcie_ep_raise_irq,
801801
.get_features = qcom_pcie_epc_get_features,
802802
};

0 commit comments

Comments
 (0)