summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-aardvark.c2
-rw-r--r--drivers/pci/pci-emul-uclass.c6
-rw-r--r--drivers/pci/pci-rcar-gen2.c2
-rw-r--r--drivers/pci/pci-rcar-gen3.c2
-rw-r--r--drivers/pci/pci-uclass.c4
-rw-r--r--drivers/pci/pci_mpc85xx.c2
-rw-r--r--drivers/pci/pci_mvebu.c2
-rw-r--r--drivers/pci/pci_octeontx.c2
-rw-r--r--drivers/pci/pci_sandbox.c4
-rw-r--r--drivers/pci/pci_tegra.c2
-rw-r--r--drivers/pci/pcie_brcmstb.c2
-rw-r--r--drivers/pci/pcie_dw_mvebu.c2
-rw-r--r--drivers/pci/pcie_dw_ti.c2
-rw-r--r--drivers/pci/pcie_ecam_generic.c2
-rw-r--r--drivers/pci/pcie_fsl.c2
-rw-r--r--drivers/pci/pcie_imx.c2
-rw-r--r--drivers/pci/pcie_intel_fpga.c2
-rw-r--r--drivers/pci/pcie_iproc.c2
-rw-r--r--drivers/pci/pcie_layerscape_ep.c2
-rw-r--r--drivers/pci/pcie_layerscape_gen4.c2
-rw-r--r--drivers/pci/pcie_layerscape_rc.c2
-rw-r--r--drivers/pci/pcie_mediatek.c4
-rw-r--r--drivers/pci/pcie_phytium.c2
-rw-r--r--drivers/pci/pcie_rockchip.c2
-rw-r--r--drivers/pci/pcie_xilinx.c2
25 files changed, 30 insertions, 30 deletions
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index babb84ca93..f1653ba859 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -701,5 +701,5 @@ U_BOOT_DRIVER(pcie_advk) = {
.probe = pcie_advk_probe,
.remove = pcie_advk_remove,
.flags = DM_FLAG_OS_PREPARE,
- .priv_auto_alloc_size = sizeof(struct pcie_advk),
+ .priv_auto = sizeof(struct pcie_advk),
};
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index a52064341e..3ca9a1567c 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -105,14 +105,14 @@ UCLASS_DRIVER(pci_emul) = {
.name = "pci_emul",
.post_probe = sandbox_pci_emul_post_probe,
.pre_remove = sandbox_pci_emul_pre_remove,
- .priv_auto_alloc_size = sizeof(struct sandbox_pci_emul_priv),
- .per_device_auto_alloc_size = sizeof(struct pci_emul_uc_priv),
+ .priv_auto = sizeof(struct sandbox_pci_emul_priv),
+ .per_device_auto = sizeof(struct pci_emul_uc_priv),
};
/*
* This uclass is a child of the pci bus. Its platdata is not defined here so
* is defined by its parent, UCLASS_PCI, which uses struct pci_child_platdata.
- * See per_child_platdata_auto_alloc_size in UCLASS_DRIVER(pci).
+ * See per_child_platdata_auto in UCLASS_DRIVER(pci).
*/
UCLASS_DRIVER(pci_emul_parent) = {
.id = UCLASS_PCI_EMUL_PARENT,
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index e76abc1f84..cff1a41f02 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -260,5 +260,5 @@ U_BOOT_DRIVER(rcar_gen2_pci) = {
.ops = &rcar_gen2_pci_ops,
.probe = rcar_gen2_pci_probe,
.ofdata_to_platdata = rcar_gen2_pci_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct rcar_gen2_pci_priv),
+ .priv_auto = sizeof(struct rcar_gen2_pci_priv),
};
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 1f51854ccc..f01fcf6106 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -400,5 +400,5 @@ U_BOOT_DRIVER(rcar_gen3_pcie) = {
.ops = &rcar_gen3_pcie_ops,
.probe = rcar_gen3_pcie_probe,
.ofdata_to_platdata = rcar_gen3_pcie_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct rcar_gen3_pcie_priv),
+ .platdata_auto = sizeof(struct rcar_gen3_pcie_priv),
};
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 9230cfe88b..6093072814 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1796,8 +1796,8 @@ UCLASS_DRIVER(pci) = {
.pre_probe = pci_uclass_pre_probe,
.post_probe = pci_uclass_post_probe,
.child_post_bind = pci_uclass_child_post_bind,
- .per_device_auto_alloc_size = sizeof(struct pci_controller),
- .per_child_platdata_auto_alloc_size =
+ .per_device_auto = sizeof(struct pci_controller),
+ .per_child_platdata_auto =
sizeof(struct pci_child_platdata),
};
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index 6576f53f52..9cb95da175 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -155,5 +155,5 @@ U_BOOT_DRIVER(mpc85xx_pci) = {
.probe = mpc85xx_pci_dm_probe,
.remove = mpc85xx_pci_dm_remove,
.ofdata_to_platdata = mpc85xx_pci_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct mpc85xx_pci_priv),
+ .priv_auto = sizeof(struct mpc85xx_pci_priv),
};
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index ba1c139dbc..207ae33624 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -471,7 +471,7 @@ static struct driver pcie_mvebu_drv = {
.ops = &mvebu_pcie_ops,
.probe = mvebu_pcie_probe,
.ofdata_to_platdata = mvebu_pcie_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct mvebu_pcie),
+ .platdata_auto = sizeof(struct mvebu_pcie),
};
/*
diff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c
index 30537543a0..d211d22226 100644
--- a/drivers/pci/pci_octeontx.c
+++ b/drivers/pci/pci_octeontx.c
@@ -359,6 +359,6 @@ U_BOOT_DRIVER(pci_octeontx) = {
.ops = &pci_octeontx_ops,
.ofdata_to_platdata = pci_octeontx_ofdata_to_platdata,
.probe = pci_octeontx_probe,
- .priv_auto_alloc_size = sizeof(struct octeontx_pci),
+ .priv_auto = sizeof(struct octeontx_pci),
.flags = DM_FLAG_PRE_RELOC,
};
diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c
index 8745f286bd..d318b33d2b 100644
--- a/drivers/pci/pci_sandbox.c
+++ b/drivers/pci/pci_sandbox.c
@@ -128,10 +128,10 @@ U_BOOT_DRIVER(pci_sandbox) = {
.of_match = sandbox_pci_ids,
.ops = &sandbox_pci_ops,
.probe = sandbox_pci_probe,
- .priv_auto_alloc_size = sizeof(struct sandbox_pci_priv),
+ .priv_auto = sizeof(struct sandbox_pci_priv),
/* Attach an emulator if we can */
.child_post_bind = dm_scan_fdt_dev,
- .per_child_platdata_auto_alloc_size =
+ .per_child_platdata_auto =
sizeof(struct pci_child_platdata),
};
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 82f5c59d91..386b25a77a 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -1199,5 +1199,5 @@ U_BOOT_DRIVER(pci_tegra) = {
.ops = &pci_tegra_ops,
.ofdata_to_platdata = pci_tegra_ofdata_to_platdata,
.probe = pci_tegra_probe,
- .priv_auto_alloc_size = sizeof(struct tegra_pcie),
+ .priv_auto = sizeof(struct tegra_pcie),
};
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index dade79e9c8..8f084df488 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -619,5 +619,5 @@ U_BOOT_DRIVER(pcie_brcm_base) = {
.of_match = brcm_pcie_ids,
.probe = brcm_pcie_probe,
.ofdata_to_platdata = brcm_pcie_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct brcm_pcie),
+ .priv_auto = sizeof(struct brcm_pcie),
};
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index c773f8d28d..def5fe2ec1 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -580,5 +580,5 @@ U_BOOT_DRIVER(pcie_dw_mvebu) = {
.ops = &pcie_dw_mvebu_ops,
.ofdata_to_platdata = pcie_dw_mvebu_ofdata_to_platdata,
.probe = pcie_dw_mvebu_probe,
- .priv_auto_alloc_size = sizeof(struct pcie_dw_mvebu),
+ .priv_auto = sizeof(struct pcie_dw_mvebu),
};
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 742dd93633..a4867dc0a2 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -726,5 +726,5 @@ U_BOOT_DRIVER(pcie_dw_ti) = {
.ops = &pcie_dw_ti_ops,
.ofdata_to_platdata = pcie_dw_ti_ofdata_to_platdata,
.probe = pcie_dw_ti_probe,
- .priv_auto_alloc_size = sizeof(struct pcie_dw_ti),
+ .priv_auto = sizeof(struct pcie_dw_ti),
};
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 890b6a8fb6..fe71455b63 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -168,5 +168,5 @@ U_BOOT_DRIVER(pci_generic_ecam) = {
.ops = &pci_generic_ecam_ops,
.probe = pci_generic_ecam_probe,
.ofdata_to_platdata = pci_generic_ecam_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct generic_ecam_pcie),
+ .priv_auto = sizeof(struct generic_ecam_pcie),
};
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index fb50b8f518..52387d88cd 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -663,5 +663,5 @@ U_BOOT_DRIVER(fsl_pcie) = {
.ops = &fsl_pcie_ops,
.ofdata_to_platdata = fsl_pcie_ofdata_to_platdata,
.probe = fsl_pcie_probe,
- .priv_auto_alloc_size = sizeof(struct fsl_pcie),
+ .priv_auto = sizeof(struct fsl_pcie),
};
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index cbf12371a0..ebf9b8813d 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -830,7 +830,7 @@ U_BOOT_DRIVER(imx_pcie) = {
.probe = imx_pcie_dm_probe,
.remove = imx_pcie_dm_remove,
.ofdata_to_platdata = imx_pcie_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct imx_pcie_priv),
+ .priv_auto = sizeof(struct imx_pcie_priv),
.flags = DM_FLAG_OS_PREPARE,
};
#endif
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 9f102c64c6..0a70c71e87 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -430,5 +430,5 @@ U_BOOT_DRIVER(pcie_intel_fpga) = {
.ops = &pcie_intel_fpga_ops,
.ofdata_to_platdata = pcie_intel_fpga_ofdata_to_platdata,
.probe = pcie_intel_fpga_probe,
- .priv_auto_alloc_size = sizeof(struct intel_fpga_pcie),
+ .priv_auto = sizeof(struct intel_fpga_pcie),
};
diff --git a/drivers/pci/pcie_iproc.c b/drivers/pci/pcie_iproc.c
index d77735fcf2..6725ff6437 100644
--- a/drivers/pci/pcie_iproc.c
+++ b/drivers/pci/pcie_iproc.c
@@ -1282,6 +1282,6 @@ U_BOOT_DRIVER(pci_iproc) = {
.ops = &iproc_pcie_ops,
.probe = iproc_pcie_probe,
.remove = iproc_pcie_remove,
- .priv_auto_alloc_size = sizeof(struct iproc_pcie),
+ .priv_auto = sizeof(struct iproc_pcie),
.flags = DM_REMOVE_OS_PREPARE,
};
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e3a5..1503f961e2 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -328,5 +328,5 @@ U_BOOT_DRIVER(pci_layerscape_ep) = {
.ops = &ls_pcie_ep_ops,
.probe = ls_pcie_ep_probe,
.remove = ls_pcie_ep_remove,
- .priv_auto_alloc_size = sizeof(struct ls_pcie_ep),
+ .priv_auto = sizeof(struct ls_pcie_ep),
};
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 428bfcab09..a855646317 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -569,5 +569,5 @@ U_BOOT_DRIVER(pcie_layerscape_gen4) = {
.of_match = ls_pcie_g4_ids,
.ops = &ls_pcie_g4_ops,
.probe = ls_pcie_g4_probe,
- .priv_auto_alloc_size = sizeof(struct ls_pcie_g4),
+ .priv_auto = sizeof(struct ls_pcie_g4),
};
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 25c6ddebce..61b10597d8 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -375,5 +375,5 @@ U_BOOT_DRIVER(pci_layerscape) = {
.of_match = ls_pcie_ids,
.ops = &ls_pcie_ops,
.probe = ls_pcie_probe,
- .priv_auto_alloc_size = sizeof(struct ls_pcie_rc),
+ .priv_auto = sizeof(struct ls_pcie_rc),
};
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 55b6a40f25..2ebe4a47de 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -728,7 +728,7 @@ U_BOOT_DRIVER(pcie_mediatek_v1) = {
.of_match = mtk_pcie_ids,
.ops = &mtk_pcie_ops,
.probe = mtk_pcie_probe,
- .priv_auto_alloc_size = sizeof(struct mtk_pcie),
+ .priv_auto = sizeof(struct mtk_pcie),
};
static const struct udevice_id mtk_pcie_ids_v2[] = {
@@ -742,5 +742,5 @@ U_BOOT_DRIVER(pcie_mediatek_v2) = {
.of_match = mtk_pcie_ids_v2,
.ops = &mtk_pcie_ops_v2,
.probe = mtk_pcie_probe_v2,
- .priv_auto_alloc_size = sizeof(struct mtk_pcie),
+ .priv_auto = sizeof(struct mtk_pcie),
};
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 51b2171f9f..cce78714b3 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -195,5 +195,5 @@ U_BOOT_DRIVER(pci_phytium) = {
.of_match = pci_phytium_ids,
.ops = &pci_phytium_ops,
.ofdata_to_platdata = pci_phytium_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct phytium_pcie),
+ .priv_auto = sizeof(struct phytium_pcie),
};
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 04609f1296..5d5b50289f 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -565,5 +565,5 @@ U_BOOT_DRIVER(rockchip_pcie) = {
.of_match = rockchip_pcie_ids,
.ops = &rockchip_pcie_ops,
.probe = rockchip_pcie_probe,
- .priv_auto_alloc_size = sizeof(struct rockchip_pcie),
+ .priv_auto = sizeof(struct rockchip_pcie),
};
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 713ad49d04..7aaee77662 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -175,5 +175,5 @@ U_BOOT_DRIVER(pcie_xilinx) = {
.of_match = pcie_xilinx_ids,
.ops = &pcie_xilinx_ops,
.ofdata_to_platdata = pcie_xilinx_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct xilinx_pcie),
+ .priv_auto = sizeof(struct xilinx_pcie),
};