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 <[email protected]>

20 files changed, 20 insertions, 20 deletions

diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c
index e7b5c7decab..a229d490f36 100644
--- a/drivers/reset/reset-ast2500.c
+++ b/drivers/reset/reset-ast2500.c
@@ -105,5 +105,5 @@ U_BOOT_DRIVER(ast2500_reset) = {
 	.of_match = ast2500_reset_ids,
 	.probe = ast2500_reset_probe,
 	.ops = &ast2500_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct ast2500_reset_priv),
+	.priv_auto	= sizeof(struct ast2500_reset_priv),
 };
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 156703e0843..f69189822bf 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -84,5 +84,5 @@ U_BOOT_DRIVER(bcm6345_reset) = {
 	.of_match = bcm6345_reset_ids,
 	.ops = &bcm6345_reset_reset_ops,
 	.probe = bcm6345_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_reset_priv),
+	.priv_auto	= sizeof(struct bcm6345_reset_priv),
 };
diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 139bc5d73e0..3f9da8cc8d3 100644
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -102,5 +102,5 @@ U_BOOT_DRIVER(hisi_reset) = {
 	.of_match = hisi_reset_ids,
 	.ops = &hisi_reset_reset_ops,
 	.probe = hisi_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct hisi_reset_priv),
+	.priv_auto	= sizeof(struct hisi_reset_priv),
 };
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 0c8f276293d..8318d0a20b4 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -114,5 +114,5 @@ U_BOOT_DRIVER(hsdk_reset) = {
 	.of_match = hsdk_reset_dt_match,
 	.ops = &hsdk_reset_ops,
 	.probe = hsdk_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct hsdk_rst),
+	.priv_auto	= sizeof(struct hsdk_rst),
 };
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 96916b644ad..e5085ae17c4 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -312,5 +312,5 @@ U_BOOT_DRIVER(imx7_reset) = {
 	.of_match = imx7_reset_ids,
 	.ops = &imx7_reset_reset_ops,
 	.probe = imx7_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct imx7_reset_priv),
+	.priv_auto	= sizeof(struct imx7_reset_priv),
 };
diff --git a/drivers/reset/reset-ipq4019.c b/drivers/reset/reset-ipq4019.c
index f216db4ce5c..15858f3cb1e 100644
--- a/drivers/reset/reset-ipq4019.c
+++ b/drivers/reset/reset-ipq4019.c
@@ -169,5 +169,5 @@ U_BOOT_DRIVER(ipq4019_reset) = {
 	.of_match = ipq4019_reset_ids,
 	.ops = &ipq4019_reset_ops,
 	.probe = ipq4019_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct ipq4019_reset_priv),
+	.priv_auto	= sizeof(struct ipq4019_reset_priv),
 };
diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 97d3d575927..b97a21f6717 100644
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -102,5 +102,5 @@ U_BOOT_DRIVER(mediatek_reset) = {
 	.id = UCLASS_RESET,
 	.probe = mediatek_reset_probe,
 	.ops = &mediatek_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct mediatek_reset_priv),
+	.priv_auto	= sizeof(struct mediatek_reset_priv),
 };
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 4e3327898e2..d4e0745d0e0 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -89,5 +89,5 @@ U_BOOT_DRIVER(meson_reset) = {
 	.of_match = meson_reset_ids,
 	.probe = meson_reset_probe,
 	.ops = &meson_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct meson_reset_priv),
+	.priv_auto	= sizeof(struct meson_reset_priv),
 };
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index bc20e3335c5..18a4ecad4f0 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -80,6 +80,6 @@ U_BOOT_DRIVER(mtmips_reset) = {
 	.of_match = mtmips_reset_ids,
 	.ofdata_to_platdata = mtmips_reset_ofdata_to_platdata,
 	.probe = mtmips_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct mtmips_reset_priv),
+	.priv_auto	= sizeof(struct mtmips_reset_priv),
 	.ops = &mtmips_reset_ops,
 };
diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 80925556508..e5e9918c0c1 100644
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -131,5 +131,5 @@ U_BOOT_DRIVER(rockchip_reset) = {
 	.id = UCLASS_RESET,
 	.probe = rockchip_reset_probe,
 	.ops = &rockchip_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct rockchip_reset_priv),
+	.priv_auto	= sizeof(struct rockchip_reset_priv),
 };
