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]>

18 files changed, 19 insertions, 19 deletions

diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index 23ad5b2b67a..f014ed65795 100644
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = ag101p_timer_ids,
 	.ofdata_to_platdata = atftme_timer_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata),
+	.platdata_auto	= sizeof(struct atftmr_timer_platdata),
 	.probe = atftmr_timer_probe,
 	.ops	= &ag101p_timer_ops,
 };
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index ccc164ee176..ad50380f04d 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -88,7 +88,7 @@ U_BOOT_DRIVER(altera_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = altera_timer_ids,
 	.ofdata_to_platdata = altera_timer_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_timer_platdata),
+	.platdata_auto	= sizeof(struct altera_timer_platdata),
 	.probe = altera_timer_probe,
 	.ops	= &altera_timer_ops,
 };
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 2dea9f40cba..904950457c7 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -105,5 +105,5 @@ U_BOOT_DRIVER(arc_timer) = {
 	.of_match = arc_timer_ids,
 	.probe = arc_timer_probe,
 	.ops	= &arc_timer_ops,
-	.priv_auto_alloc_size = sizeof(struct arc_timer_priv),
+	.priv_auto	= sizeof(struct arc_timer_priv),
 };
diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c
index 35369a4087f..9ad446054ec 100644
--- a/drivers/timer/ast_timer.c
+++ b/drivers/timer/ast_timer.c
@@ -86,7 +86,7 @@ U_BOOT_DRIVER(ast_timer) = {
 	.id = UCLASS_TIMER,
 	.of_match = ast_timer_ids,
 	.probe = ast_timer_probe,
-	.priv_auto_alloc_size = sizeof(struct ast_timer_priv),
+	.priv_auto	= sizeof(struct ast_timer_priv),
 	.ofdata_to_platdata = ast_timer_ofdata_to_platdata,
 	.ops = &ast_timer_ops,
 };
diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c
index fcb8a453581..e574eabebc0 100644
--- a/drivers/timer/atcpit100_timer.c
+++ b/drivers/timer/atcpit100_timer.c
@@ -106,7 +106,7 @@ U_BOOT_DRIVER(atcpit100_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = atcpit_timer_ids,
 	.ofdata_to_platdata = atcpit_timer_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct atcpit_timer_platdata),
+	.platdata_auto	= sizeof(struct atcpit_timer_platdata),
 	.probe = atcpit_timer_probe,
 	.ops	= &atcpit_timer_ops,
 };
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 9f0ad1d703f..a0daf49dad2 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -81,7 +81,7 @@ U_BOOT_DRIVER(atmel_pit) = {
 	.id	= UCLASS_TIMER,
 	.of_match = atmel_pit_ids,
 	.ofdata_to_platdata = atmel_pit_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct atmel_pit_platdata),
+	.platdata_auto	= sizeof(struct atmel_pit_platdata),
 	.probe	= atmel_pit_probe,
 	.ops	= &atmel_pit_ops,
 };
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index bebb2c2e904..7107bf2472a 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -110,7 +110,7 @@ U_BOOT_DRIVER(cadence_ttc) = {
 	.id = UCLASS_TIMER,
 	.of_match = cadence_ttc_ids,
 	.ofdata_to_platdata = cadence_ttc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct cadence_ttc_priv),
+	.priv_auto	= sizeof(struct cadence_ttc_priv),
 	.probe = cadence_ttc_probe,
 	.ops = &cadence_ttc_ops,
 };
diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c
index 68bc258131b..8ef36d4c2b6 100644
--- a/drivers/timer/dw-apb-timer.c
+++ b/drivers/timer/dw-apb-timer.c
@@ -99,5 +99,5 @@ U_BOOT_DRIVER(dw_apb_timer) = {
 	.of_match	= dw_apb_timer_ids,
 	.ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata,
 	.remove		= dw_apb_timer_remove,
-	.priv_auto_alloc_size = sizeof(struct dw_apb_timer_priv),
+	.priv_auto	= sizeof(struct dw_apb_timer_priv),
 };
