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>
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 35b76f5..173ac24 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -119,7 +119,7 @@
 	.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 0be5cd7..eec70f6 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -112,7 +112,7 @@
 	.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 f759ea8..45e6554 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -304,14 +304,14 @@
 	.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 7d31c6d..80b6380 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -107,6 +107,6 @@
 	.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 702109b..9b83f88 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -611,9 +611,9 @@
 #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 8e269a2..03d16c7 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -242,8 +242,8 @@
 	.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 f3c25d4..b645724 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -507,6 +507,6 @@
 	.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 9de94b6..da06bef 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -188,7 +188,7 @@
 	.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 04063fb..52dce35 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -126,7 +126,7 @@
 	.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 8a4af87..8cd533f 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -194,11 +194,11 @@
 	.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 923f402..484a281 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -92,10 +92,10 @@
 	.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 5b963ce..f08e91f 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -262,7 +262,7 @@
 	.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 ccab347..08363c4 100644
--- a/drivers/serial/serial_coreboot.c
+++ b/drivers/serial/serial_coreboot.c
@@ -37,8 +37,8 @@
 	.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 cc20673..a0ae2fe 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -159,7 +159,7 @@
 	.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 b152e10..33ddbd6 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -150,7 +150,7 @@
 	.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 39bd40e..f928159 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -60,8 +60,8 @@
 	.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 83dc96c..af7b842 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -190,7 +190,7 @@
 	.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 95cbe63..b26f401 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -567,7 +567,7 @@
 	.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 402fd53..513013c 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -172,7 +172,7 @@
 	.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 496a2ca..73a10f8 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -169,7 +169,7 @@
 	.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 c8946c3..3b088b3 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -240,7 +240,7 @@
 	.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 778a04d..afa6e8c 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -268,7 +268,7 @@
 	.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 fb43f88..7756b0d 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -126,7 +126,7 @@
 	.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 de6cefc..83f2316 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -358,7 +358,7 @@
 #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 f7997fc..296c5fd 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -158,9 +158,9 @@
 #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 2651a45..0e67bc1 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -130,7 +130,7 @@
 	.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 a492063..5d1dbe7 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -178,7 +178,7 @@
 	.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 d9e35c6..4e20128 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -388,11 +388,11 @@
 	.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 b1718f7..74245f8 100644
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -42,8 +42,8 @@
 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_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 9bb2be2..df50210 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -208,7 +208,7 @@
 	.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 e27d256..4e37ab0 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -240,13 +240,13 @@
 	.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 fcc47fb..710bb72 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -202,7 +202,7 @@
 	.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 33ff396..ded684a 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -206,6 +206,6 @@
 	.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 cab0db2..a8e0320 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -241,7 +241,7 @@
 	.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 a098028..27e4b92 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -172,6 +172,6 @@
 	.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 ba6504b..dbb7b22 100644
--- a/drivers/serial/serial_xen.c
+++ b/drivers/serial/serial_xen.c
@@ -172,7 +172,7 @@
 #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 236ab86..bc03949 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -132,7 +132,7 @@
 	.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 0e71cad..d04c399 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -212,7 +212,7 @@
 	.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,
 };