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>

18 files changed, 19 insertions, 19 deletions

diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 5da8e56505..dd97a17a70 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -196,6 +196,6 @@ U_BOOT_DRIVER(a37xx_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = a37xx_wdt_ids,
 	.probe = a37xx_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct a37xx_wdt),
+	.priv_auto	= sizeof(struct a37xx_wdt),
 	.ops = &a37xx_wdt_ops,
 };
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 9b83d2ad44..f6173fd568 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -124,7 +124,7 @@ U_BOOT_DRIVER(ast_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = ast_wdt_ids,
 	.probe = ast_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct ast_wdt_priv),
+	.priv_auto	= sizeof(struct ast_wdt_priv),
 	.ofdata_to_platdata = ast_wdt_ofdata_to_platdata,
 	.ops = &ast_wdt_ops,
 };
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 33f5c351d5..10d9974106 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -117,7 +117,7 @@ U_BOOT_DRIVER(atmel_at91sam9260_wdt) = {
 	.name = "atmel_at91sam9260_wdt",
 	.id = UCLASS_WDT,
 	.of_match = at91_wdt_ids,
-	.priv_auto_alloc_size = sizeof(struct at91_wdt_priv),
+	.priv_auto	= sizeof(struct at91_wdt_priv),
 	.ops = &at91_wdt_ops,
 	.probe = at91_wdt_probe,
 };
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index ee77f49a94..677b1347ca 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -112,6 +112,6 @@ U_BOOT_DRIVER(wdt_bcm6345) = {
 	.id = UCLASS_WDT,
 	.of_match = bcm6345_wdt_ids,
 	.ops = &bcm6345_wdt_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_wdt_priv),
+	.priv_auto	= sizeof(struct bcm6345_wdt_priv),
 	.probe = bcm6345_wdt_probe,
 };
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index 2abd5524f6..d4f8240491 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -260,7 +260,7 @@ U_BOOT_DRIVER(cdns_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = cdns_wdt_ids,
 	.probe = cdns_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct cdns_wdt_priv),
+	.priv_auto	= sizeof(struct cdns_wdt_priv),
 	.ofdata_to_platdata = cdns_wdt_ofdata_to_platdata,
 	.ops = &cdns_wdt_ops,
 };
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index 7caa6c550c..c020324973 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -168,7 +168,7 @@ U_BOOT_DRIVER(designware_wdt) = {
 	.name = "designware_wdt",
 	.id = UCLASS_WDT,
 	.of_match = designware_wdt_ids,
-	.priv_auto_alloc_size = sizeof(struct designware_wdt_priv),
+	.priv_auto	= sizeof(struct designware_wdt_priv),
 	.probe = designware_wdt_probe,
 	.ops = &designware_wdt_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index b90c2daece..5e0a096ce5 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -169,7 +169,7 @@ U_BOOT_DRIVER(imx_wdt) = {
 	.of_match	= imx_wdt_ids,
 	.probe		= imx_wdt_probe,
 	.ops		= &imx_wdt_ops,
-	.priv_auto_alloc_size = sizeof(struct imx_wdt_priv),
+	.priv_auto	= sizeof(struct imx_wdt_priv),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
 #endif
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index 1cd8866ef8..8b5ed28ebd 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -98,6 +98,6 @@ U_BOOT_DRIVER(mt762x_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = mt762x_wdt_ids,
 	.probe = mt762x_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct mt762x_wdt),
+	.priv_auto	= sizeof(struct mt762x_wdt),
 	.ops = &mt762x_wdt_ops,
 };
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index a636cff354..b098b2e3cf 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -152,7 +152,7 @@ U_BOOT_DRIVER(mtk_wdt) = {
 	.name = "mtk_wdt",
 	.id = UCLASS_WDT,
 	.of_match = mtk_wdt_ids,
-	.priv_auto_alloc_size = sizeof(struct mtk_wdt_priv),
+	.priv_auto	= sizeof(struct mtk_wdt_priv),
 	.probe = mtk_wdt_probe,
 	.ops = &mtk_wdt_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/watchdog/octeontx_wdt.c b/drivers/watchdog/octeontx_wdt.c
index 88708dc5e1..5f586ef683 100644
--- a/drivers/watchdog/octeontx_wdt.c
+++ b/drivers/watchdog/octeontx_wdt.c
@@ -137,7 +137,7 @@ U_BOOT_DRIVER(wdt_octeontx) = {
 	.id = UCLASS_WDT,
 	.of_match = octeontx_wdt_ids,
 	.ops = &octeontx_wdt_ops,
-	.priv_auto_alloc_size = sizeof(struct octeontx_wdt),
+	.priv_auto	= sizeof(struct octeontx_wdt),
 	.probe = octeontx_wdt_probe,
 	.remove = octeontx_wdt_remove,
 	.flags = DM_FLAG_OS_PREPARE,
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 9059a4c610..db9a7d7730 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -263,6 +263,6 @@ U_BOOT_DRIVER(omap3_wdt) = {
 	.of_match = omap3_wdt_ids,
 	.ops = &omap3_wdt_ops,
 	.probe = omap3_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct omap3_wdt_priv),
+	.priv_auto	= sizeof(struct omap3_wdt_priv),
 };
 #endif /* !CONFIG_IS_ENABLED(WDT) */
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index d33e2ac3dc..5eff30e9c4 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -186,7 +186,7 @@ U_BOOT_DRIVER(orion_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = orion_wdt_ids,
 	.probe = orion_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct orion_wdt_priv),
+	.priv_auto	= sizeof(struct orion_wdt_priv),
 	.ofdata_to_platdata = orion_wdt_ofdata_to_platdata,
 	.ops = &orion_wdt_ops,
 };
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index ebe29c7409..f64a39f657 100644
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -118,6 +118,6 @@ U_BOOT_DRIVER(rti_wdt) = {
 	.of_match = rti_wdt_ids,
 	.ops = &rti_wdt_ops,
 	.probe = rti_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct rti_wdt_priv),
+	.priv_auto	= sizeof(struct rti_wdt_priv),
 	.flags = DM_FLAG_REMOVE_WITH_PD_ON,
 };
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 2eae431ba6..f7b3fbd1d2 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -125,7 +125,7 @@ U_BOOT_DRIVER(sbsa_gwdt) = {
 	.id = UCLASS_WDT,
 	.of_match = sbsa_gwdt_ids,
 	.probe = sbsa_gwdt_probe,
-	.priv_auto_alloc_size = sizeof(struct sbsa_gwdt_priv),
+	.priv_auto	= sizeof(struct sbsa_gwdt_priv),
 	.ofdata_to_platdata = sbsa_gwdt_ofdata_to_platdata,
 	.ops = &sbsa_gwdt_ops,
 };
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 23fef2147f..694a9805a7 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -142,7 +142,7 @@ U_BOOT_DRIVER(sp805_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = sp805_wdt_ids,
 	.probe = sp805_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct sp805_wdt_priv),
