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>

12 files changed, 16 insertions, 16 deletions

diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 70badb15a3b..6ff80e5d312 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -108,5 +108,5 @@ U_BOOT_DRIVER(acpi_gpe_drv) = {
 	.of_match	= acpi_gpe_ids,
 	.ops		= &acpi_gpe_ops,
 	.ofdata_to_platdata	= acpi_gpe_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct acpi_gpe_priv),
+	.priv_auto	= sizeof(struct acpi_gpe_priv),
 };
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index cafd9d65b24..4b627e325ec 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -403,7 +403,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = {
 	.ofdata_to_platdata = apl_hostbridge_ofdata_to_platdata,
 	.probe		= apl_hostbridge_probe,
 	.remove		= apl_hostbridge_remove,
-	.platdata_auto_alloc_size = sizeof(struct apl_hostbridge_platdata),
+	.platdata_auto	= sizeof(struct apl_hostbridge_platdata),
 	ACPI_OPS_PTR(&apl_hostbridge_acpi_ops)
 	.flags		= DM_FLAG_OS_PREPARE,
 };
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index cacaa007e05..82e2187c505 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -224,5 +224,5 @@ U_BOOT_DRIVER(intel_apl_pmc) = {
 	.ofdata_to_platdata = apl_pmc_ofdata_to_uc_platdata,
 	.probe		= apl_pmc_probe,
 	.ops		= &apl_pmc_ops,
-	.platdata_auto_alloc_size = sizeof(struct apl_pmc_platdata),
+	.platdata_auto	= sizeof(struct apl_pmc_platdata),
 };
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 089b37c59f8..324dd6c9f1b 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -125,7 +125,7 @@ U_BOOT_DRIVER(winbond_w25q128fw) = {
 	.of_match	= apl_flash_ids,
 	.bind		= apl_flash_bind,
 	.probe		= apl_flash_probe,
-	.priv_auto_alloc_size = sizeof(struct spi_flash),
+	.priv_auto	= sizeof(struct spi_flash),
 	.ops		= &apl_flash_ops,
 };
 
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index c522aa97803..6695234dce7 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -126,8 +126,8 @@ U_BOOT_DRIVER(intel_apl_ns16550) = {
 	.name	= "intel_apl_ns16550",
 	.id	= UCLASS_SERIAL,
 	.of_match = apl_ns16550_serial_ids,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
 	.ops	= &ns16550_serial_ops,
 	.ofdata_to_platdata = apl_ns16550_ofdata_to_platdata,
 	.probe = apl_ns16550_probe,
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 706f68f63d6..1ff4dce0b57 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -665,6 +665,6 @@ U_BOOT_DRIVER(cpu_x86_broadwell_drv) = {
 	.bind		= cpu_x86_bind,
 	.probe		= cpu_x86_broadwell_probe,
 	.ops		= &cpu_x86_broadwell_ops,
-	.priv_auto_alloc_size	= sizeof(struct cpu_broadwell_priv),
+	.priv_auto	= sizeof(struct cpu_broadwell_priv),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 641da515c8f..a31f5234220 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -266,5 +266,5 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = {
 	.of_match	= broadwell_ahci_ids,
 	.ofdata_to_platdata	= broadwell_sata_ofdata_to_platdata,
 	.probe		= broadwell_sata_probe,
-	.platdata_auto_alloc_size	 = sizeof(struct sata_platdata),
+	.platdata_auto	 = sizeof(struct sata_platdata),
 };
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index de17b93ed43..ed0dad320e1 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -242,6 +242,6 @@ U_BOOT_DRIVER(intel_itss) = {
 	.ops		= &itss_ops,
 	.bind		= itss_bind,
 	.ofdata_to_platdata = itss_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct itss_platdata),
-	.priv_auto_alloc_size = sizeof(struct itss_priv),
+	.platdata_auto	= sizeof(struct itss_platdata),
+	.priv_auto	= sizeof(struct itss_priv),
 };
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index a0a4001e03b..40de1d34a3d 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -197,8 +197,8 @@ U_BOOT_DRIVER(intel_p2sb) = {
 	.remove		= p2sb_remove,
 	.ops		= &p2sb_ops,
 	.ofdata_to_platdata = p2sb_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct p2sb_platdata),
-	.per_child_platdata_auto_alloc_size =
+	.platdata_auto	= sizeof(struct p2sb_platdata),
+	.per_child_platdata_auto	=
 		sizeof(struct p2sb_child_platdata),
 	.child_post_bind = p2sb_child_post_bind,
 	.flags		= DM_FLAG_OS_PREPARE,
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 836a0e8b86e..8b53b96822d 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -362,5 +362,5 @@ U_BOOT_DRIVER(irq_router_drv) = {
 	.id		= UCLASS_IRQ,
 	.of_match	= irq_router_ids,
 	.probe		= irq_router_probe,
-	.priv_auto_alloc_size = sizeof(struct irq_router),
+	.priv_auto	= sizeof(struct irq_router),
 };
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 9813f7977b5..5ffce9835d0 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -58,8 +58,8 @@ U_BOOT_DRIVER(serial_slimbootloader) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = slimbootloader_serial_ids,
 	.ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe	= ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 };
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 5b0e106011a..acf97e3af51 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -191,5 +191,5 @@ U_BOOT_DRIVER(tangier_pinctrl) = {
 	.id = UCLASS_SYSCON,
 	.of_match = tangier_pinctrl_match,
 	.probe = tangier_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mrfld_pinctrl),
+	.priv_auto	= sizeof(struct mrfld_pinctrl),
 };