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>

38 files changed, 51 insertions, 51 deletions

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 35b76f53f9..173ac240ea 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -119,7 +119,7 @@ U_BOOT_DRIVER(altera_jtaguart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = altera_jtaguart_ids,
 	.ofdata_to_platdata = altera_jtaguart_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_jtaguart_platdata),
+	.platdata_auto	= sizeof(struct altera_jtaguart_platdata),
 	.probe = altera_jtaguart_probe,
 	.ops	= &altera_jtaguart_ops,
 };
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 0be5cd75c8..eec70f6000 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -112,7 +112,7 @@ U_BOOT_DRIVER(altera_uart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = altera_uart_ids,
 	.ofdata_to_platdata = altera_uart_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_uart_platdata),
+	.platdata_auto	= sizeof(struct altera_uart_platdata),
 	.probe = altera_uart_probe,
 	.ops	= &altera_uart_ops,
 };
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f759ea8893..45e6554f59 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -304,14 +304,14 @@ U_BOOT_DRIVER(serial_atmel) = {
 	.id	= UCLASS_SERIAL,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = atmel_serial_ids,
-	.platdata_auto_alloc_size = sizeof(struct atmel_serial_platdata),
+	.platdata_auto	= sizeof(struct atmel_serial_platdata),
 #endif
 	.probe = atmel_serial_probe,
 	.ops	= &atmel_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags = DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size	= sizeof(struct atmel_serial_priv),
+	.priv_auto	= sizeof(struct atmel_serial_priv),
 };
 #endif
 
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 7d31c6d4a1..80b63807d6 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -107,6 +107,6 @@ U_BOOT_DRIVER(lpc32xx_hsuart) = {
 	.id	= UCLASS_SERIAL,
 	.probe	= lpc32xx_hsuart_probe,
 	.ops	= &lpc32xx_hsuart_ops,
-	.priv_auto_alloc_size = sizeof(struct lpc32xx_hsuart_priv),
+	.priv_auto	= sizeof(struct lpc32xx_hsuart_priv),
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 702109b23b..9b83f88187 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -611,9 +611,9 @@ U_BOOT_DRIVER(ns16550_serial) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = ns16550_serial_ids,
 	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
 #endif
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 8e269a205d..03d16c73a3 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -242,8 +242,8 @@ U_BOOT_DRIVER(sandbox_serial) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = sandbox_serial_ids,
 	.ofdata_to_platdata = sandbox_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sandbox_serial_platdata),
-	.priv_auto_alloc_size = sizeof(struct sandbox_serial_priv),
+	.platdata_auto	= sizeof(struct sandbox_serial_platdata),
+	.priv_auto	= sizeof(struct sandbox_serial_priv),
 	.probe = sandbox_serial_probe,
 	.remove = sandbox_serial_remove,
 	.ops	= &sandbox_serial_ops,
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index f3c25d4216..b6457242de 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -507,6 +507,6 @@ UCLASS_DRIVER(serial) = {
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_probe	= serial_post_probe,
 	.pre_remove	= serial_pre_remove,
-	.per_device_auto_alloc_size = sizeof(struct serial_dev_priv),
+	.per_device_auto	= sizeof(struct serial_dev_priv),
 };
 #endif
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 9de94b69bd..da06bef97c 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -188,7 +188,7 @@ U_BOOT_DRIVER(serial_ar933x) = {
 	.name   = "serial_ar933x",
 	.id = UCLASS_SERIAL,
 	.of_match = ar933x_serial_ids,
-	.priv_auto_alloc_size = sizeof(struct ar933x_serial_priv),
+	.priv_auto	= sizeof(struct ar933x_serial_priv),
 	.probe = ar933x_serial_probe,
 	.ops    = &ar933x_serial_ops,
 };
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 04063fbe39..52dce3505e 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_arc) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = arc_serial_ids,
 	.ofdata_to_platdata = arc_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct arc_serial_platdata),
+	.platdata_auto	= sizeof(struct arc_serial_platdata),
 	.probe = arc_serial_probe,
 	.ops	= &arc_serial_ops,
 };
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 8a4af87eb6..8cd533f808 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -194,11 +194,11 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = {
 	.name = "serial_bcm283x_mu",
 	.id = UCLASS_SERIAL,
 	.of_match = of_match_ptr(bcm283x_mu_serial_id),
-	.platdata_auto_alloc_size = sizeof(struct bcm283x_mu_serial_platdata),
+	.platdata_auto	= sizeof(struct bcm283x_mu_serial_platdata),
 	.probe = bcm283x_mu_serial_probe,
 	.ops = &bcm283x_mu_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD)
 	.flags = DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size = sizeof(struct bcm283x_mu_priv),