+	.priv_auto	= sizeof(struct sp805_wdt_priv),
 	.ofdata_to_platdata = sp805_wdt_ofdata_to_platdata,
 	.ops = &sp805_wdt_ops,
 };
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index f673fce327..53586fdbfc 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -131,7 +131,7 @@ U_BOOT_DRIVER(stm32mp_wdt) = {
 	.name = "stm32mp-wdt",
 	.id = UCLASS_WDT,
 	.of_match = stm32mp_wdt_match,
-	.priv_auto_alloc_size = sizeof(struct stm32mp_wdt_priv),
+	.priv_auto	= sizeof(struct stm32mp_wdt_priv),
 	.probe = stm32mp_wdt_probe,
 	.ops = &stm32mp_wdt_ops,
 };
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index ea4311c8ce..a7fb3b4630 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -123,7 +123,7 @@ U_BOOT_DRIVER(xlnx_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = xlnx_wdt_ids,
 	.probe = xlnx_wdt_probe,
-	.platdata_auto_alloc_size = sizeof(struct xlnx_wdt_platdata),
+	.platdata_auto	= sizeof(struct xlnx_wdt_platdata),
 	.ofdata_to_platdata = xlnx_wdt_ofdata_to_platdata,
 	.ops = &xlnx_wdt_ops,
 };
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index d8a585a483..9505874ba4 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -172,8 +172,8 @@ U_BOOT_DRIVER(xlnx_wwdt) = {
 	.id = UCLASS_WDT,
 	.of_match = xlnx_wwdt_ids,
 	.probe = xlnx_wwdt_probe,
-	.priv_auto_alloc_size = sizeof(struct xlnx_wwdt_priv),
-	.platdata_auto_alloc_size = sizeof(struct xlnx_wwdt_platdata),
+	.priv_auto	= sizeof(struct xlnx_wwdt_priv),
+	.platdata_auto	= sizeof(struct xlnx_wwdt_platdata),
 	.ofdata_to_platdata = xlnx_wwdt_ofdata_to_platdata,
 	.ops = &xlnx_wwdt_ops,
 };