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>

28 files changed, 34 insertions, 34 deletions

diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index 828963d..7eeecc0 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -231,5 +231,5 @@ int pmc_ofdata_to_uc_platdata(struct udevice *dev)
 UCLASS_DRIVER(acpi_pmc) = {
 	.id		= UCLASS_ACPI_PMC,
 	.name		= "power-mgr",
-	.per_device_auto_alloc_size	= sizeof(struct acpi_pmc_upriv),
+	.per_device_auto	= sizeof(struct acpi_pmc_upriv),
 };
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index 5ed6fcc..6872430 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -235,8 +235,8 @@ U_BOOT_DRIVER(sandbox_pmc_emul_emul) = {
 	.of_match	= sandbox_pmc_emul_ids,
 	.ops		= &sandbox_pmc_emul_emul_ops,
 	.probe		= sandbox_pmc_probe,
-	.priv_auto_alloc_size = sizeof(struct pmc_emul_priv),
-	.platdata_auto_alloc_size = sizeof(struct pmc_emul_platdata),
+	.priv_auto	= sizeof(struct pmc_emul_priv),
+	.platdata_auto	= sizeof(struct pmc_emul_platdata),
 };
 
 static struct pci_device_id sandbox_pmc_emul_supported[] = {
diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c
index 48a6c66..6cb7af1 100644
--- a/drivers/power/acpi_pmc/sandbox.c
+++ b/drivers/power/acpi_pmc/sandbox.c
@@ -94,5 +94,5 @@ U_BOOT_DRIVER(pmc_sandbox) = {
 	.of_match = sandbox_pmc_ids,
 	.probe = sandbox_pmc_probe,
 	.ops = &sandbox_pmc_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_pmc_priv),
+	.priv_auto	= sizeof(struct sandbox_pmc_priv),
 };
diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index a494bfa..6e720e0 100644
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -75,6 +75,6 @@ U_BOOT_DRIVER(bcm6328_power_domain) = {
 	.id = UCLASS_POWER_DOMAIN,
 	.of_match = bcm6328_power_domain_ids,
 	.ops = &bcm6328_power_domain_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6328_power_domain),
+	.priv_auto	= sizeof(struct bcm6328_power_domain),
 	.probe = bcm6328_power_domain_probe,
 };
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 889b65a..33dd4cc 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -377,8 +377,8 @@ U_BOOT_DRIVER(imx8_power_domain) = {
 	.bind = imx8_power_domain_bind,
 	.probe = imx8_power_domain_probe,
 	.ofdata_to_platdata = imx8_power_domain_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct imx8_power_domain_platdata),
-	.priv_auto_alloc_size = sizeof(struct imx8_power_domain_priv),
+	.platdata_auto	= sizeof(struct imx8_power_domain_platdata),
+	.priv_auto	= sizeof(struct imx8_power_domain_priv),
 	.ops = &imx8_power_domain_ops,
 	.flags	= DM_FLAG_DEFAULT_PD_CTRL_OFF,
 };
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index 0ef460d..3736019 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -137,6 +137,6 @@ U_BOOT_DRIVER(imx8m_power_domain) = {
 	.bind = imx8m_power_domain_bind,
 	.probe = imx8m_power_domain_probe,
 	.ofdata_to_platdata = imx8m_power_domain_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct imx8m_power_domain_platdata),
+	.platdata_auto	= sizeof(struct imx8m_power_domain_platdata),
 	.ops = &imx8m_power_domain_ops,
 };
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 8349a9c..2e7ab67 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -431,5 +431,5 @@ U_BOOT_DRIVER(meson_ee_pwrc) = {
 	.of_match = meson_ee_pwrc_ids,
 	.probe = meson_ee_pwrc_probe,
 	.ops = &meson_ee_pwrc_ops,
-	.priv_auto_alloc_size = sizeof(struct meson_ee_pwrc_priv),
+	.priv_auto	= sizeof(struct meson_ee_pwrc_priv),
 };
diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index a41b230..40947c6 100644
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -334,5 +334,5 @@ U_BOOT_DRIVER(meson_gx_pwrc_vpu) = {
 	.of_match = meson_gx_pwrc_vpu_ids,
 	.probe = meson_gx_pwrc_vpu_probe,
 	.ops = &meson_gx_pwrc_vpu_ops,
-	.priv_auto_alloc_size = sizeof(struct meson_gx_pwrc_vpu_priv),
+	.priv_auto	= sizeof(struct meson_gx_pwrc_vpu_priv),
 };
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index fae4749..ca2ded0 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -411,5 +411,5 @@ U_BOOT_DRIVER(mtk_power_domain) = {
 	.ops = &mtk_power_domain_ops,
 	.probe = mtk_power_domain_probe,
 	.of_match = mtk_power_domain_ids,
-	.priv_auto_alloc_size = sizeof(struct scp_domain),
+	.priv_auto	= sizeof(struct scp_domain),
 };
