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>

26 files changed, 32 insertions, 32 deletions

diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index c6502650b75..509fd7eb550 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -94,6 +94,6 @@ U_BOOT_DRIVER(altera_sysid) = {
 	.id	= UCLASS_MISC,
 	.of_match = altera_sysid_ids,
 	.ofdata_to_platdata = altera_sysid_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_sysid_platdata),
+	.platdata_auto	= sizeof(struct altera_sysid_platdata),
 	.ops	= &altera_sysid_ops,
 };
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 422ea6f3e5a..bacd47e60f1 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -407,5 +407,5 @@ U_BOOT_DRIVER(atsha204) = {
 	.id			= UCLASS_MISC,
 	.of_match		= atsha204a_ids,
 	.ofdata_to_platdata	= atsha204a_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(fdt_addr_t),
+	.priv_auto	= sizeof(fdt_addr_t),
 };
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 1b22f1883ee..f03b7d55d64 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -1505,7 +1505,7 @@ int cros_ec_set_lid_shutdown_mask(struct udevice *dev, int enable)
 UCLASS_DRIVER(cros_ec) = {
 	.id		= UCLASS_CROS_EC,
 	.name		= "cros-ec",
-	.per_device_auto_alloc_size = sizeof(struct cros_ec_dev),
+	.per_device_auto	= sizeof(struct cros_ec_dev),
 	.post_bind	= dm_scan_fdt_dev,
 	.flags		= DM_UC_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index ff7f782742a..cb7229ae96f 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -587,6 +587,6 @@ U_BOOT_DRIVER(google_cros_ec_sandbox) = {
 	.id		= UCLASS_CROS_EC,
 	.of_match	= cros_ec_ids,
 	.probe		= cros_ec_probe,
-	.priv_auto_alloc_size = sizeof(struct ec_state),
+	.priv_auto	= sizeof(struct ec_state),
 	.ops		= &cros_ec_ops,
 };
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index 56406aa1dd2..71e20a49278 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -285,8 +285,8 @@ U_BOOT_DRIVER(fs_loader) = {
 	.of_match		= fs_loader_ids,
 	.probe			= fs_loader_probe,
 	.ofdata_to_platdata	= fs_loader_ofdata_to_platdata,
-	.platdata_auto_alloc_size	= sizeof(struct device_platdata),
-	.priv_auto_alloc_size	= sizeof(struct firmware),
+	.platdata_auto	= sizeof(struct device_platdata),
+	.priv_auto	= sizeof(struct firmware),
 };
 
 UCLASS_DRIVER(fs_loader) = {
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 69e16a06a0a..145cfa23c6c 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -206,5 +206,5 @@ U_BOOT_DRIVER(gdsys_ioep) = {
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.of_match       = gdsys_ioep_ids,
 	.probe          = gdsys_ioep_probe,
-	.priv_auto_alloc_size = sizeof(struct gdsys_ioep_priv),
+	.priv_auto	= sizeof(struct gdsys_ioep_priv),
 };
diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c
index c56abce4d4c..8f5cbe420f8 100644
--- a/drivers/misc/gdsys_rxaui_ctrl.c
+++ b/drivers/misc/gdsys_rxaui_ctrl.c
@@ -77,5 +77,5 @@ U_BOOT_DRIVER(gdsys_rxaui_ctrl) = {
 	.ops		= &gdsys_rxaui_ctrl_ops,
 	.of_match       = gdsys_rxaui_ctrl_ids,
 	.probe          = gdsys_rxaui_ctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct gdsys_rxaui_ctrl_priv),
+	.priv_auto	= sizeof(struct gdsys_rxaui_ctrl_priv),
 };
diff --git a/drivers/misc/gdsys_soc.c b/drivers/misc/gdsys_soc.c
index b4c721c6fe6..27e7dc48327 100644
--- a/drivers/misc/gdsys_soc.c
+++ b/drivers/misc/gdsys_soc.c
@@ -71,5 +71,5 @@ U_BOOT_DRIVER(gdsys_soc_bus) = {
 	.id             = UCLASS_SIMPLE_BUS,
 	.of_match       = gdsys_soc_ids,
 	.probe          = gdsys_soc_probe,
-	.priv_auto_alloc_size = sizeof(struct gdsys_soc_priv),
+	.priv_auto	= sizeof(struct gdsys_soc_priv),
 };
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 92e18356254..3499114394d 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -284,7 +284,7 @@ U_BOOT_DRIVER(i2c_eeprom_std) = {
 	.bind			= i2c_eeprom_std_bind,
 	.probe			= i2c_eeprom_std_probe,
 	.ofdata_to_platdata	= i2c_eeprom_std_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct i2c_eeprom),
+	.priv_auto	= sizeof(struct i2c_eeprom),
 	.ops			= &i2c_eeprom_std_ops,
 };
 
