dm: treewide: Rename auto_alloc_size members to be shorter

This construct is quite long-winded. In earlier days it made some sense
since auto-allocation was a strange concept. But with driver model now
used pretty universally, we can shorten this to 'auto'. This reduces
verbosity and makes it easier to read.

Coincidentally it also ensures that every declaration is on one line,
thus making dtoc's job easier.

Signed-off-by: Simon Glass <sjg@chromium.org>

25 files changed, 30 insertions, 30 deletions

diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index babb84c..f1653ba 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 a520643..3ca9a15 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 e76abc1..cff1a41 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 1f51854..f01fcf6 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 9230cfe..6093072 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 6576f53..9cb95da 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 ba1c139..207ae33 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 3053754..d211d22 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 8745f28..d318b33 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 82f5c59..386b25a 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 dade79e..8f084df 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 c773f8d..def5fe2 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 742dd93..a4867dc 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 890b6a8..fe71455 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 fb50b8f..52387d8 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 cbf1237..ebf9b88 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 9f102c6..0a70c71 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 d77735f..6725ff6 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 eba230e..1503f96 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 428bfca..a855646 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 25c6dde..61b1059 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 55b6a40..2ebe4a4 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 51b2171..cce7871 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 04609f1..5d5b502 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 713ad49..7aaee77 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),
 };