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>

46 files changed, 54 insertions, 54 deletions

diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2707ff5..6620c79 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 38def28..3eb80c1 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 ae8ec26..b129309 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 67fed7f..8e34022 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 1c5270f..147cdcc 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 389b02c..08d38b2 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 df6a761..bc91e7b 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 8205413..fa11b3b 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 1a29ce5..5d6f0c1 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 4055ef4..4dde648 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 <zyw@rock-chips.com>");
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 999ee1c..f18189a 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 979b909..7022eec 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 f02fd13..73b8f4b 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 eb93a4f..dc8f2cf 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 45df9c1..73a1add 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 9bc4bbb..624084d 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 1e6da0e..0ffdd7b 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 5d74f7f..e5f2813 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 4868839..23b5ec6 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 f3cb2bf..af97c71 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 4101e09..d0b8943 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 362bf6a..bb8c33b 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 9519180..49a3c7a 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 3538945..9d103f1 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 f835f4d..41f05b7 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 8ac0125..ff6f132 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 9ec33e6..3f6ee74 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 a62be98..d9f15ad 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 e5534c3..873f7fd 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 55d1be0..30e81b8 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 c55f7a4..282fe09 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 04f795a..c93b5df 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 cd644ec..c84a27e 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 7e72232..2a854d3 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 d806f35..c989510 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 6c624c3..3be4f25 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 9d5abac..9941382 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 7fff735..07a9acb 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 01d4b7a..6b6792a 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 49bf083..dd2bb1f 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 191cda3..2448743 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 827ea13..2519933 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 59758eb..881923f 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 49f33c1..83f3aad 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 3a07f36..a6b7d40 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 650891e..9257313 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),
 };