@@ -366,7 +366,7 @@ U_BOOT_DRIVER(i2c_eeprom_partition) = {
 	.id			= UCLASS_I2C_EEPROM,
 	.probe			= i2c_eeprom_partition_probe,
 	.ofdata_to_platdata	= i2c_eeprom_partition_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct i2c_eeprom_partition),
+	.priv_auto	= sizeof(struct i2c_eeprom_partition),
 	.ops			= &i2c_eeprom_partition_ops,
 };
 
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 6be76ad02ef..2089df1e008 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -200,7 +200,7 @@ U_BOOT_DRIVER(sandbox_i2c_emul) = {
 	.ofdata_to_platdata = sandbox_i2c_eeprom_ofdata_to_platdata,
 	.probe		= sandbox_i2c_eeprom_probe,
 	.remove		= sandbox_i2c_eeprom_remove,
-	.priv_auto_alloc_size = sizeof(struct sandbox_i2c_flash),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_i2c_flash_plat_data),
+	.priv_auto	= sizeof(struct sandbox_i2c_flash),
+	.platdata_auto	= sizeof(struct sandbox_i2c_flash_plat_data),
 	.ops		= &sandbox_i2c_emul_ops,
 };
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 00d34a3adc2..a0fece985d8 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -866,5 +866,5 @@ U_BOOT_DRIVER(ihs_fpga_bus) = {
 	.id             = UCLASS_MISC,
 	.of_match       = ihs_fpga_ids,
 	.probe          = ihs_fpga_probe,
-	.priv_auto_alloc_size = sizeof(struct ihs_fpga_priv),
+	.priv_auto	= sizeof(struct ihs_fpga_priv),
 };
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 223aac8518a..5a2a0e6c523 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -245,6 +245,6 @@ U_BOOT_DRIVER(imx8_scu) = {
 	.bind		= imx8_scu_bind,
 	.remove		= imx8_scu_remove,
 	.ops		= &imx8_scu_ops,
-	.platdata_auto_alloc_size = sizeof(struct imx8_scu),
+	.platdata_auto	= sizeof(struct imx8_scu),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index a2511b32fcd..1f7e62e6614 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -108,5 +108,5 @@ U_BOOT_DRIVER(sandbox_irq_drv) = {
 	.id		= UCLASS_IRQ,
 	.of_match	= sandbox_irq_ids,
 	.ops		= &sandbox_irq_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_irq_priv),
+	.priv_auto	= sizeof(struct sandbox_irq_priv),
 };
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 408c89315a9..840148d0900 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -390,5 +390,5 @@ U_BOOT_DRIVER(k3_avs) = {
 	.of_match = k3_avs_ids,
 	.id = UCLASS_MISC,
 	.probe = k3_avs_probe,
-	.priv_auto_alloc_size = sizeof(struct k3_avs_privdata),
+	.priv_auto	= sizeof(struct k3_avs_privdata),
 };
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index 64cc4ae7b61..43a539e942e 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -62,5 +62,5 @@ U_BOOT_DRIVER(microchip_flexcom) = {
 	.id	= UCLASS_MISC,
 	.of_match = microchip_flexcom_ids,
 	.ofdata_to_platdata = microchip_flexcom_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct microchip_flexcom_platdata),
+	.platdata_auto	= sizeof(struct microchip_flexcom_platdata),
 };
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index f7c5b2e25fa..0e4292fd0aa 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -129,5 +129,5 @@ U_BOOT_DRIVER(misc_sandbox) = {
 	.ops		= &misc_sandbox_ops,
 	.of_match       = misc_sandbox_ids,
 	.probe          = misc_sandbox_probe,
-	.priv_auto_alloc_size = sizeof(struct misc_sandbox_priv),
+	.priv_auto	= sizeof(struct misc_sandbox_priv),
 };
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index ab1e34e6f46..93c87e998c4 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -183,5 +183,5 @@ U_BOOT_DRIVER(mpc83xx_serdes) = {
 	.id             = UCLASS_MISC,
 	.of_match       = mpc83xx_serdes_ids,
 	.probe          = mpc83xx_serdes_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_serdes_priv),