+	.priv_auto	= sizeof(struct bcm283x_mu_priv),
 };
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 923f402fbe..484a281811 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -92,10 +92,10 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(bcm283x_pl011_serial_id),
 	.probe	= bcm283x_pl011_serial_probe,
-	.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
+	.platdata_auto	= sizeof(struct pl01x_serial_platdata),
 	.ops	= &bcm283x_pl011_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size = sizeof(struct pl01x_priv),
+	.priv_auto	= sizeof(struct pl01x_priv),
 };
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 5b963ce45b..f08e91ff3b 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -262,7 +262,7 @@ U_BOOT_DRIVER(bcm6345_serial) = {
 	.id = UCLASS_SERIAL,
 	.of_match = bcm6345_serial_ids,
 	.probe = bcm6345_serial_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_serial_priv),
+	.priv_auto	= sizeof(struct bcm6345_serial_priv),
 	.ops = &bcm6345_serial_ops,
 };
 
diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
index ccab347514..08363c4920 100644
--- a/drivers/serial/serial_coreboot.c
+++ b/drivers/serial/serial_coreboot.c
@@ -37,8 +37,8 @@ U_BOOT_DRIVER(coreboot_uart) = {
 	.name	= "coreboot_uart",
 	.id	= UCLASS_SERIAL,
 	.of_match	= coreboot_serial_ids,
-	.priv_auto_alloc_size = sizeof(struct NS16550),
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
 	.ofdata_to_platdata  = coreboot_ofdata_to_platdata,
 	.probe	= ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index cc20673efe..a0ae2fe0a4 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -159,7 +159,7 @@ U_BOOT_DRIVER(serial_cortina) = {
 	.id = UCLASS_SERIAL,
 	.of_match = ca_serial_ids,
 	.ofdata_to_platdata = ca_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ca_uart_priv),
+	.priv_auto	= sizeof(struct ca_uart_priv),
 	.probe = ca_serial_probe,
 	.ops = &ca_serial_ops
 };
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index b152e10258..33ddbd6080 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -150,7 +150,7 @@ U_BOOT_DRIVER(serial_efi) = {
 	.name	= "serial_efi",
 	.id	= UCLASS_SERIAL,
 	.of_match = serial_efi_ids,
-	.priv_auto_alloc_size = sizeof(struct serial_efi_priv),
+	.priv_auto	= sizeof(struct serial_efi_priv),
 	.probe = serial_efi_probe,
 	.ops	= &serial_efi_ops,
 };
diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c
index 39bd40e68b..f9281590cd 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -60,8 +60,8 @@ U_BOOT_DRIVER(serial_intel_mid) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = mid_serial_ids,
 	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe	= mid_serial_probe,
 	.ops	= &ns16550_serial_ops,
 };
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index 83dc96c449..af7b842927 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -190,7 +190,7 @@ U_BOOT_DRIVER(serial_linflex) = {
 	.probe = linflex_serial_probe,
 	.ops	= &linflex_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
-	.priv_auto_alloc_size	= sizeof(struct linflex_serial_priv),
+	.priv_auto	= sizeof(struct linflex_serial_priv),
 };
 
 #ifdef CONFIG_DEBUG_UART_LINFLEXUART
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 95cbe63b3d..b26f401cb7 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -567,7 +567,7 @@ U_BOOT_DRIVER(serial_lpuart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = lpuart_serial_ids,
 	.ofdata_to_platdata = lpuart_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata),
+	.platdata_auto	= sizeof(struct lpuart_serial_platdata),
 	.probe = lpuart_serial_probe,
 	.ops	= &lpuart_serial_ops,
 };
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 402fd5343c..513013ca5a 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_coldfire) = {
 	.id = UCLASS_SERIAL,
 	.of_match = coldfire_serial_ids,
 	.ofdata_to_platdata = coldfire_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct coldfire_serial_platdata),
+	.platdata_auto	= sizeof(struct coldfire_serial_platdata),
 	.probe = coldfire_serial_probe,
 	.ops = &coldfire_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 496a2ca2c3..73a10f89c0 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -169,7 +169,7 @@ U_BOOT_DRIVER(serial_meson) = {
 	.probe		= meson_serial_probe,
 	.ops		= &meson_serial_ops,
 	.ofdata_to_platdata = meson_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct meson_serial_platdata),