diff --git a/drivers/power/domain/sandbox-power-domain-test.c b/drivers/power/domain/sandbox-power-domain-test.c
index 2191a94..1bf52f1 100644
--- a/drivers/power/domain/sandbox-power-domain-test.c
+++ b/drivers/power/domain/sandbox-power-domain-test.c
@@ -51,5 +51,5 @@ U_BOOT_DRIVER(sandbox_power_domain_test) = {
 	.name = "sandbox_power_domain_test",
 	.id = UCLASS_MISC,
 	.of_match = sandbox_power_domain_test_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_power_domain_test),
+	.priv_auto	= sizeof(struct sandbox_power_domain_test),
 };
diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 4d9a200..04a0710 100644
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -88,7 +88,7 @@ U_BOOT_DRIVER(sandbox_power_domain) = {
 	.of_match = sandbox_power_domain_ids,
 	.bind = sandbox_power_domain_bind,
 	.probe = sandbox_power_domain_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_power_domain),
+	.priv_auto	= sizeof(struct sandbox_power_domain),
 	.ops = &sandbox_power_domain_ops,
 };
 
diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index 7ee121d..f18e456 100644
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -135,6 +135,6 @@ U_BOOT_DRIVER(ti_sci_pm_domains) = {
 	.id = UCLASS_POWER_DOMAIN,
 	.of_match = ti_sci_power_domain_of_match,
 	.probe = ti_sci_power_domain_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_power_domain_data),
+	.priv_auto	= sizeof(struct ti_sci_power_domain_data),
 	.ops = &ti_sci_power_domain_ops,
 };
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 404fe00..633ad15 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -161,6 +161,6 @@ U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = {
 	.of_match	= sandbox_i2c_pmic_ids,
 	.ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata,
 	.probe		= sandbox_i2c_pmic_probe,
-	.platdata_auto_alloc_size = sizeof(struct sandbox_i2c_pmic_plat_data),
+	.platdata_auto	= sizeof(struct sandbox_i2c_pmic_plat_data),
 	.ops		= &sandbox_i2c_pmic_emul_ops,
 };
diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index ddc3060..5f4386d 100644
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -82,5 +82,5 @@ U_BOOT_DRIVER(pmic_pm8916) = {
 	.bind = dm_scan_fdt_dev,
 	.probe = pm8916_probe,
 	.ops = &pm8916_ops,
-	.priv_auto_alloc_size = sizeof(struct pm8916_priv),
+	.priv_auto	= sizeof(struct pm8916_priv),
 };
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index 7770171..79166b8 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -196,5 +196,5 @@ UCLASS_DRIVER(pmic) = {
 	.id		= UCLASS_PMIC,
 	.name		= "pmic",
 	.pre_probe	= pmic_pre_probe,
-	.per_device_auto_alloc_size = sizeof(struct uc_pmic_priv),
+	.per_device_auto	= sizeof(struct uc_pmic_priv),
 };
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 148ee29..2f547a3 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -190,7 +190,7 @@ U_BOOT_DRIVER(rockchip_rk805) = {
 #if CONFIG_IS_ENABLED(PMIC_CHILDREN)
 	.bind = rk8xx_bind,
 #endif
-	.priv_auto_alloc_size   = sizeof(struct rk8xx_priv),
+	.priv_auto	  = sizeof(struct rk8xx_priv),
 	.probe = rk8xx_probe,
 	.ops = &rk8xx_ops,
 };
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 931d753..ba32f59 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -466,5 +466,5 @@ U_BOOT_DRIVER(bd71837_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &bd71837_regulator_ops,
 	.probe = bd71837_regulator_probe,
-	.platdata_auto_alloc_size = sizeof(struct bd71837_platdata),
+	.platdata_auto	= sizeof(struct bd71837_platdata),
 };
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index 5055e39..4ff7f39 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -366,7 +366,7 @@ U_BOOT_DRIVER(da9063_ldo) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &da9063_ldo_ops,
 	.probe = da9063_ldo_probe,
-	.priv_auto_alloc_size = sizeof(struct da9063_priv),
+	.priv_auto	= sizeof(struct da9063_priv),
 };
 
 static const struct dm_regulator_ops da9063_buck_ops = {
@@ -385,5 +385,5 @@ U_BOOT_DRIVER(da9063_buck) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &da9063_buck_ops,
 	.probe = da9063_buck_probe,
-	.priv_auto_alloc_size = sizeof(struct da9063_priv),
+	.priv_auto	= sizeof(struct da9063_priv),
 };
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index b407f55..70aeef7 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -239,7 +239,7 @@ U_BOOT_DRIVER(fan53555_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &fan53555_regulator_ops,
 	.ofdata_to_platdata = fan53555_regulator_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct fan53555_platdata),
