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>

8 files changed, 10 insertions, 10 deletions

diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 2636cbedfe..64a0746f26 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -369,5 +369,5 @@ UCLASS_DRIVER(virtio) = {
 	.child_post_bind = virtio_uclass_child_post_bind,
 	.child_pre_probe = virtio_uclass_child_pre_probe,
 	.child_post_probe = virtio_uclass_child_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct virtio_dev_priv),
+	.per_device_auto	= sizeof(struct virtio_dev_priv),
 };
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 1799f5c5eb..a007a6a33a 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -134,6 +134,6 @@ U_BOOT_DRIVER(virtio_blk) = {
 	.bind	= virtio_blk_bind,
 	.probe	= virtio_blk_probe,
 	.remove	= virtio_reset,
-	.priv_auto_alloc_size = sizeof(struct virtio_blk_priv),
+	.priv_auto	= sizeof(struct virtio_blk_priv),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index b951ea3257..90ee1d4271 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -412,5 +412,5 @@ U_BOOT_DRIVER(virtio_mmio) = {
 	.ops	= &virtio_mmio_ops,
 	.probe	= virtio_mmio_probe,
 	.ofdata_to_platdata = virtio_mmio_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct virtio_mmio_priv),
+	.priv_auto	= sizeof(struct virtio_mmio_priv),
 };
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index 0dbbd78023..e1831cf961 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -233,7 +233,7 @@ U_BOOT_DRIVER(virtio_net) = {
 	.probe	= virtio_net_probe,
 	.remove = virtio_reset,
 	.ops	= &virtio_net_ops,
-	.priv_auto_alloc_size = sizeof(struct virtio_net_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct virtio_net_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index fa7f2429f1..0a2431a97f 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -350,7 +350,7 @@ U_BOOT_DRIVER(virtio_pci_legacy) = {
 	.ops	= &virtio_pci_ops,
 	.bind	= virtio_pci_bind,
 	.probe	= virtio_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct virtio_pci_priv),
+	.priv_auto	= sizeof(struct virtio_pci_priv),
 };
 
 static struct pci_device_id virtio_pci_supported[] = {
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 2e5bbade00..8996ac0d6e 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -539,7 +539,7 @@ U_BOOT_DRIVER(virtio_pci_modern) = {
 	.ops	= &virtio_pci_ops,
 	.bind	= virtio_pci_bind,
 	.probe	= virtio_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct virtio_pci_priv),
+	.priv_auto	= sizeof(struct virtio_pci_priv),
 };
 
 static struct pci_device_id virtio_pci_supported[] = {
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index fc3e19cfae..9314c0a03e 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -84,6 +84,6 @@ U_BOOT_DRIVER(virtio_rng) = {
 	.probe	= virtio_rng_probe,
 	.remove = virtio_reset,
 	.ops	= &virtio_rng_ops,
-	.priv_auto_alloc_size = sizeof(struct virtio_rng_priv),
+	.priv_auto	= sizeof(struct virtio_rng_priv),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 2a2abb9d49..aafb7beb94 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -204,7 +204,7 @@ U_BOOT_DRIVER(virtio_sandbox1) = {
 	.ops	= &virtio_sandbox1_ops,
 	.probe	= virtio_sandbox_probe,
 	.child_post_remove = virtio_sandbox_child_post_remove,
-	.priv_auto_alloc_size = sizeof(struct virtio_sandbox_priv),
+	.priv_auto	= sizeof(struct virtio_sandbox_priv),
 };
 
 /* this one without notify op */
@@ -231,5 +231,5 @@ U_BOOT_DRIVER(virtio_sandbox2) = {
 	.of_match = virtio_sandbox2_ids,
 	.ops	= &virtio_sandbox2_ops,
 	.probe	= virtio_sandbox_probe,
-	.priv_auto_alloc_size = sizeof(struct virtio_sandbox_priv),
+	.priv_auto	= sizeof(struct virtio_sandbox_priv),
 };