+	.platdata_auto	= sizeof(struct meson_serial_platdata),
 };
 
 #ifdef CONFIG_DEBUG_UART_MESON
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index c8946c3aae..3b088b3b23 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_msm) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = msm_serial_ids,
 	.ofdata_to_platdata = msm_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct msm_serial_data),
+	.priv_auto	= sizeof(struct msm_serial_data),
 	.probe = msm_serial_probe,
 	.ops	= &msm_serial_ops,
 };
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 778a04d87e..afa6e8c8a9 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -268,7 +268,7 @@ U_BOOT_DRIVER(serial_mtk) = {
 	.id = UCLASS_SERIAL,
 	.of_match = mtk_serial_ids,
 	.ofdata_to_platdata = mtk_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct mtk_serial_priv),
+	.priv_auto	= sizeof(struct mtk_serial_priv),
 	.probe = mtk_serial_probe,
 	.ops = &mtk_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index fb43f88eaf..7756b0d929 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_mvebu) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = mvebu_serial_ids,
 	.ofdata_to_platdata = mvebu_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_platdata),
+	.platdata_auto	= sizeof(struct mvebu_platdata),
 	.probe	= mvebu_serial_probe,
 	.ops	= &mvebu_serial_ops,
 };
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index de6cefcd3a..83f2316a64 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -358,7 +358,7 @@ U_BOOT_DRIVER(serial_mxc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = mxc_serial_ids,
 	.ofdata_to_platdata = mxc_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mxc_serial_platdata),
+	.platdata_auto	= sizeof(struct mxc_serial_platdata),
 #endif
 	.probe = mxc_serial_probe,
 	.ops	= &mxc_serial_ops,
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index f7997fc788..296c5fd45c 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -158,9 +158,9 @@ U_BOOT_DRIVER(omap_serial) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_serial_ids,
 	.ofdata_to_platdata = omap_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
 #endif
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 2651a45a7f..0e67bc124b 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -130,7 +130,7 @@ U_BOOT_DRIVER(serial_owl) = {
 	.id = UCLASS_SERIAL,
 	.of_match = owl_serial_ids,
 	.ofdata_to_platdata = owl_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size =	sizeof(struct owl_serial_priv),
+	.priv_auto	=	sizeof(struct owl_serial_priv),
 	.probe = owl_serial_probe,
 	.ops = &owl_serial_ops,
 };
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index a492063e39..5d1dbe7a91 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -178,7 +178,7 @@ U_BOOT_DRIVER(pic32_serial) = {
 	.of_match	= pic32_uart_ids,
 	.probe		= pic32_uart_probe,
 	.ops		= &pic32_uart_ops,
-	.priv_auto_alloc_size = sizeof(struct pic32_uart_priv),
+	.priv_auto	= sizeof(struct pic32_uart_priv),
 };
 
 #ifdef CONFIG_DEBUG_UART_PIC32
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index d9e35c6a2b..4e201287bf 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -388,11 +388,11 @@ U_BOOT_DRIVER(serial_pl01x) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(pl01x_serial_id),
 	.ofdata_to_platdata = of_match_ptr(pl01x_serial_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
+	.platdata_auto	= sizeof(struct pl01x_serial_platdata),
 	.probe = pl01x_serial_probe,
 	.ops	= &pl01x_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
-	.priv_auto_alloc_size = sizeof(struct pl01x_priv),
+	.priv_auto	= sizeof(struct pl01x_priv),
 };
 
 #endif
diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
index b1718f72d1..74245f8d5d 100644
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -42,8 +42,8 @@ static int rockchip_serial_probe(struct udevice *dev)
 U_BOOT_DRIVER(rockchip_rk3188_uart) = {
 	.name	= "rockchip_rk3188_uart",
 	.id	= UCLASS_SERIAL,
-	.priv_auto_alloc_size = sizeof(struct NS16550),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata),
+	.priv_auto	= sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct rockchip_uart_platdata),
 	.probe	= rockchip_serial_probe,
 	.ops	= &ns16550_serial_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
