Skip to content

Commit aea370b

Browse files
shimodaykwilczynski
authored andcommitted
PCI: dwc: Drop host prefix from struct dw_pcie_host_ops members
Since the name of the dw_pcie_host_ops struct makes it obvious that it's for the PCIe Host, drop the host prefix from the struct members. [kwilczynski: commit log] Suggested-by: Serge Semin <[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: Thomas Petazzoni <[email protected]> Acked-by: Heiko Stuebner <[email protected]> Acked-by: Jesper Nilsson <[email protected]> Acked-by: Kunihiko Hayashi <[email protected]> Acked-by: Lei Chuanhua <[email protected]> Acked-by: Nobuhiro Iwamatsu <[email protected]>
1 parent 2217fff commit aea370b

23 files changed

+47
-47
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static int dra7xx_pcie_init_irq_domain(struct dw_pcie_rp *pp)
371371
}
372372

373373
static const struct dw_pcie_host_ops dra7xx_pcie_host_ops = {
374-
.host_init = dra7xx_pcie_host_init,
374+
.init = dra7xx_pcie_host_init,
375375
};
376376

377377
static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static int exynos_pcie_host_init(struct dw_pcie_rp *pp)
268268
}
269269

270270
static const struct dw_pcie_host_ops exynos_pcie_host_ops = {
271-
.host_init = exynos_pcie_host_init,
271+
.init = exynos_pcie_host_init,
272272
};
273273

274274
static int exynos_add_pcie_port(struct exynos_pcie *ep,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,8 +1039,8 @@ static void imx6_pcie_host_exit(struct dw_pcie_rp *pp)
10391039
}
10401040

10411041
static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
1042-
.host_init = imx6_pcie_host_init,
1043-
.host_deinit = imx6_pcie_host_exit,
1042+
.init = imx6_pcie_host_init,
1043+
.deinit = imx6_pcie_host_exit,
10441044
};
10451045

10461046
static const struct dw_pcie_ops dw_pcie_ops = {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,12 +838,12 @@ static int __init ks_pcie_host_init(struct dw_pcie_rp *pp)
838838
}
839839

840840
static const struct dw_pcie_host_ops ks_pcie_host_ops = {
841-
.host_init = ks_pcie_host_init,
842-
.msi_host_init = ks_pcie_msi_host_init,
841+
.init = ks_pcie_host_init,
842+
.msi_init = ks_pcie_msi_host_init,
843843
};
844844

845845
static const struct dw_pcie_host_ops ks_pcie_am654_host_ops = {
846-
.host_init = ks_pcie_host_init,
846+
.init = ks_pcie_host_init,
847847
};
848848

849849
static irqreturn_t ks_pcie_err_irq_handler(int irq, void *priv)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static int ls_pcie_host_init(struct dw_pcie_rp *pp)
169169
}
170170

171171
static const struct dw_pcie_host_ops ls_pcie_host_ops = {
172-
.host_init = ls_pcie_host_init,
172+
.init = ls_pcie_host_init,
173173
.pme_turn_off = ls_pcie_send_turnoff_msg,
174174
};
175175

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp)
389389
}
390390

391391
static const struct dw_pcie_host_ops meson_pcie_host_ops = {
392-
.host_init = meson_pcie_host_init,
392+
.init = meson_pcie_host_init,
393393
};
394394

395395
static const struct dw_pcie_ops dw_pcie_ops = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static int al_pcie_host_init(struct dw_pcie_rp *pp)
311311
}
312312

313313
static const struct dw_pcie_host_ops al_pcie_host_ops = {
314-
.host_init = al_pcie_host_init,
314+
.init = al_pcie_host_init,
315315
};
316316

317317
static int al_pcie_probe(struct platform_device *pdev)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg)
225225
}
226226

227227
static const struct dw_pcie_host_ops armada8k_pcie_host_ops = {
228-
.host_init = armada8k_pcie_host_init,
228+
.init = armada8k_pcie_host_init,
229229
};
230230

231231
static int armada8k_add_pcie_port(struct armada8k_pcie *pcie,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static int artpec6_pcie_host_init(struct dw_pcie_rp *pp)
333333
}
334334

335335
static const struct dw_pcie_host_ops artpec6_pcie_host_ops = {
336-
.host_init = artpec6_pcie_host_init,
336+
.init = artpec6_pcie_host_init,
337337
};
338338

339339
static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ static void bt1_pcie_host_deinit(struct dw_pcie_rp *pp)
559559
}
560560

561561
static const struct dw_pcie_host_ops bt1_pcie_host_ops = {
562-
.host_init = bt1_pcie_host_init,
563-
.host_deinit = bt1_pcie_host_deinit,
562+
.init = bt1_pcie_host_init,
563+
.deinit = bt1_pcie_host_deinit,
564564
};
565565

566566
static struct bt1_pcie *bt1_pcie_create_data(struct platform_device *pdev)

0 commit comments

Comments
 (0)