-	.priv_auto_alloc_size = sizeof(struct fan53555_priv),
+	.platdata_auto	= sizeof(struct fan53555_platdata),
+	.priv_auto	= sizeof(struct fan53555_priv),
 	.probe = fan53555_probe,
 };
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 2fa6c7e..d887c87 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -89,5 +89,5 @@ U_BOOT_DRIVER(regulator_fixed) = {
 	.ops = &fixed_regulator_ops,
 	.of_match = fixed_regulator_ids,
 	.ofdata_to_platdata = fixed_regulator_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct regulator_common_platdata),
+	.platdata_auto	= sizeof(struct regulator_common_platdata),
 };
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 28c9e22..d5998f1 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -155,5 +155,5 @@ U_BOOT_DRIVER(gpio_regulator) = {
 	.ops = &gpio_regulator_ops,
 	.of_match = gpio_regulator_ids,
 	.ofdata_to_platdata = gpio_regulator_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct gpio_regulator_platdata),
+	.platdata_auto	= sizeof(struct gpio_regulator_platdata),
 };
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 28a9a14..dc944c9 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -130,7 +130,7 @@ U_BOOT_DRIVER(pbias_pmic) = {
 	.bind = pbias_bind,
 	.ops = &pbias_ops,
 	.ofdata_to_platdata = pbias_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct pbias_priv),
+	.priv_auto	= sizeof(struct pbias_priv),
 };
 
 static const struct pbias_reg_info pbias_mmc_omap2430 = {
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index b568430..8dc517f 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -572,5 +572,5 @@ U_BOOT_DRIVER(pfuze100_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &pfuze100_regulator_ops,
 	.probe = pfuze100_regulator_probe,
-	.platdata_auto_alloc_size = sizeof(struct pfuze100_regulator_platdata),
+	.platdata_auto	= sizeof(struct pfuze100_regulator_platdata),
 };
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index f870622..ebd09e7 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -155,5 +155,5 @@ U_BOOT_DRIVER(pwm_regulator) = {
 	.probe = pwm_regulator_probe,
 	.of_match = pwm_regulator_ids,
 	.ofdata_to_platdata	= pwm_regulator_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct pwm_regulator_info),
+	.priv_auto	= sizeof(struct pwm_regulator_info),
 };
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index da679a5..6192406 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -500,6 +500,6 @@ UCLASS_DRIVER(regulator) = {
 	.name		= "regulator",
 	.post_bind	= regulator_post_bind,
 	.pre_probe	= regulator_pre_probe,
-	.per_device_platdata_auto_alloc_size =
+	.per_device_platdata_auto	=
 				sizeof(struct dm_regulator_uclass_platdata),
 };
diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c
index 9213696..c2c5770 100644
--- a/drivers/power/regulator/stm32-vrefbuf.c
+++ b/drivers/power/regulator/stm32-vrefbuf.c
@@ -165,5 +165,5 @@ U_BOOT_DRIVER(stm32_vrefbuf) = {
 	.of_match = stm32_vrefbuf_ids,
 	.probe = stm32_vrefbuf_probe,
 	.ops = &stm32_vrefbuf_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_vrefbuf),
+	.priv_auto	= sizeof(struct stm32_vrefbuf),
 };
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index ce54495..5755666 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -119,6 +119,6 @@ U_BOOT_DRIVER(tps62360_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &tps62360_regulator_ops,
 	.of_match = tps62360_regulator_ids,
-	.platdata_auto_alloc_size = sizeof(struct tps62360_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps62360_regulator_pdata),
 	.probe = tps62360_regulator_probe,
 };
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 171afd3..467ff3f 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -424,7 +424,7 @@ U_BOOT_DRIVER(tps65910_boost) = {
 	.name = TPS65910_BOOST_DRIVER,
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_boost_ops,
-	.platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps65910_regulator_pdata),
 	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
 };
 
@@ -439,7 +439,7 @@ U_BOOT_DRIVER(tps65910_buck) = {
 	.name = TPS65910_BUCK_DRIVER,
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_buck_ops,
-	.platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps65910_regulator_pdata),
 	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
 };
 
@@ -454,6 +454,6 @@ U_BOOT_DRIVER(tps65910_ldo) = {
 	.name = TPS65910_LDO_DRIVER,
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_ldo_ops,
-	.platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps65910_regulator_pdata),
 	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
 };