@@ -52,8 +52,8 @@ U_BOOT_DRIVER(rockchip_rk3188_uart) = {
 U_BOOT_DRIVER(rockchip_rk3288_uart) = {
 	.name	= "rockchip_rk3288_uart",
 	.id	= UCLASS_SERIAL,
-	.priv_auto_alloc_size = sizeof(struct NS16550),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata),
+	.priv_auto	= sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct rockchip_uart_platdata),
 	.probe	= rockchip_serial_probe,
 	.ops	= &ns16550_serial_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 9bb2be21e7..df50210dbd 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -208,7 +208,7 @@ U_BOOT_DRIVER(serial_s5p) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = s5p_serial_ids,
 	.ofdata_to_platdata = s5p_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct s5p_serial_platdata),
+	.platdata_auto	= sizeof(struct s5p_serial_platdata),
 	.probe = s5p_serial_probe,
 	.ops	= &s5p_serial_ops,
 };
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e27d256574..4e37ab0c31 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -240,13 +240,13 @@ U_BOOT_DRIVER(serial_sh) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(sh_serial_id),
 	.ofdata_to_platdata = of_match_ptr(sh_serial_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct sh_serial_platdata),
+	.platdata_auto	= sizeof(struct sh_serial_platdata),
 	.probe	= sh_serial_probe,
 	.ops	= &sh_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size = sizeof(struct uart_port),
+	.priv_auto	= sizeof(struct uart_port),
 };
 
 #else /* CONFIG_DM_SERIAL */
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index fcc47fb348..710bb72363 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -202,7 +202,7 @@ U_BOOT_DRIVER(serial_sifive) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = sifive_serial_ids,
 	.ofdata_to_platdata = sifive_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sifive_uart_platdata),
+	.platdata_auto	= sizeof(struct sifive_uart_platdata),
 	.probe = sifive_serial_probe,
 	.ops	= &sifive_serial_ops,
 };
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 33ff396bff..ded684abfb 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -206,6 +206,6 @@ U_BOOT_DRIVER(serial_sti_asc) = {
 	.of_match = sti_serial_of_match,
 	.ops = &sti_asc_serial_ops,
 	.probe = sti_asc_serial_probe,
-	.priv_auto_alloc_size = sizeof(struct sti_asc_serial),
+	.priv_auto	= sizeof(struct sti_asc_serial),
 };
 
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index cab0db2c96..a8e0320750 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -241,7 +241,7 @@ U_BOOT_DRIVER(serial_stm32) = {
 	.id = UCLASS_SERIAL,
 	.of_match = of_match_ptr(stm32_serial_id),
 	.ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct stm32x7_serial_platdata),
+	.platdata_auto	= sizeof(struct stm32x7_serial_platdata),
 	.ops = &stm32_serial_ops,
 	.probe = stm32_serial_probe,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index a098028ca0..27e4b92c39 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -172,6 +172,6 @@ U_BOOT_DRIVER(uniphier_serial) = {
 	.id = UCLASS_SERIAL,
 	.of_match = uniphier_uart_of_match,
 	.probe = uniphier_serial_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_serial_priv),
+	.priv_auto	= sizeof(struct uniphier_serial_priv),
 	.ops = &uniphier_serial_ops,
 };
diff --git a/drivers/serial/serial_xen.c b/drivers/serial/serial_xen.c
index ba6504b947..dbb7b22b51 100644
--- a/drivers/serial/serial_xen.c
+++ b/drivers/serial/serial_xen.c
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_xen) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match		= xen_serial_ids,
 #endif
-	.priv_auto_alloc_size	= sizeof(struct xen_uart_priv),
+	.priv_auto	= sizeof(struct xen_uart_priv),
 	.probe			= xen_serial_probe,
 	.ops			= &xen_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 236ab860ad..bc039492ef 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -132,7 +132,7 @@ U_BOOT_DRIVER(serial_uartlite) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = uartlite_serial_ids,
 	.ofdata_to_platdata = uartlite_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct uartlite_platdata),
+	.platdata_auto	= sizeof(struct uartlite_platdata),
 	.probe = uartlite_serial_probe,
 	.ops	= &uartlite_serial_ops,
 };
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 0e71cada1b..d04c399019 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -212,7 +212,7 @@ U_BOOT_DRIVER(serial_zynq) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = zynq_serial_ids,
 	.ofdata_to_platdata = zynq_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynq_uart_platdata),
+	.platdata_auto	= sizeof(struct zynq_uart_platdata),
 	.probe = zynq_serial_probe,
 	.ops	= &zynq_serial_ops,
 };