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

46 files changed, 54 insertions, 54 deletions

diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2707ff59c7d..6620c793a1c 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -614,7 +614,7 @@ U_BOOT_DRIVER(am335x_fb) = {
 	.ofdata_to_platdata = am335x_fb_ofdata_to_platdata,
 	.probe = am335x_fb_probe,
 	.remove = am335x_fb_remove,
-	.priv_auto_alloc_size = sizeof(struct am335x_fb_priv),
+	.priv_auto	= sizeof(struct am335x_fb_priv),
 };
 
 #endif /* CONFIG_DM_VIDEO */
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 38def2816b2..3eb80c13946 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -562,7 +562,7 @@ U_BOOT_DRIVER(atmel_hlcdfb) = {
 	.bind	= atmel_hlcdc_bind,
 	.probe	= atmel_hlcdc_probe,
 	.ofdata_to_platdata = atmel_hlcdc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct atmel_hlcdc_priv),
+	.priv_auto	= sizeof(struct atmel_hlcdc_priv),
 };
 
 #endif
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index ae8ec26468f..b129309d34b 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -306,7 +306,7 @@ U_BOOT_DRIVER(atmel_fb) = {
 	.bind	= atmel_fb_lcd_bind,
 	.ofdata_to_platdata	= atmel_fb_ofdata_to_platdata,
 	.probe	= atmel_fb_lcd_probe,
-	.platdata_auto_alloc_size = sizeof(struct atmel_lcd_platdata),
-	.priv_auto_alloc_size	= sizeof(struct atmel_fb_priv),
+	.platdata_auto	= sizeof(struct atmel_lcd_platdata),
+	.priv_auto	= sizeof(struct atmel_fb_priv),
 };
 #endif
diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c
index 67fed7f224a..8e34022d836 100644
--- a/drivers/video/backlight_gpio.c
+++ b/drivers/video/backlight_gpio.c
@@ -68,5 +68,5 @@ U_BOOT_DRIVER(gpio_backlight) = {
 	.ops	= &gpio_backlight_ops,
 	.ofdata_to_platdata	= gpio_backlight_ofdata_to_platdata,
 	.probe		= gpio_backlight_probe,
-	.priv_auto_alloc_size	= sizeof(struct gpio_backlight_priv),
+	.priv_auto	= sizeof(struct gpio_backlight_priv),
 };
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index 1c5270ff05c..147cdcc6d58 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -421,5 +421,5 @@ U_BOOT_DRIVER(analogix_anx6345) = {
 	.of_match = anx6345_ids,
 	.probe	= anx6345_probe,
 	.ops	= &anx6345_ops,
-	.priv_auto_alloc_size = sizeof(struct anx6345_priv),
+	.priv_auto	= sizeof(struct anx6345_priv),
 };
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 389b02cdcba..08d38b244bd 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -134,6 +134,6 @@ int video_bridge_set_active(struct udevice *dev, bool active)
 UCLASS_DRIVER(video_bridge) = {
 	.id		= UCLASS_VIDEO_BRIDGE,
 	.name		= "video_bridge",
-	.per_device_auto_alloc_size	= sizeof(struct video_bridge_priv),
+	.per_device_auto	= sizeof(struct video_bridge_priv),
 	.pre_probe	= video_bridge_pre_probe,
 };
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index df6a761d2db..bc91e7bda58 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -781,6 +781,6 @@ U_BOOT_DRIVER(broadwell_igd) = {
 	.ofdata_to_platdata = broadwell_igd_ofdata_to_platdata,
 	.bind	= broadwell_igd_bind,
 	.probe	= broadwell_igd_probe,
-	.priv_auto_alloc_size	= sizeof(struct broadwell_igd_priv),
-	.platdata_auto_alloc_size	= sizeof(struct broadwell_igd_plat),
+	.priv_auto	= sizeof(struct broadwell_igd_priv),
+	.platdata_auto	= sizeof(struct broadwell_igd_plat),
 };
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 8205413d2ab..fa11b3bbefe 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -588,5 +588,5 @@ U_BOOT_DRIVER(vidconsole_truetype) = {
 	.id	= UCLASS_VIDEO_CONSOLE,
 	.ops	= &console_truetype_ops,
 	.probe	= console_truetype_probe,
-	.priv_auto_alloc_size	= sizeof(struct console_tt_priv),
+	.priv_auto	= sizeof(struct console_tt_priv),
 };
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 1a29ce5d858..5d6f0c17310 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -79,5 +79,5 @@ bool display_in_use(struct udevice *dev)
 UCLASS_DRIVER(display) = {
 	.id		= UCLASS_DISPLAY,
 	.name		= "display",
-	.per_device_platdata_auto_alloc_size	= sizeof(struct display_plat),
+	.per_device_platdata_auto	= sizeof(struct display_plat),
 };
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 4055ef49b6e..4dde6488144 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -845,7 +845,7 @@ U_BOOT_DRIVER(dw_mipi_dsi) = {
 	.id			= UCLASS_DSI_HOST,
 	.probe			= dw_mipi_dsi_probe,
 	.ops			= &dw_mipi_dsi_ops,
-	.priv_auto_alloc_size	= sizeof(struct dw_mipi_dsi),
+	.priv_auto	= sizeof(struct dw_mipi_dsi),
 };
 
 MODULE_AUTHOR("Chris Zhong <[email protected]>");
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 999ee1c14af..f18189a1de0 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -1081,5 +1081,5 @@ U_BOOT_DRIVER(exynos_dp) = {
 	.of_match = exynos_dp_ids,
 	.ops	= &exynos_dp_ops,
 	.ofdata_to_platdata	= exynos_dp_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct exynos_dp_priv),
