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

56 files changed, 108 insertions, 108 deletions

diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index cd7b2113ace..d156164761a 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -190,6 +190,6 @@ U_BOOT_DRIVER(cdns_ti) = {
 	.bind = cdns3_bind,
 	.probe = cdns_ti_probe,
 	.remove = cdns_ti_remove,
-	.platdata_auto_alloc_size = sizeof(struct cdns_ti),
+	.platdata_auto	= sizeof(struct cdns_ti),
 	.flags = DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index ea86a250608..e861c82f7e1 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -461,7 +461,7 @@ U_BOOT_DRIVER(cdns_usb3_peripheral) = {
 	.of_match = cdns3_ids,
 	.probe = cdns3_gadget_probe,
 	.remove = cdns3_gadget_remove,
-	.priv_auto_alloc_size = sizeof(struct cdns3_gadget_priv),
+	.priv_auto	= sizeof(struct cdns3_gadget_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
@@ -492,7 +492,7 @@ U_BOOT_DRIVER(cdns_usb3_host) = {
 	.of_match = cdns3_ids,
 	.probe = cdns3_host_probe,
 	.remove = cdns3_host_remove,
-	.priv_auto_alloc_size = sizeof(struct cdns3_host_priv),
+	.priv_auto	= sizeof(struct cdns3_host_priv),
 	.ops = &xhci_usb_ops,
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index a936f71d2e5..fb09b3ab1ed 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -158,8 +158,8 @@ U_BOOT_DRIVER(dwc3_generic_peripheral) = {
 	.ofdata_to_platdata = dwc3_generic_ofdata_to_platdata,
 	.probe = dwc3_generic_peripheral_probe,
 	.remove = dwc3_generic_peripheral_remove,
-	.priv_auto_alloc_size = sizeof(struct dwc3_generic_priv),
-	.platdata_auto_alloc_size = sizeof(struct dwc3_generic_plat),
+	.priv_auto	= sizeof(struct dwc3_generic_priv),
+	.platdata_auto	= sizeof(struct dwc3_generic_plat),
 };
 #endif
 
@@ -200,8 +200,8 @@ U_BOOT_DRIVER(dwc3_generic_host) = {
 	.ofdata_to_platdata = dwc3_generic_ofdata_to_platdata,
 	.probe = dwc3_generic_host_probe,
 	.remove = dwc3_generic_host_remove,
-	.priv_auto_alloc_size = sizeof(struct dwc3_generic_host_priv),
-	.platdata_auto_alloc_size = sizeof(struct dwc3_generic_plat),
+	.priv_auto	= sizeof(struct dwc3_generic_host_priv),
+	.platdata_auto	= sizeof(struct dwc3_generic_plat),
 	.ops = &xhci_usb_ops,
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
@@ -459,6 +459,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = {
 	.bind = dwc3_glue_bind,
 	.probe = dwc3_glue_probe,
 	.remove = dwc3_glue_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_glue_data),
+	.platdata_auto	= sizeof(struct dwc3_glue_data),
 
 };
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 6567502cdd1..58d57ee7d1b 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -469,6 +469,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = {
 	.of_match = dwc3_meson_g12a_ids,
 	.probe = dwc3_meson_g12a_probe,
 	.remove = dwc3_meson_g12a_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_meson_g12a),
+	.platdata_auto	= sizeof(struct dwc3_meson_g12a),
 
 };
diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c
index 92ee0866f7e..6e8c93a0fea 100644
--- a/drivers/usb/dwc3/dwc3-meson-gxl.c
+++ b/drivers/usb/dwc3/dwc3-meson-gxl.c
@@ -420,6 +420,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = {
 	.of_match = dwc3_meson_gxl_ids,
 	.probe = dwc3_meson_gxl_probe,
 	.remove = dwc3_meson_gxl_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_meson_gxl),
+	.platdata_auto	= sizeof(struct dwc3_meson_gxl),
 
 };
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 9c305f46e94..d63dee41fcd 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -421,6 +421,6 @@ U_BOOT_DRIVER(usb_sandbox_flash) = {
 	.probe	= sandbox_flash_probe,
 	.ofdata_to_platdata = sandbox_flash_ofdata_to_platdata,
 	.ops	= &sandbox_usb_flash_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_flash_priv),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_flash_plat),
+	.priv_auto	= sizeof(struct sandbox_flash_priv),
+	.platdata_auto	= sizeof(struct sandbox_flash_plat),
 };
diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c
index 21bf3bda48d..3e66ca46988 100644
--- a/drivers/usb/emul/sandbox_hub.c
+++ b/drivers/usb/emul/sandbox_hub.c
@@ -328,8 +328,8 @@ U_BOOT_DRIVER(usb_sandbox_hub) = {
 	.of_match = sandbox_usb_hub_ids,
 	.bind	= sandbox_hub_bind,
 	.ops	= &sandbox_usb_hub_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_hub_priv),
-	.per_child_platdata_auto_alloc_size =
+	.priv_auto	= sizeof(struct sandbox_hub_priv),
+	.per_child_platdata_auto	=
 			sizeof(struct sandbox_hub_platdata),
 	.child_post_bind = sandbox_child_post_bind,
 };
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index f562fb7eca2..c64ce1feeb5 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -241,6 +241,6 @@ U_BOOT_DRIVER(usb_sandbox_keyb) = {
 	.bind	= sandbox_keyb_bind,
 	.probe	= sandbox_keyb_probe,
 	.ops	= &sandbox_usb_keyb_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_keyb_priv),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_keyb_plat),
+	.priv_auto	= sizeof(struct sandbox_keyb_priv),
+	.platdata_auto	= sizeof(struct sandbox_keyb_plat),
 };
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index e3419e2fd47..b3069390429 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -298,7 +298,7 @@ UCLASS_DRIVER(usb_emul) = {
 	.id		= UCLASS_USB_EMUL,
 	.name		= "usb_emul",
 	.post_bind	= dm_scan_fdt_dev,
-	.per_device_platdata_auto_alloc_size = sizeof(struct usb_emul_platdata),
-	.per_child_auto_alloc_size = sizeof(struct usb_device),
-	.per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
+	.per_device_platdata_auto	= sizeof(struct usb_emul_platdata),
+	.per_child_auto	= sizeof(struct usb_device),
+	.per_child_platdata_auto	= sizeof(struct usb_dev_platdata),
 };
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index ac4a27fff20..7115dcb56fc 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -876,8 +876,8 @@ U_BOOT_DRIVER(asix_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = asix_eth_probe,
 	.ops	= &asix_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct asix_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct asix_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id asix_eth_id_table[] = {
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index c142b8b19bf..ffc90c00ab3 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -902,8 +902,8 @@ U_BOOT_DRIVER(ax88179_eth) = {
 	.id = UCLASS_ETH,
 	.probe = ax88179_eth_probe,
 	.ops = &ax88179_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct asix_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct asix_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id ax88179_eth_id_table[] = {
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 46b92e8d68b..1fa7e534040 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -304,8 +304,8 @@ U_BOOT_DRIVER(lan75xx_eth) = {
 	.probe	= lan75xx_eth_probe,
 	.remove	= lan7x_eth_remove,
 	.ops	= &lan75xx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct lan7x_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct lan7x_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id lan75xx_eth_id_table[] = {
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index e34ad2603fb..3f7e03f51c5 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -466,8 +466,8 @@ U_BOOT_DRIVER(lan78xx_eth) = {
 	.probe	= lan78xx_eth_probe,
 	.remove	= lan7x_eth_remove,
 	.ops	= &lan78xx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct lan7x_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct lan7x_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id lan78xx_eth_id_table[] = {
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index c829a436a34..1746819192c 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -928,8 +928,8 @@ U_BOOT_DRIVER(mcs7830_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = mcs7830_eth_probe,
 	.ops	= &mcs7830_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct mcs7830_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct mcs7830_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 215bcbbef80..804c331ee1b 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -1842,8 +1842,8 @@ U_BOOT_DRIVER(r8152_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = r8152_eth_probe,
 	.ops	= &r8152_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct r8152),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct r8152),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id r8152_eth_id_table[] = {
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index b293a808a3d..d6863ad89e4 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -1062,8 +1062,8 @@ U_BOOT_DRIVER(smsc95xx_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = smsc95xx_eth_probe,
 	.ops	= &smsc95xx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct smsc95xx_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct smsc95xx_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id smsc95xx_eth_id_table[] = {
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 8a8e2179e48..a662d500d39 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -1189,8 +1189,8 @@ U_BOOT_DRIVER(dwc2_udc_otg) = {
 	.ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata,
 	.probe = dwc2_udc_otg_probe,
 	.remove = dwc2_udc_otg_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc2_plat_otg_data),
-	.priv_auto_alloc_size = sizeof(struct dwc2_priv_data),
+	.platdata_auto	= sizeof(struct dwc2_plat_otg_data),
+	.priv_auto	= sizeof(struct dwc2_priv_data),
 };
 
 int dwc2_udc_B_session_valid(struct udevice *dev)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a8e8bfc04b4..0cce8e24c50 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2691,8 +2691,8 @@ U_BOOT_DRIVER(eth_usb) = {
 	.id	= UCLASS_ETH,
 	.probe	= usb_eth_probe,
 	.ops	= &usb_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct ether_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ether_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c
index b38b9dc68f7..775754a0370 100644
--- a/drivers/usb/gadget/max3420_udc.c
+++ b/drivers/usb/gadget/max3420_udc.c
@@ -871,5 +871,5 @@ U_BOOT_DRIVER(max3420_generic_udc) = {
 	.of_match = max3420_ids,
 	.probe = max3420_udc_probe,
 	.remove = max3420_udc_remove,
-	.priv_auto_alloc_size = sizeof(struct max3420_udc),
+	.priv_auto	= sizeof(struct max3420_udc),
 };
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index f1d13b1c1df..40d389cbd6a 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -1477,7 +1477,7 @@ U_BOOT_DRIVER(usb_dwc2) = {
 	.probe	= dwc2_usb_probe,
 	.remove = dwc2_usb_remove,
 	.ops	= &dwc2_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct dwc2_priv),
+	.priv_auto	= sizeof(struct dwc2_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c
index e4abc6f3b9b..6240a453a08 100644
--- a/drivers/usb/host/dwc3-of-simple.c
+++ b/drivers/usb/host/dwc3-of-simple.c
@@ -102,6 +102,6 @@ U_BOOT_DRIVER(dwc3_of_simple) = {
 	.of_match = dwc3_of_simple_ids,
 	.probe = dwc3_of_simple_probe,
 	.remove = dwc3_of_simple_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_of_simple),
+	.platdata_auto	= sizeof(struct dwc3_of_simple),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 3e6c1429d66..ba008bf6866 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -246,6 +246,6 @@ U_BOOT_DRIVER(dwc3_sti_glue) = {
 	.probe = sti_dwc3_glue_probe,
 	.remove = sti_dwc3_glue_remove,
 	.bind = sti_dwc3_glue_bind,
-	.platdata_auto_alloc_size = sizeof(struct sti_dwc3_glue_platdata),
+	.platdata_auto	= sizeof(struct sti_dwc3_glue_platdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b208e8eb22..955cacdd981 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -124,8 +124,8 @@ U_BOOT_DRIVER(ehci_atmel) = {
 	.probe		= ehci_atmel_probe,
 	.remove		= ehci_deregister,
 	.ops		= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_atmel_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_atmel_priv),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 6a37c5d982a..3728b238d4e 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -258,7 +258,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct exynos_ehci),
-	.platdata_auto_alloc_size = sizeof(struct exynos_ehci_platdata),
+	.priv_auto	= sizeof(struct exynos_ehci),
+	.platdata_auto	= sizeof(struct exynos_ehci_platdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 5423d10abe7..a53493a617d 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -145,8 +145,8 @@ U_BOOT_DRIVER(ehci_fsl) = {
 	.probe = ehci_fsl_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_fsl_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_fsl_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #else
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index c93a7051a79..4c28a69b989 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -221,6 +221,6 @@ U_BOOT_DRIVER(ehci_generic) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct generic_ehci),
+	.priv_auto	= sizeof(struct generic_ehci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 62414bb1102..329593689f4 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -152,8 +152,8 @@ U_BOOT_DRIVER(ehci_mvebu) = {
 	.probe = ehci_mvebu_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_mvebu_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_mvebu_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index dd92808ff7b..61ff13e2b8e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -144,7 +144,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct msm_ehci_priv),
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct msm_ehci_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index caafa688993..2943b845005 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -367,8 +367,8 @@ U_BOOT_DRIVER(usb_mx5) = {
 	.probe	= ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_mx5_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_mx5_priv_data),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* !CONFIG_IS_ENABLED(DM_USB) */
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 37b59758bb3..cd22b076516 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -650,8 +650,8 @@ U_BOOT_DRIVER(usb_mx6) = {
 	.probe	= ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_mx6_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_mx6_priv_data),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 82b99eeef1e..ac264a2f38a 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -403,8 +403,8 @@ U_BOOT_DRIVER(usb_omap_ehci) = {
 	.of_match = omap_ehci_dt_ids,
 	.probe = omap_ehci_probe,
 	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_omap_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_omap_priv_data),
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 7dd5c33c13d..7d91846d079 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -163,8 +163,8 @@ U_BOOT_DRIVER(ehci_pci) = {
 	.remove = ehci_pci_remove,
 	.of_match = ehci_pci_ids,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_pci_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_pci_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index d81f4a03f14..9ffaf0060ab 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -865,7 +865,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct fdt_usb),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct fdt_usb),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 2768d409749..f370052961d 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -355,8 +355,8 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.remove = ehci_deregister,
 	.ops = &ehci_usb_ops,
 	.ofdata_to_platdata = vf_usb_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_vf_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_vf_priv_data),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 80f1d6fd97c..738eed3bfea 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -85,7 +85,7 @@ U_BOOT_DRIVER(ehci_zynq) = {
 	.probe = ehci_zynq_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynq_ehci_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct zynq_ehci_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index aa1eba262a9..33c4a911a09 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -174,7 +174,7 @@ U_BOOT_DRIVER(ohci_generic) = {
 	.probe = ohci_da8xx_probe,
 	.remove = ohci_da8xx_remove,
 	.ops	= &ohci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct da8xx_ohci),
+	.priv_auto	= sizeof(struct da8xx_ohci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_OS_PREPARE,
 };
 #endif
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
index ac9b7e1e3c0..163f0ef17b1 100644
--- a/drivers/usb/host/ohci-generic.c
+++ b/drivers/usb/host/ohci-generic.c
@@ -198,6 +198,6 @@ U_BOOT_DRIVER(ohci_generic) = {
 	.probe = ohci_usb_probe,
 	.remove = ohci_usb_remove,
 	.ops	= &ohci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct generic_ohci),
+	.priv_auto	= sizeof(struct generic_ohci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 4c1c7786728..48ffa4af5ed 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -39,8 +39,8 @@ U_BOOT_DRIVER(ohci_pci) = {
 	.remove = ohci_pci_remove,
 	.of_match = ohci_pci_ids,
 	.ops	= &ohci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(ohci_t),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(ohci_t),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 37aa2c55f24..7620ac2da79 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -894,6 +894,6 @@ U_BOOT_DRIVER(usb_r8a66597) = {
 	.probe	= r8a66597_usb_probe,
 	.remove = r8a66597_usb_remove,
 	.ops	= &r8a66597_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct r8a66597),
+	.priv_auto	= sizeof(struct r8a66597),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index beb62ebc0c2..e5442e71ae9 100644
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -155,5 +155,5 @@ U_BOOT_DRIVER(usb_sandbox) = {
 	.of_match = sandbox_usb_ids,
 	.probe = sandbox_usb_probe,
 	.ops	= &sandbox_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_usb_ctrl),
+	.priv_auto	= sizeof(struct sandbox_usb_ctrl),
 };
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 2f8c9037c12..1e7bec91062 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -849,12 +849,12 @@ UCLASS_DRIVER(usb) = {
 	.name		= "usb",
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_bind	= dm_scan_fdt_dev,
-	.priv_auto_alloc_size = sizeof(struct usb_uclass_priv),
-	.per_child_auto_alloc_size = sizeof(struct usb_device),
-	.per_device_auto_alloc_size = sizeof(struct usb_bus_priv),
+	.priv_auto	= sizeof(struct usb_uclass_priv),
+	.per_child_auto	= sizeof(struct usb_device),
+	.per_device_auto	= sizeof(struct usb_bus_priv),
 	.child_post_bind = usb_child_post_bind,
 	.child_pre_probe = usb_child_pre_probe,
-	.per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
+	.per_child_platdata_auto	= sizeof(struct usb_dev_platdata),
 };
 
 UCLASS_DRIVER(usb_dev_generic) = {
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index ee65f51c5d2..f50f069fc74 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.remove				= xhci_brcm_deregister,
 	.ops				= &xhci_usb_ops,
 	.of_match			= xhci_brcm_ids,
-	.platdata_auto_alloc_size	= sizeof(struct brcm_xhci_platdata),
-	.priv_auto_alloc_size		= sizeof(struct xhci_ctrl),
+	.platdata_auto	= sizeof(struct brcm_xhci_platdata),
+	.priv_auto		= sizeof(struct xhci_ctrl),
 	.flags				= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 045de2ffdec..4dba5699377 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -186,8 +186,8 @@ U_BOOT_DRIVER(xhci_dwc3) = {
 	.probe = xhci_dwc3_probe,
 	.remove = xhci_dwc3_remove,
 	.ops = &xhci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct xhci_ctrl),
-	.platdata_auto_alloc_size = sizeof(struct xhci_dwc3_platdata),
+	.priv_auto	= sizeof(struct xhci_ctrl),
+	.platdata_auto	= sizeof(struct xhci_dwc3_platdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 6fb7a7f6e09..6e1b5f005f0 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -255,7 +255,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.probe = xhci_usb_probe,
 	.remove = xhci_usb_remove,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct exynos_xhci_platdata),
-	.priv_auto_alloc_size = sizeof(struct exynos_xhci),
+	.platdata_auto	= sizeof(struct exynos_xhci_platdata),
+	.priv_auto	= sizeof(struct exynos_xhci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 0a2da70e200..95714d83386 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -169,8 +169,8 @@ U_BOOT_DRIVER(xhci_fsl) = {
 	.probe = xhci_fsl_probe,
 	.remove = xhci_fsl_remove,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct xhci_fsl_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct xhci_fsl_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #else
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index f62e232d218..d301acc9a89 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -300,6 +300,6 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.remove = xhci_mtk_remove,
 	.ops = &xhci_usb_ops,
 	.bind = dm_scan_fdt_dev,
-	.priv_auto_alloc_size = sizeof(struct mtk_xhci),
+	.priv_auto	= sizeof(struct mtk_xhci),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index f2e338f6fbc..6f56cc8384b 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -96,7 +96,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.probe = xhci_usb_probe,
 	.remove = xhci_deregister,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_xhci_platdata),
-	.priv_auto_alloc_size = sizeof(struct mvebu_xhci),
+	.platdata_auto	= sizeof(struct mvebu_xhci_platdata),
+	.priv_auto	= sizeof(struct mvebu_xhci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 9fb6d2f7635..888b17ba4ce 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -59,8 +59,8 @@ U_BOOT_DRIVER(xhci_pci) = {
 	.remove = xhci_deregister,
 	.of_match = xhci_pci_ids,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct xhci_ctrl),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct xhci_ctrl),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 5379dba5663..4322fb2e4d4 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -161,7 +161,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.ops		= &xhci_usb_ops,
 	.of_match	= xhci_rcar_ids,
 	.ofdata_to_platdata = xhci_rcar_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rcar_xhci_platdata),
-	.priv_auto_alloc_size = sizeof(struct rcar_xhci),
+	.platdata_auto	= sizeof(struct rcar_xhci_platdata),
+	.priv_auto	= sizeof(struct rcar_xhci),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 3795e695e87..c951107b201 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -257,7 +257,7 @@ U_BOOT_DRIVER(mtu3_peripheral) = {
 	.of_match = ssusb_of_match,
 	.probe = mtu3_gadget_probe,
 	.remove = mtu3_gadget_remove,
-	.priv_auto_alloc_size = sizeof(struct mtu3),
+	.priv_auto	= sizeof(struct mtu3),
 };
 #endif
 
@@ -298,7 +298,7 @@ U_BOOT_DRIVER(mtu3_host) = {
 	.of_match = ssusb_of_match,
 	.probe = mtu3_host_probe,
 	.remove = mtu3_host_remove,
-	.priv_auto_alloc_size = sizeof(struct mtu3_host),
+	.priv_auto	= sizeof(struct mtu3_host),
 	.ops = &xhci_usb_ops,
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
@@ -365,5 +365,5 @@ U_BOOT_DRIVER(mtu3) = {
 	.bind = mtu3_glue_bind,
 	.probe = mtu3_probe,
 	.remove = mtu3_remove,
-	.priv_auto_alloc_size = sizeof(struct ssusb_mtk),
+	.priv_auto	= sizeof(struct ssusb_mtk),
 };
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 67488ddb504..6c0d0b8b165 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -348,6 +348,6 @@ U_BOOT_DRIVER(da8xx_musb) = {
 	.probe = da8xx_musb_probe,
 	.remove = da8xx_musb_remove,
 	.ops = &musb_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct da8xx_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+	.platdata_auto	= sizeof(struct da8xx_musb_platdata),
+	.priv_auto	= sizeof(struct musb_host_data),
 };
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 8f0561eeba3..8adfa426c49 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -414,6 +414,6 @@ U_BOOT_DRIVER(mtk_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops		= &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct mtk_musb_glue),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct mtk_musb_glue),
 };
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index da63cc2c224..2e029d84bc8 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -280,8 +280,8 @@ U_BOOT_DRIVER(omap2430_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops = &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct omap2430_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+	.platdata_auto	= sizeof(struct omap2430_musb_platdata),
+	.priv_auto	= sizeof(struct musb_host_data),
 };
 
 #endif /* CONFIG_IS_ENABLED(DM_USB) */
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 2fbe9bebf17..e45ab20562c 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -288,6 +288,6 @@ U_BOOT_DRIVER(usb_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops		= &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct pic32_musb_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct pic32_musb_data),
 };
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 187db7794b6..10bc3e89560 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -552,6 +552,6 @@ U_BOOT_DRIVER(usb_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops		= &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct sunxi_glue),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct sunxi_glue),
 };
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index f4f26d86b3f..34b1a34d2cc 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -204,8 +204,8 @@ U_BOOT_DRIVER(ti_musb_host) = {
 	.probe = ti_musb_host_probe,
 	.remove = ti_musb_host_remove,
 	.ops	= &musb_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct ti_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+	.platdata_auto	= sizeof(struct ti_musb_platdata),
+	.priv_auto	= sizeof(struct musb_host_data),
 };
 
 #if CONFIG_IS_ENABLED(DM_USB_GADGET)
@@ -277,8 +277,8 @@ U_BOOT_DRIVER(ti_musb_peripheral) = {
 	.probe = ti_musb_peripheral_probe,
 	.remove = ti_musb_peripheral_remove,
 	.ops	= &musb_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct ti_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ti_musb_peripheral),
+	.platdata_auto	= sizeof(struct ti_musb_platdata),
+	.priv_auto	= sizeof(struct ti_musb_peripheral),
 	.flags = DM_FLAG_PRE_RELOC,
 };
 #endif