diff --git a/drivers/reset/reset-sifive.c b/drivers/reset/reset-sifive.c
index 527757f8533..f6110d85f9f 100644
--- a/drivers/reset/reset-sifive.c
+++ b/drivers/reset/reset-sifive.c
@@ -114,5 +114,5 @@ U_BOOT_DRIVER(sifive_reset) = {
 	.id		= UCLASS_RESET,
 	.ops		= &sifive_reset_ops,
 	.probe		= sifive_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sifive_reset_priv),
+	.priv_auto	= sizeof(struct sifive_reset_priv),
 };
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 1849db4da9b..c64c9b5917c 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -166,7 +166,7 @@ U_BOOT_DRIVER(socfpga_reset) = {
 	.of_match = socfpga_reset_match,
 	.bind = socfpga_reset_bind,
 	.probe = socfpga_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct socfpga_reset_data),
+	.priv_auto	= sizeof(struct socfpga_reset_data),
 	.ops = &socfpga_reset_ops,
 	.remove = socfpga_reset_remove,
 	.flags	= DM_FLAG_OS_PREPARE,
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 05f7f599ce3..1db321ce1fd 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -123,5 +123,5 @@ U_BOOT_DRIVER(sunxi_reset) = {
 	.id		= UCLASS_RESET,
 	.ops		= &sunxi_reset_ops,
 	.probe		= sunxi_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sunxi_reset_priv),
+	.priv_auto	= sizeof(struct sunxi_reset_priv),
 };
diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c
index 8520227d551..ff387ab6b22 100644
--- a/drivers/reset/reset-syscon.c
+++ b/drivers/reset/reset-syscon.c
@@ -76,6 +76,6 @@ U_BOOT_DRIVER(syscon_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = syscon_reset_ids,
 	.probe = syscon_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct syscon_reset_priv),
+	.priv_auto	= sizeof(struct syscon_reset_priv),
 	.ops = &syscon_reset_ops,
 };
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index 95cd3885876..d8510a4abb2 100644
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -205,6 +205,6 @@ U_BOOT_DRIVER(ti_sci_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = ti_sci_reset_of_match,
 	.probe = ti_sci_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_reset_data),
+	.priv_auto	= sizeof(struct ti_sci_reset_data),
 	.ops = &ti_sci_reset_ops,
 };
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index fe1bd5541bd..2694d130b64 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -372,6 +372,6 @@ U_BOOT_DRIVER(uniphier_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = uniphier_reset_match,
 	.probe = uniphier_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_reset_priv),
+	.priv_auto	= sizeof(struct uniphier_reset_priv),
 	.ops = &uniphier_reset_ops,
 };
diff --git a/drivers/reset/sandbox-reset-test.c b/drivers/reset/sandbox-reset-test.c
index 10e02f10362..51b79810c89 100644
--- a/drivers/reset/sandbox-reset-test.c
+++ b/drivers/reset/sandbox-reset-test.c
@@ -120,5 +120,5 @@ U_BOOT_DRIVER(sandbox_reset_test) = {
 	.name = "sandbox_reset_test",
 	.id = UCLASS_MISC,
 	.of_match = sandbox_reset_test_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_reset_test),
+	.priv_auto	= sizeof(struct sandbox_reset_test),
 };
diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index 08008d875ab..97b1b92e4a6 100644
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -99,7 +99,7 @@ U_BOOT_DRIVER(sandbox_reset) = {
 	.of_match = sandbox_reset_ids,
 	.bind = sandbox_reset_bind,
 	.probe = sandbox_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_reset),
+	.priv_auto	= sizeof(struct sandbox_reset),
 	.ops = &sandbox_reset_reset_ops,
 };
 
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index ac3a99f9bff..b03638d34d5 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -336,6 +336,6 @@ U_BOOT_DRIVER(sti_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = sti_reset_ids,
 	.probe = sti_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sti_reset),
+	.priv_auto	= sizeof(struct sti_reset),
 	.ops = &sti_reset_ops,
 };
diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index 20c36a99eb3..4a05ab65aeb 100644
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -100,6 +100,6 @@ U_BOOT_DRIVER(stm32_rcc_reset) = {
 	.name			= "stm32_rcc_reset",
 	.id			= UCLASS_RESET,
 	.probe			= stm32_reset_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_reset_priv),
+	.priv_auto	= sizeof(struct stm32_reset_priv),
 	.ops			= &stm32_reset_ops,
 };