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>

10 files changed, 11 insertions, 11 deletions

diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index a761e3d..1dfc5c5 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -728,7 +728,7 @@ U_BOOT_DRIVER(cr50_i2c) = {
 	.ofdata_to_platdata	= cr50_i2c_ofdata_to_platdata,
 	.probe	= cr50_i2c_probe,
 	.remove	= cr50_i2c_cleanup,
-	.priv_auto_alloc_size = sizeof(struct cr50_priv),
+	.priv_auto	= sizeof(struct cr50_priv),
 	ACPI_OPS_PTR(&cr50_acpi_ops)
 	.flags		= DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 6ea795b..beb0fa3 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -141,5 +141,5 @@ UCLASS_DRIVER(tpm) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.post_bind	= dm_scan_fdt_dev,
 #endif
-	.per_device_auto_alloc_size	= sizeof(struct tpm_chip_priv),
+	.per_device_auto	= sizeof(struct tpm_chip_priv),
 };
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 3197e0e..53e59f4 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -247,5 +247,5 @@ U_BOOT_DRIVER(ftpm_tee) = {
 	.probe	= ftpm_tee_probe,
 	.remove	= ftpm_tee_remove,
 	.flags	= DM_FLAG_OS_PREPARE,
-	.priv_auto_alloc_size = sizeof(struct ftpm_tee_private),
+	.priv_auto	= sizeof(struct ftpm_tee_private),
 };
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 41a15bd..c74bacf 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -625,5 +625,5 @@ U_BOOT_DRIVER(sandbox_tpm2) = {
 	.of_match = sandbox_tpm2_ids,
 	.ops    = &sandbox_tpm2_ops,
 	.probe	= sandbox_tpm2_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_tpm2),
+	.priv_auto	= sizeof(struct sandbox_tpm2),
 };
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 0045bed..4b33ac8 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -686,5 +686,5 @@ U_BOOT_DRIVER(tpm_tis_spi) = {
 	.ops    = &tpm_tis_spi_ops,
 	.probe	= tpm_tis_spi_probe,
 	.remove	= tpm_tis_spi_remove,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
+	.priv_auto	= sizeof(struct tpm_chip),
 };
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index f47813e..f414e56 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -633,5 +633,5 @@ U_BOOT_DRIVER(tpm_tis_i2c) = {
 	.of_match = tpm_tis_i2c_ids,
 	.ops    = &tpm_tis_i2c_ops,
 	.probe	= tpm_tis_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
+	.priv_auto	= sizeof(struct tpm_chip),
 };
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 2dd374c..003c0d8 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -475,5 +475,5 @@ U_BOOT_DRIVER(tpm_tis_lpc) = {
 	.of_match = tpm_tis_lpc_ids,
 	.ops    = &tpm_tis_lpc_ops,
 	.probe	= tpm_tis_lpc_probe,
-	.priv_auto_alloc_size = sizeof(struct tpm_tis_lpc_priv),
+	.priv_auto	= sizeof(struct tpm_tis_lpc_priv),
 };
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index e167d0a..67139ce 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -361,5 +361,5 @@ U_BOOT_DRIVER(google_sandbox_tpm) = {
 	.of_match = sandbox_tpm_ids,
 	.ops    = &sandbox_tpm_ops,
 	.probe	= sandbox_tpm_probe,
-	.priv_auto_alloc_size = sizeof(struct tpm_state),
+	.priv_auto	= sizeof(struct tpm_state),
 };
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index a253ee1..e0eeabb 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -542,5 +542,5 @@ U_BOOT_DRIVER(st33zp24_i2c) = {
 	.probe  = st33zp24_i2c_probe,
 	.remove = st33zp24_i2c_remove,
 	.ops = &st33zp24_i2c_tpm_ops,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
+	.priv_auto	= sizeof(struct tpm_chip),
 };
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index ef54e3b..683d496 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -670,6 +670,6 @@ U_BOOT_DRIVER(st33zp24_spi_spi) = {
 	.probe  = st33zp24_spi_probe,
 	.remove = st33zp24_spi_remove,
 	.ops = &st33zp24_spi_tpm_ops,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
-	.platdata_auto_alloc_size = sizeof(struct st33zp24_spi_phy),
+	.priv_auto	= sizeof(struct tpm_chip),
+	.platdata_auto	= sizeof(struct st33zp24_spi_phy),
 };