diff --git a/drivers/timer/mchp-pit64b-timer.c b/drivers/timer/mchp-pit64b-timer.c
index ad962098b3d..c9806d7eeeb 100644
--- a/drivers/timer/mchp-pit64b-timer.c
+++ b/drivers/timer/mchp-pit64b-timer.c
@@ -100,7 +100,7 @@ U_BOOT_DRIVER(mchp_pit64b) = {
 	.name	= "mchp-pit64b",
 	.id	= UCLASS_TIMER,
 	.of_match = mchp_pit64b_ids,
-	.priv_auto_alloc_size = sizeof(struct mchp_pit64b_priv),
+	.priv_auto	= sizeof(struct mchp_pit64b_priv),
 	.probe	= mchp_pit64b_probe,
 	.ops	= &mchp_pit64b_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 6139252a73c..9b1daaadebf 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -244,5 +244,5 @@ U_BOOT_DRIVER(mpc83xx_timer) = {
 	.of_match = mpc83xx_timer_ids,
 	.probe = mpc83xx_timer_probe,
 	.ops	= &mpc83xx_timer_ops,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_timer_priv),
+	.priv_auto	= sizeof(struct mpc83xx_timer_priv),
 };
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 74e9ea34ffa..448a76a7e1f 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -78,7 +78,7 @@ U_BOOT_DRIVER(mtk_timer) = {
 	.name = "mtk_timer",
 	.id = UCLASS_TIMER,
 	.of_match = mtk_timer_ids,
-	.priv_auto_alloc_size = sizeof(struct mtk_timer_priv),
+	.priv_auto	= sizeof(struct mtk_timer_priv),
 	.probe = mtk_timer_probe,
 	.ops = &mtk_timer_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index d7f7ca4effd..417b419d467 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -107,7 +107,7 @@ U_BOOT_DRIVER(nomadik_mtu) = {
 	.name = "nomadik_mtu",
 	.id = UCLASS_TIMER,
 	.of_match = nomadik_mtu_ids,
-	.priv_auto_alloc_size = sizeof(struct nomadik_mtu_priv),
+	.priv_auto	= sizeof(struct nomadik_mtu_priv),
 	.probe = nomadik_mtu_probe,
 	.ops = &nomadik_mtu_ops,
 };
diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c
index 4eecb3e64d2..a1029ac5061 100644
--- a/drivers/timer/omap-timer.c
+++ b/drivers/timer/omap-timer.c
@@ -100,7 +100,7 @@ U_BOOT_DRIVER(omap_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = omap_timer_ids,
 	.ofdata_to_platdata = omap_timer_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct omap_timer_priv),
+	.priv_auto	= sizeof(struct omap_timer_priv),
 	.probe = omap_timer_probe,
 	.ops	= &omap_timer_ops,
 };
diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c
index bb0636a0719..261cac5de38 100644
--- a/drivers/timer/ostm_timer.c
+++ b/drivers/timer/ostm_timer.c
@@ -88,5 +88,5 @@ U_BOOT_DRIVER(ostm_timer) = {
 	.probe		= ostm_probe,
 	.of_match	= ostm_ids,
 	.ofdata_to_platdata = ostm_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ostm_priv),
+	.priv_auto	= sizeof(struct ostm_priv),
 };
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 53cdf09810d..dab6b12782e 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -165,9 +165,9 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = {
 	.of_match = rockchip_timer_ids,
 	.probe = rockchip_timer_probe,
 	.ops	= &rockchip_timer_ops,
-	.priv_auto_alloc_size = sizeof(struct rockchip_timer_priv),
+	.priv_auto	= sizeof(struct rockchip_timer_priv),
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rockchip_timer_plat),
+	.platdata_auto	= sizeof(struct rockchip_timer_plat),
 #endif
 	.ofdata_to_platdata = rockchip_clk_ofdata_to_platdata,
 };
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index e6843ebb337..1ab183c143c 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -79,7 +79,7 @@ U_BOOT_DRIVER(sti_timer) = {
 	.name = "sti_timer",
 	.id = UCLASS_TIMER,
 	.of_match = sti_timer_ids,
-	.priv_auto_alloc_size = sizeof(struct sti_timer_priv),
+	.priv_auto	= sizeof(struct sti_timer_priv),
 	.probe = sti_timer_probe,
 	.ops = &sti_timer_ops,
 };
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index f517d5e61f2..1b47e90f8c9 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -129,7 +129,7 @@ U_BOOT_DRIVER(stm32_timer) = {
 	.name = "stm32_timer",
 	.id = UCLASS_TIMER,
 	.of_match = stm32_timer_ids,
-	.priv_auto_alloc_size = sizeof(struct stm32_timer_priv),
+	.priv_auto	= sizeof(struct stm32_timer_priv),
 	.probe = stm32_timer_probe,
 	.ops = &stm32_timer_ops,
 };
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 62d0e860e80..f25f5613d4c 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -176,5 +176,5 @@ UCLASS_DRIVER(timer) = {
 	.pre_probe	= timer_pre_probe,
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_probe	= timer_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct timer_dev_priv),
+	.per_device_auto	= sizeof(struct timer_dev_priv),
 };