+	.priv_auto	= sizeof(struct mpc83xx_serdes_priv),
 };
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 12abcff2da4..e41c2cd4814 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -221,9 +221,9 @@ static int p2sb_post_bind(struct udevice *dev)
 UCLASS_DRIVER(p2sb) = {
 	.id		= UCLASS_P2SB,
 	.name		= "p2sb",
-	.per_device_auto_alloc_size = sizeof(struct p2sb_uc_priv),
+	.per_device_auto	= sizeof(struct p2sb_uc_priv),
 	.post_bind	= p2sb_post_bind,
 	.child_post_bind = p2sb_child_post_bind,
-	.per_child_platdata_auto_alloc_size =
+	.per_child_platdata_auto	=
 		sizeof(struct p2sb_child_platdata),
 };
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index a4b6dba5162..acdc2c099b4 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -262,8 +262,8 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = {
 	.id		= UCLASS_PCI_EMUL,
 	.of_match	= sandbox_p2sb_emul_ids,
 	.ops		= &sandbox_p2sb_emul_emul_ops,
-	.priv_auto_alloc_size = sizeof(struct p2sb_emul_priv),
-	.platdata_auto_alloc_size = sizeof(struct p2sb_emul_platdata),
+	.priv_auto	= sizeof(struct p2sb_emul_priv),
+	.platdata_auto	= sizeof(struct p2sb_emul_platdata),
 };
 
 static struct pci_device_id sandbox_p2sb_emul_supported[] = {
diff --git a/drivers/misc/p2sb_sandbox.c b/drivers/misc/p2sb_sandbox.c
index ce50a9732ee..d80bca22a6b 100644
--- a/drivers/misc/p2sb_sandbox.c
+++ b/drivers/misc/p2sb_sandbox.c
@@ -35,5 +35,5 @@ U_BOOT_DRIVER(p2sb_sandbox) = {
 	.id = UCLASS_P2SB,
 	.of_match = sandbox_p2sb_ids,
 	.probe = sandbox_p2sb_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_p2sb_priv),
+	.priv_auto	= sizeof(struct sandbox_p2sb_priv),
 };
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 46ce6305fe6..447b180231d 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -155,6 +155,6 @@ U_BOOT_DRIVER(rockchip_efuse) = {
 	.id = UCLASS_MISC,
 	.of_match = rockchip_efuse_ids,
 	.ofdata_to_platdata = rockchip_efuse_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rockchip_efuse_platdata),
+	.platdata_auto	= sizeof(struct rockchip_efuse_platdata),
 	.ops = &rockchip_efuse_ops,
 };
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index bdd443b3db9..139855adc4d 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -172,5 +172,5 @@ U_BOOT_DRIVER(rockchip_otp) = {
 	.of_match = rockchip_otp_ids,
 	.ops = &rockchip_otp_ops,
 	.ofdata_to_platdata = rockchip_otp_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rockchip_otp_platdata),
+	.platdata_auto	= sizeof(struct rockchip_otp_platdata),
 };
diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c
index df262e62555..fed7ecfb929 100644
--- a/drivers/misc/sandbox_adder.c
+++ b/drivers/misc/sandbox_adder.c
@@ -56,5 +56,5 @@ U_BOOT_DRIVER(adder_sandbox) = {
 	.of_match = sandbox_adder_ids,
 	.probe = sandbox_adder_probe,
 	.ops = &sandbox_adder_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_adder_priv),
+	.priv_auto	= sizeof(struct sandbox_adder_priv),
 };
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 92f08dde011..3dab126f3a6 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -270,6 +270,6 @@ U_BOOT_DRIVER(sifive_otp) = {
 	.id = UCLASS_MISC,
 	.of_match = sifive_otp_ids,
 	.ofdata_to_platdata = sifive_otp_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sifive_otp_platdata),
+	.platdata_auto	= sizeof(struct sifive_otp_platdata),
 	.ops = &sifive_otp_ops,
 };
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 07c67577d54..d75df8e9639 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -391,8 +391,8 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = {
 	.id		= UCLASS_PCI_EMUL,
 	.of_match	= sandbox_swap_case_ids,
 	.ops		= &sandbox_swap_case_emul_ops,
-	.priv_auto_alloc_size = sizeof(struct swap_case_priv),
-	.platdata_auto_alloc_size = sizeof(struct swap_case_platdata),
+	.priv_auto	= sizeof(struct swap_case_priv),
+	.platdata_auto	= sizeof(struct swap_case_platdata),
 };
 
 static struct pci_device_id sandbox_swap_case_supported[] = {
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 18da138507c..f2366d6592d 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -257,5 +257,5 @@ U_BOOT_DRIVER(tegra186_bpmp) = {
 	.probe		= tegra186_bpmp_probe,
 	.remove		= tegra186_bpmp_remove,
 	.ops		= &tegra186_bpmp_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra186_bpmp),
+	.priv_auto	= sizeof(struct tegra186_bpmp),
 };