leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: treewide: Rename auto_alloc_size members to be shorter

Browse Source 
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>
This commit is contained in:
Simon Glass
2020-12-03 16:55:17 -07:00
parent 78128d52df
commit 41575d8e4c
956 changed files with 1365 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/cdns3/cdns3-ti.c
View File

@@ -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,
};

4
drivers/usb/cdns3/core.c
View File

@@ -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,
};

10
drivers/usb/dwc3/dwc3-generic.c
View File

@@ -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),
};

2
drivers/usb/dwc3/dwc3-meson-g12a.c
View File

@@ -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),
};

2
drivers/usb/dwc3/dwc3-meson-gxl.c
View File

@@ -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),
};

4
drivers/usb/emul/sandbox_flash.c
View File

@@ -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),
};

4
drivers/usb/emul/sandbox_hub.c
View File

@@ -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,
};

4
drivers/usb/emul/sandbox_keyb.c
View File

@@ -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),
};

6
drivers/usb/emul/usb-emul-uclass.c
View File

@@ -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),
};

4
drivers/usb/eth/asix.c
View File

@@ -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[] = {

4
drivers/usb/eth/asix88179.c
View File

@@ -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[] = {

4
drivers/usb/eth/lan75xx.c
View File

@@ -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[] = {

4
drivers/usb/eth/lan78xx.c
View File

@@ -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[] = {

4
drivers/usb/eth/mcs7830.c
View File

@@ -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,
};

4
drivers/usb/eth/r8152.c
View File

@@ -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[] = {

4
drivers/usb/eth/smsc95xx.c
View File

@@ -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[] = {

4
drivers/usb/gadget/dwc2_udc_otg.c
View File

@@ -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)

4
drivers/usb/gadget/ether.c
View File

@@ -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 */

2
drivers/usb/gadget/max3420_udc.c
View File

@@ -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),
};

2
drivers/usb/host/dwc2.c
View File

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

2
drivers/usb/host/dwc3-of-simple.c
View File

@@ -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,
};

2
drivers/usb/host/dwc3-sti-glue.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-atmel.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-exynos.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-fsl.c
View File

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

2
drivers/usb/host/ehci-generic.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-marvell.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-msm.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-mx5.c
View File

@@ -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) */

4
drivers/usb/host/ehci-mx6.c
View File

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

4
drivers/usb/host/ehci-omap.c
View File

@@ -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,

4
drivers/usb/host/ehci-pci.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-tegra.c
View File

@@ -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,
};

4
drivers/usb/host/ehci-vf.c
View File

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

4
drivers/usb/host/ehci-zynq.c
View File

@@ -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,
};

2
drivers/usb/host/ohci-da8xx.c
View File

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

2
drivers/usb/host/ohci-generic.c
View File

@@ -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,
};

4
drivers/usb/host/ohci-pci.c
View File

@@ -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,
};

2
drivers/usb/host/r8a66597-hcd.c
View File

@@ -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,
};

2
drivers/usb/host/usb-sandbox.c
View File

@@ -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),
};

8
drivers/usb/host/usb-uclass.c
View File

@@ -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) = {

4
drivers/usb/host/xhci-brcm.c
View File

@@ -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,
};

4
drivers/usb/host/xhci-dwc3.c
View File

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

4
drivers/usb/host/xhci-exynos5.c
View File

@@ -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,
};

4
drivers/usb/host/xhci-fsl.c
View File

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

2
drivers/usb/host/xhci-mtk.c
View File

@@ -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,
};

4
drivers/usb/host/xhci-mvebu.c
View File

@@ -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,
};

4
drivers/usb/host/xhci-pci.c
View File

@@ -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,
};

4
drivers/usb/host/xhci-rcar.c
View File

@@ -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,
};

6
drivers/usb/mtu3/mtu3_plat.c
View File

@@ -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),
};

4
drivers/usb/musb-new/da8xx.c
View File

@@ -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),
};

4
drivers/usb/musb-new/mt85xx.c
View File

@@ -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),
};

4
drivers/usb/musb-new/omap2430.c
View File

@@ -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) */

4
drivers/usb/musb-new/pic32.c
View File

@@ -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),
};

4
drivers/usb/musb-new/sunxi.c
View File

@@ -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),
};

8
drivers/usb/musb-new/ti-musb.c
View File

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