+	.priv_auto	= sizeof(struct exynos_dp_priv),
 };
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 979b9091827..7022eec4b7a 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -716,5 +716,5 @@ U_BOOT_DRIVER(exynos_fb) = {
 	.bind	= exynos_fb_bind,
 	.probe	= exynos_fb_probe,
 	.ofdata_to_platdata	= exynos_fb_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct exynos_fb_priv),
+	.priv_auto	= sizeof(struct exynos_fb_priv),
 };
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index f02fd13d28c..73b8f4bd1c9 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -338,5 +338,5 @@ U_BOOT_DRIVER(ihs_video_out_drv) = {
 	.ops		= &ihs_video_out_ops,
 	.of_match       = ihs_video_out_ids,
 	.probe          = ihs_video_out_probe,
-	.priv_auto_alloc_size = sizeof(struct ihs_video_out_priv),
+	.priv_auto	= sizeof(struct ihs_video_out_priv),
 };
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index eb93a4f1fa9..dc8f2cfd800 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -671,6 +671,6 @@ U_BOOT_DRIVER(fsl_imx6q_ipu) = {
 	.of_match = ipuv3_video_ids,
 	.bind	= ipuv3_video_bind,
 	.probe	= ipuv3_video_probe,
-	.priv_auto_alloc_size = sizeof(struct ipuv3_video_priv),
+	.priv_auto	= sizeof(struct ipuv3_video_priv),
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 45df9c13474..73a1add0853 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -327,5 +327,5 @@ U_BOOT_DRIVER(lg4573_lcd) = {
 	.of_match = lg4573_ids,
 	.bind   = lg4573_bind,
 	.probe  = lg4573_probe,
-	.priv_auto_alloc_size = sizeof(struct lg4573_lcd_priv),
+	.priv_auto	= sizeof(struct lg4573_lcd_priv),
 };
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 9bc4bbb85d3..624084d38bc 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -2292,6 +2292,6 @@ U_BOOT_DRIVER(logicore_dp_tx) = {
 	.id			= UCLASS_DISPLAY,
 	.of_match		= logicore_dp_tx_ids,
 	.probe			= logicore_dp_tx_probe,
-	.priv_auto_alloc_size	= sizeof(struct dp_tx),
+	.priv_auto	= sizeof(struct dp_tx),
 	.ops			= &logicore_dp_tx_ops,
 };
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 1e6da0e1e25..0ffdd7b98f3 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -403,6 +403,6 @@ U_BOOT_DRIVER(mali_dp) = {
 	.of_match	= malidp_ids,
 	.bind		= malidp_bind,
 	.probe		= malidp_probe,
-	.priv_auto_alloc_size	= sizeof(struct malidp_priv),
+	.priv_auto	= sizeof(struct malidp_priv),
 	.ops		= &malidp_ops,
 };
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 5d74f7f1a74..e5f28132053 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -508,5 +508,5 @@ U_BOOT_DRIVER(meson_dw_hdmi) = {
 	.of_match = meson_dw_hdmi_ids,
 	.ops = &meson_dw_hdmi_ops,
 	.probe = meson_dw_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_dw_hdmi),
+	.priv_auto	= sizeof(struct meson_dw_hdmi),
 };
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 4868839ff7d..23b5ec6ef17 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -211,6 +211,6 @@ U_BOOT_DRIVER(meson_vpu) = {
 	.of_match = meson_vpu_ids,
 	.probe = meson_vpu_probe,
 	.bind = meson_vpu_bind,
-	.priv_auto_alloc_size = sizeof(struct meson_vpu_priv),
+	.priv_auto	= sizeof(struct meson_vpu_priv),
 	.flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
 };
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index f3cb2bfb480..af97c711564 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -594,5 +594,5 @@ U_BOOT_DRIVER(mvebu_video) = {
 	.of_match = mvebu_video_ids,
 	.bind	= mvebu_video_bind,
 	.probe	= mvebu_video_probe,
-	.priv_auto_alloc_size = sizeof(struct mvebu_video_priv),
+	.priv_auto	= sizeof(struct mvebu_video_priv),
 };
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 4101e0962a9..d0b89433128 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -643,9 +643,9 @@ U_BOOT_DRIVER(nexell_display) = {
 	.name = "nexell-display",
 	.id = UCLASS_VIDEO,
 	.of_match = nx_display_ids,
-	.platdata_auto_alloc_size =
+	.platdata_auto	=
 	    sizeof(struct nx_display_platdata),
 	.bind = nx_display_bind,
 	.probe = nx_display_probe,
-	.priv_auto_alloc_size = sizeof(struct nx_display_dev),
+	.priv_auto	= sizeof(struct nx_display_dev),
 };
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 362bf6a6fe4..bb8c33bfc7a 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -366,6 +366,6 @@ U_BOOT_DRIVER(otm8009a_panel) = {
 	.ops			  = &otm8009a_panel_ops,
 	.ofdata_to_platdata	  = otm8009a_panel_ofdata_to_platdata,
 	.probe			  = otm8009a_panel_probe,
-	.platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
-	.priv_auto_alloc_size	= sizeof(struct otm8009a_panel_priv),
+	.platdata_auto	= sizeof(struct mipi_dsi_panel_plat),
+	.priv_auto	= sizeof(struct otm8009a_panel_priv),
 };
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 9519180ceb3..49a3c7a58e8 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -265,5 +265,5 @@ U_BOOT_DRIVER(pwm_backlight) = {
 	.ops	= &pwm_backlight_ops,
 	.ofdata_to_platdata	= pwm_backlight_ofdata_to_platdata,
 	.probe		= pwm_backlight_probe,
-	.priv_auto_alloc_size	= sizeof(struct pwm_backlight_priv),
+	.priv_auto	= sizeof(struct pwm_backlight_priv),
 };
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 353894503b9..9d103f1f17b 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -338,6 +338,6 @@ U_BOOT_DRIVER(rm68200_panel) = {
 	.ops			  = &rm68200_panel_ops,
 	.ofdata_to_platdata	  = rm68200_panel_ofdata_to_platdata,
 	.probe			  = rm68200_panel_probe,
-	.platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
-	.priv_auto_alloc_size	= sizeof(struct rm68200_panel_priv),
+	.platdata_auto	= sizeof(struct mipi_dsi_panel_plat),
+	.priv_auto	= sizeof(struct rm68200_panel_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c
index f835f4d517a..41f05b7ec6d 100644
--- a/drivers/video/rockchip/rk3288_hdmi.c
+++ b/drivers/video/rockchip/rk3288_hdmi.c
@@ -113,5 +113,5 @@ U_BOOT_DRIVER(rk3288_hdmi_rockchip) = {
 	.ops = &rk3288_hdmi_ops,
 	.ofdata_to_platdata = rk3288_hdmi_ofdata_to_platdata,
 	.probe = rk3288_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct rk_hdmi_priv),
+	.priv_auto	= sizeof(struct rk_hdmi_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index 8ac0125b502..ff6f132bab2 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -185,5 +185,5 @@ U_BOOT_DRIVER(rk_mipi_dsi) = {
 	.ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
 	.probe	= rk_mipi_probe,
 	.ops	= &rk_mipi_dsi_ops,
-	.priv_auto_alloc_size   = sizeof(struct rk_mipi_priv),
+	.priv_auto	  = sizeof(struct rk_mipi_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index 9ec33e6e511..3f6ee744871 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -105,5 +105,5 @@ U_BOOT_DRIVER(rockchip_rk3288_vop) = {
 	.bind	= rk_vop_bind,
 	.probe	= rk3288_vop_probe,
         .remove = rk_vop_remove,
-	.priv_auto_alloc_size	= sizeof(struct rk_vop_priv),
+	.priv_auto	= sizeof(struct rk_vop_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c
index a62be983275..d9f15adc5cf 100644
--- a/drivers/video/rockchip/rk3399_hdmi.c
+++ b/drivers/video/rockchip/rk3399_hdmi.c
@@ -76,5 +76,5 @@ U_BOOT_DRIVER(rk3399_hdmi_rockchip) = {
 	.ops = &rk3399_hdmi_ops,
 	.ofdata_to_platdata = rk3399_hdmi_ofdata_to_platdata,
 	.probe = rk3399_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct rk_hdmi_priv),
+	.priv_auto	= sizeof(struct rk_hdmi_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index e5534c36e6e..873f7fdae00 100644
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/drivers/video/rockchip/rk3399_mipi.c
@@ -176,5 +176,5 @@ U_BOOT_DRIVER(rk_mipi_dsi) = {
 	.ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
 	.probe	= rk_mipi_probe,
 	.ops	= &rk_mipi_dsi_ops,
-	.priv_auto_alloc_size   = sizeof(struct rk_mipi_priv),
+	.priv_auto	  = sizeof(struct rk_mipi_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index 55d1be0411d..30e81b88b69 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -99,5 +99,5 @@ U_BOOT_DRIVER(rk3399_vop) = {
 	.ops	= &rk3399_vop_ops,
 	.bind	= rk_vop_bind,
 	.probe	= rk3399_vop_probe,
-	.priv_auto_alloc_size	= sizeof(struct rk_vop_priv),
+	.priv_auto	= sizeof(struct rk_vop_priv),
 };
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index c55f7a4f72a..282fe09fdfb 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -1102,5 +1102,5 @@ U_BOOT_DRIVER(dp_rockchip) = {
 	.ofdata_to_platdata	= rk_edp_ofdata_to_platdata,
 	.probe	= rk_edp_probe,
 	.remove	= rk_edp_remove,
-	.priv_auto_alloc_size	= sizeof(struct rk_edp_priv),
+	.priv_auto	= sizeof(struct rk_edp_priv),
 };
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 04f795a213c..c93b5dfeed3 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -247,5 +247,5 @@ U_BOOT_DRIVER(lvds_rockchip) = {
 	.ops	= &lvds_rockchip_ops,
 	.ofdata_to_platdata	= rk_lvds_ofdata_to_platdata,
 	.probe	= rk_lvds_probe,
-	.priv_auto_alloc_size	= sizeof(struct rk_lvds_priv),
+	.priv_auto	= sizeof(struct rk_lvds_priv),
 };
diff --git a/drivers/video/sandbox_dsi_host.c b/drivers/video/sandbox_dsi_host.c
index cd644ec0b46..c84a27ee3be 100644
--- a/drivers/video/sandbox_dsi_host.c
+++ b/drivers/video/sandbox_dsi_host.c
@@ -86,5 +86,5 @@ U_BOOT_DRIVER(sandbox_dsi_host) = {
 	.id		      = UCLASS_DSI_HOST,
 	.of_match	      = sandbox_dsi_host_ids,
 	.ops		      = &sandbox_dsi_host_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_dsi_host_priv),
+	.priv_auto	= sizeof(struct sandbox_dsi_host_priv),
 };
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index 7e722326b3d..2a854d3958b 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -158,5 +158,5 @@ U_BOOT_DRIVER(sandbox_osd_drv) = {
 	.ops		= &sandbox_osd_ops,
 	.of_match       = sandbox_osd_ids,
 	.probe          = sandbox_osd_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_osd_priv),
+	.priv_auto	= sizeof(struct sandbox_osd_priv),
 };
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index d806f35debb..c989510640d 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -78,5 +78,5 @@ U_BOOT_DRIVER(sandbox_lcd_sdl) = {
 	.of_match = sandbox_sdl_ids,
 	.bind	= sandbox_sdl_bind,
 	.probe	= sandbox_sdl_probe,
-	.platdata_auto_alloc_size	= sizeof(struct sandbox_sdl_plat),
+	.platdata_auto	= sizeof(struct sandbox_sdl_plat),
 };
diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
index 6c624c37699..3be4f25d8b3 100644
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@ -118,5 +118,5 @@ U_BOOT_DRIVER(simple_panel) = {
 	.ops	= &simple_panel_ops,
 	.ofdata_to_platdata	= simple_panel_ofdata_to_platdata,
 	.probe		= simple_panel_probe,
-	.priv_auto_alloc_size	= sizeof(struct simple_panel_priv),
+	.priv_auto	= sizeof(struct simple_panel_priv),
 };
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index 9d5abacc2bf..9941382a7d6 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -512,5 +512,5 @@ U_BOOT_DRIVER(stm32_dsi) = {
 	.bind				= stm32_dsi_bind,
 	.probe				= stm32_dsi_probe,
 	.ops				= &stm32_dsi_ops,
-	.priv_auto_alloc_size		= sizeof(struct stm32_dsi_priv),
+	.priv_auto		= sizeof(struct stm32_dsi_priv),
 };
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 7fff735930b..07a9acbb8ee 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -473,5 +473,5 @@ U_BOOT_DRIVER(stm32_ltdc) = {
 	.of_match		= stm32_ltdc_ids,
 	.probe			= stm32_ltdc_probe,
 	.bind			= stm32_ltdc_bind,
-	.priv_auto_alloc_size	= sizeof(struct stm32_ltdc_priv),
+	.priv_auto	= sizeof(struct stm32_ltdc_priv),
 };
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index 01d4b7a11c9..6b6792a3dd9 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -395,7 +395,7 @@ U_BOOT_DRIVER(sunxi_dw_hdmi) = {
 	.id	= UCLASS_DISPLAY,
 	.ops	= &sunxi_dw_hdmi_ops,
 	.probe	= sunxi_dw_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct sunxi_dw_hdmi_priv),
+	.priv_auto	= sizeof(struct sunxi_dw_hdmi_priv),
 };
 
 U_BOOT_DEVICE(sunxi_dw_hdmi) = {
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 49bf083a8d1..dd2bb1f5fc5 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -142,7 +142,7 @@ U_BOOT_DRIVER(sunxi_lcd) = {
 	.id     = UCLASS_DISPLAY,
 	.ops    = &sunxi_lcd_ops,
 	.probe  = sunxi_lcd_probe,
-	.priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
+	.priv_auto	= sizeof(struct sunxi_lcd_priv),
 };
 
 #ifdef CONFIG_MACH_SUN50I
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index 191cda3ce76..24487439045 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -651,5 +651,5 @@ U_BOOT_DRIVER(tda19988) = {
 	.of_match = tda19988_ids,
 	.ops = &tda19988_ops,
 	.probe = tda19988_probe,
-	.priv_auto_alloc_size = sizeof(struct tda19988_priv),
+	.priv_auto	= sizeof(struct tda19988_priv),
 };
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 827ea13d13a..25199333741 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -424,5 +424,5 @@ U_BOOT_DRIVER(tegra_lcd) = {
 	.bind	= tegra_lcd_bind,
 	.probe	= tegra_lcd_probe,
 	.ofdata_to_platdata	= tegra_lcd_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct tegra_lcd_priv),
+	.priv_auto	= sizeof(struct tegra_lcd_priv),
 };
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 59758eb9361..881923f2292 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -1619,6 +1619,6 @@ U_BOOT_DRIVER(dp_tegra) = {
 	.ofdata_to_platdata = tegra_dp_ofdata_to_platdata,
 	.probe	= dp_tegra_probe,
 	.ops	= &dp_tegra_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra_dp_priv),
-	.platdata_auto_alloc_size = sizeof(struct tegra_dp_plat),
+	.priv_auto	= sizeof(struct tegra_dp_priv),
+	.platdata_auto	= sizeof(struct tegra_dp_plat),
 };
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 49f33c15b5c..83f3aad92cb 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -1079,5 +1079,5 @@ U_BOOT_DRIVER(sor_tegra) = {
 	.of_match = tegra_sor_ids,
 	.ofdata_to_platdata = tegra_sor_ofdata_to_platdata,
 	.ops	= &tegra_sor_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra_dc_sor_data),
+	.priv_auto	= sizeof(struct tegra_dc_sor_data),
 };
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 3a07f36ce27..a6b7d40d962 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -626,7 +626,7 @@ UCLASS_DRIVER(vidconsole) = {
 	.name		= "vidconsole0",
 	.pre_probe	= vidconsole_pre_probe,
 	.post_probe	= vidconsole_post_probe,
-	.per_device_auto_alloc_size	= sizeof(struct vidconsole_priv),
+	.per_device_auto	= sizeof(struct vidconsole_priv),
 };
 
 #ifdef CONFIG_VIDEO_COPY
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 650891e49dd..925731341cf 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -408,7 +408,7 @@ UCLASS_DRIVER(video) = {
 	.pre_probe	= video_pre_probe,
 	.post_probe	= video_post_probe,
 	.pre_remove	= video_pre_remove,
-	.priv_auto_alloc_size	= sizeof(struct video_uc_priv),
-	.per_device_auto_alloc_size	= sizeof(struct video_priv),
-	.per_device_platdata_auto_alloc_size = sizeof(struct video_uc_platdata),
+	.priv_auto	= sizeof(struct video_uc_priv),
+	.per_device_auto	= sizeof(struct video_priv),
+	.per_device_platdata_auto	= sizeof(struct video_uc_platdata),
 };