diff options
author | Simon Glass <sjg@chromium.org> | 2020-12-03 16:55:21 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2020-12-13 16:51:09 -0700 |
commit | d1998a9fde0a917d6496299f6a97b6bccfdc6724 (patch) | |
tree | 1931d0c875e829620180bf383722c1a69bd1a951 /drivers/usb | |
parent | c69cda25c9b59e53a6bc8969ada58942549f5b5d (diff) | |
download | u-boot-d1998a9fde0a917d6496299f6a97b6bccfdc6724.tar.gz |
dm: treewide: Rename ofdata_to_platdata() to of_to_plat()
This name is far too long. Rename it to remove the 'data' bits. This makes
it consistent with the platdata->plat rename.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/dwc3/dwc3-generic.c | 6 | ||||
-rw-r--r-- | drivers/usb/emul/sandbox_flash.c | 4 | ||||
-rw-r--r-- | drivers/usb/gadget/dwc2_udc_otg.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/dwc2.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/dwc3-sti-glue.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-exynos.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-fsl.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-msm.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-mx5.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-mx6.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-omap.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-tegra.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-vf.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-zynq.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/r8a66597-hcd.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci-exynos5.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci-mvebu.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci-rcar.c | 4 | ||||
-rw-r--r-- | drivers/usb/musb-new/da8xx.c | 4 | ||||
-rw-r--r-- | drivers/usb/musb-new/omap2430.c | 4 | ||||
-rw-r--r-- | drivers/usb/musb-new/ti-musb.c | 14 |
21 files changed, 48 insertions, 48 deletions
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 0bfdaa0b07..459add80c5 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -105,7 +105,7 @@ static int dwc3_generic_remove(struct udevice *dev, return 0; } -static int dwc3_generic_ofdata_to_platdata(struct udevice *dev) +static int dwc3_generic_of_to_plat(struct udevice *dev) { struct dwc3_generic_plat *plat = dev_get_plat(dev); ofnode node = dev->node; @@ -155,7 +155,7 @@ static int dwc3_generic_peripheral_remove(struct udevice *dev) U_BOOT_DRIVER(dwc3_generic_peripheral) = { .name = "dwc3-generic-peripheral", .id = UCLASS_USB_GADGET_GENERIC, - .ofdata_to_platdata = dwc3_generic_ofdata_to_platdata, + .of_to_plat = dwc3_generic_of_to_plat, .probe = dwc3_generic_peripheral_probe, .remove = dwc3_generic_peripheral_remove, .priv_auto = sizeof(struct dwc3_generic_priv), @@ -197,7 +197,7 @@ static int dwc3_generic_host_remove(struct udevice *dev) U_BOOT_DRIVER(dwc3_generic_host) = { .name = "dwc3-generic-host", .id = UCLASS_USB, - .ofdata_to_platdata = dwc3_generic_ofdata_to_platdata, + .of_to_plat = dwc3_generic_of_to_plat, .probe = dwc3_generic_host_probe, .remove = dwc3_generic_host_remove, .priv_auto = sizeof(struct dwc3_generic_host_priv), diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 67c23200dd..edabc1b3a7 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -366,7 +366,7 @@ err: return 0; } -static int sandbox_flash_ofdata_to_platdata(struct udevice *dev) +static int sandbox_flash_of_to_plat(struct udevice *dev) { struct sandbox_flash_plat *plat = dev_get_plat(dev); @@ -419,7 +419,7 @@ U_BOOT_DRIVER(usb_sandbox_flash) = { .of_match = sandbox_usb_flash_ids, .bind = sandbox_flash_bind, .probe = sandbox_flash_probe, - .ofdata_to_platdata = sandbox_flash_ofdata_to_platdata, + .of_to_plat = sandbox_flash_of_to_plat, .ops = &sandbox_usb_flash_ops, .priv_auto = sizeof(struct sandbox_flash_priv), .plat_auto = sizeof(struct sandbox_flash_plat), diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 2d5b7dc83f..4771b1e931 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -980,7 +980,7 @@ static void dwc2_phy_shutdown(struct udevice *dev, struct phy_bulk *phys) generic_phy_exit_bulk(phys); } -static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) +static int dwc2_udc_otg_of_to_plat(struct udevice *dev) { struct dwc2_plat_otg_data *plat = dev_get_plat(dev); ulong drvdata; @@ -1185,7 +1185,7 @@ U_BOOT_DRIVER(dwc2_udc_otg) = { .name = "dwc2-udc-otg", .id = UCLASS_USB_GADGET_GENERIC, .of_match = dwc2_udc_otg_ids, - .ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata, + .of_to_plat = dwc2_udc_otg_of_to_plat, .probe = dwc2_udc_otg_probe, .remove = dwc2_udc_otg_remove, .plat_auto = sizeof(struct dwc2_plat_otg_data), diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 40d389cbd6..ec643e9f45 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -1326,7 +1326,7 @@ static int dwc2_submit_int_msg(struct udevice *dev, struct usb_device *udev, nonblock); } -static int dwc2_usb_ofdata_to_platdata(struct udevice *dev) +static int dwc2_usb_of_to_plat(struct udevice *dev) { struct dwc2_priv *priv = dev_get_priv(dev); @@ -1473,7 +1473,7 @@ U_BOOT_DRIVER(usb_dwc2) = { .name = "dwc2_usb", .id = UCLASS_USB, .of_match = dwc2_usb_ids, - .ofdata_to_platdata = dwc2_usb_ofdata_to_platdata, + .of_to_plat = dwc2_usb_of_to_plat, .probe = dwc2_usb_probe, .remove = dwc2_usb_remove, .ops = &dwc2_usb_ops, diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index 90266c725f..660a145e4d 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -100,7 +100,7 @@ static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat) setbits_le32(plat->glue_base + CLKRST_CTRL, SW_PIPEW_RESET_N); } -static int sti_dwc3_glue_ofdata_to_platdata(struct udevice *dev) +static int sti_dwc3_glue_of_to_plat(struct udevice *dev) { struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); struct udevice *syscon; @@ -242,7 +242,7 @@ U_BOOT_DRIVER(dwc3_sti_glue) = { .name = "dwc3_sti_glue", .id = UCLASS_NOP, .of_match = sti_dwc3_glue_ids, - .ofdata_to_platdata = sti_dwc3_glue_ofdata_to_platdata, + .of_to_plat = sti_dwc3_glue_of_to_plat, .probe = sti_dwc3_glue_probe, .remove = sti_dwc3_glue_remove, .bind = sti_dwc3_glue_bind, diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 0a3983b429..690a96c5bd 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -43,7 +43,7 @@ struct exynos_ehci { struct ehci_hccr *hcd; }; -static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct exynos_ehci_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; @@ -254,7 +254,7 @@ U_BOOT_DRIVER(usb_ehci) = { .name = "ehci_exynos", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 9824b7b190..dfeca8915b 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -58,7 +58,7 @@ static int usb_phy_clk_valid(struct usb_ehci *ehci) } #if CONFIG_IS_ENABLED(DM_USB) -static int ehci_fsl_ofdata_to_platdata(struct udevice *dev) +static int ehci_fsl_of_to_plat(struct udevice *dev) { struct ehci_fsl_priv *priv = dev_get_priv(dev); const void *prop; @@ -141,7 +141,7 @@ U_BOOT_DRIVER(ehci_fsl) = { .name = "ehci_fsl", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_fsl_ofdata_to_platdata, + .of_to_plat = ehci_fsl_of_to_plat, .probe = ehci_fsl_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 6143de2266..a3405d02e5 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -101,7 +101,7 @@ static int ehci_usb_remove(struct udevice *dev) return 0; } -static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct msm_ehci_priv *priv = dev_get_priv(dev); @@ -140,7 +140,7 @@ U_BOOT_DRIVER(usb_ehci) = { .name = "ehci_msm", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index 717ef68a88..970bbe924b 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -285,7 +285,7 @@ static const struct ehci_ops mx5_ehci_ops = { .powerup_fixup = mx5_ehci_powerup_fixup, }; -static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct usb_platdata *plat = dev_get_plat(dev); const char *mode; @@ -363,7 +363,7 @@ U_BOOT_DRIVER(usb_mx5) = { .name = "ehci_mx5", .id = UCLASS_USB, .of_match = mx5_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 53f0e491cd..628081aec9 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -518,7 +518,7 @@ static int ehci_usb_phy_mode(struct udevice *dev) return 0; } -static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct usb_platdata *plat = dev_get_plat(dev); enum usb_dr_mode dr_mode; @@ -645,7 +645,7 @@ U_BOOT_DRIVER(usb_mx6) = { .name = "ehci_mx6", .id = UCLASS_USB, .of_match = mx6_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .bind = ehci_usb_bind, .probe = ehci_usb_probe, .remove = ehci_deregister, diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 0ca20a984e..58a9a1da5f 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -366,7 +366,7 @@ struct ehci_omap_priv_data { int nports; }; -static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct usb_platdata *plat = dev_get_plat(dev); @@ -402,7 +402,7 @@ U_BOOT_DRIVER(usb_omap_ehci) = { .id = UCLASS_USB, .of_match = omap_ehci_dt_ids, .probe = omap_ehci_probe, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .plat_auto = sizeof(struct usb_platdata), .priv_auto = sizeof(struct ehci_omap_priv_data), .remove = ehci_deregister, diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 68a49046e7..c16eec3558 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -812,7 +812,7 @@ static const struct ehci_ops tegra_ehci_ops = { .powerup_fixup = tegra_ehci_powerup_fixup, }; -static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct fdt_usb *priv = dev_get_priv(dev); int ret; @@ -861,7 +861,7 @@ U_BOOT_DRIVER(usb_ehci) = { .name = "ehci_tegra", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index e3112826d4..a517c61f6b 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -215,7 +215,7 @@ struct ehci_vf_priv_data { u32 portnr; }; -static int vf_usb_ofdata_to_platdata(struct udevice *dev) +static int vf_usb_of_to_plat(struct udevice *dev) { struct ehci_vf_priv_data *priv = dev_get_priv(dev); const void *dt_blob = gd->fdt_blob; @@ -354,7 +354,7 @@ U_BOOT_DRIVER(usb_ehci) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .ofdata_to_platdata = vf_usb_ofdata_to_platdata, + .of_to_plat = vf_usb_of_to_plat, .plat_auto = sizeof(struct usb_platdata), .priv_auto = sizeof(struct ehci_vf_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index 7a7cfaa44d..6756465d64 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -21,7 +21,7 @@ struct zynq_ehci_priv { struct usb_ehci *ehci; }; -static int ehci_zynq_ofdata_to_platdata(struct udevice *dev) +static int ehci_zynq_of_to_plat(struct udevice *dev) { struct zynq_ehci_priv *priv = dev_get_priv(dev); @@ -81,7 +81,7 @@ U_BOOT_DRIVER(ehci_zynq) = { .name = "ehci_zynq", .id = UCLASS_USB, .of_match = ehci_zynq_ids, - .ofdata_to_platdata = ehci_zynq_ofdata_to_platdata, + .of_to_plat = ehci_zynq_of_to_plat, .probe = ehci_zynq_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 7620ac2da7..f1fc93f3d4 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -805,7 +805,7 @@ static int r8a66597_submit_bulk_msg(struct udevice *udev, return ret; } -static int r8a66597_usb_ofdata_to_platdata(struct udevice *dev) +static int r8a66597_usb_of_to_plat(struct udevice *dev) { struct r8a66597 *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -890,7 +890,7 @@ U_BOOT_DRIVER(usb_r8a66597) = { .name = "r8a66597_usb", .id = UCLASS_USB, .of_match = r8a66597_usb_ids, - .ofdata_to_platdata = r8a66597_usb_ofdata_to_platdata, + .of_to_plat = r8a66597_usb_of_to_plat, .probe = r8a66597_usb_probe, .remove = r8a66597_usb_remove, .ops = &r8a66597_usb_ops, diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 4d3dd360bf..fe804a0dfe 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -52,7 +52,7 @@ struct exynos_xhci { struct dwc3 *dwc3_reg; }; -static int xhci_usb_ofdata_to_platdata(struct udevice *dev) +static int xhci_usb_of_to_plat(struct udevice *dev) { struct exynos_xhci_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; @@ -251,7 +251,7 @@ U_BOOT_DRIVER(usb_xhci) = { .name = "xhci_exynos", .id = UCLASS_USB, .of_match = xhci_usb_ids, - .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, + .of_to_plat = xhci_usb_of_to_plat, .probe = xhci_usb_probe, .remove = xhci_usb_remove, .ops = &xhci_usb_ops, diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index ffecfc28ef..017f99b629 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -65,7 +65,7 @@ static int xhci_usb_probe(struct udevice *dev) return xhci_register(dev, ctx->hcd, hcor); } -static int xhci_usb_ofdata_to_platdata(struct udevice *dev) +static int xhci_usb_of_to_plat(struct udevice *dev) { struct mvebu_xhci_platdata *plat = dev_get_plat(dev); @@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = { .name = "xhci_mvebu", .id = UCLASS_USB, .of_match = xhci_usb_ids, - .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, + .of_to_plat = xhci_usb_of_to_plat, .probe = xhci_usb_probe, .remove = xhci_deregister, .ops = &xhci_usb_ops, diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 22dfaf49b7..dc941a2068 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -132,7 +132,7 @@ static int xhci_rcar_deregister(struct udevice *dev) return ret; } -static int xhci_rcar_ofdata_to_platdata(struct udevice *dev) +static int xhci_rcar_of_to_plat(struct udevice *dev) { struct rcar_xhci_platdata *plat = dev_get_plat(dev); @@ -160,7 +160,7 @@ U_BOOT_DRIVER(usb_xhci) = { .remove = xhci_rcar_deregister, .ops = &xhci_usb_ops, .of_match = xhci_rcar_ids, - .ofdata_to_platdata = xhci_rcar_ofdata_to_platdata, + .of_to_plat = xhci_rcar_of_to_plat, .plat_auto = sizeof(struct rcar_xhci_platdata), .priv_auto = sizeof(struct rcar_xhci), .flags = DM_FLAG_ALLOC_PRIV_DMA, diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c index d9591b97c3..c59ca54437 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -256,7 +256,7 @@ struct da8xx_musb_platdata { struct phy phy; }; -static int da8xx_musb_ofdata_to_platdata(struct udevice *dev) +static int da8xx_musb_of_to_plat(struct udevice *dev) { struct da8xx_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; @@ -344,7 +344,7 @@ U_BOOT_DRIVER(da8xx_musb) = { .name = "da8xx-musb", .id = UCLASS_USB, .of_match = da8xx_musb_ids, - .ofdata_to_platdata = da8xx_musb_ofdata_to_platdata, + .of_to_plat = da8xx_musb_of_to_plat, .probe = da8xx_musb_probe, .remove = da8xx_musb_remove, .ops = &musb_usb_ops, diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index b09f0d499d..b9bba22a65 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -149,7 +149,7 @@ struct omap2430_musb_platdata { struct omap_musb_board_data otg_board_data; }; -static int omap2430_musb_ofdata_to_platdata(struct udevice *dev) +static int omap2430_musb_of_to_plat(struct udevice *dev) { struct omap2430_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; @@ -269,7 +269,7 @@ U_BOOT_DRIVER(omap2430_musb) = { .id = UCLASS_USB_GADGET_GENERIC, #endif .of_match = omap2430_musb_ids, - .ofdata_to_platdata = omap2430_musb_ofdata_to_platdata, + .of_to_plat = omap2430_musb_of_to_plat, .probe = omap2430_musb_probe, .remove = omap2430_musb_remove, #ifdef CONFIG_USB_MUSB_HOST diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 716e820557..b0ee57ad8a 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -77,7 +77,7 @@ static int ti_musb_get_usb_index(int node) return -ENOENT; } -static int ti_musb_ofdata_to_platdata(struct udevice *dev) +static int ti_musb_of_to_plat(struct udevice *dev) { struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; @@ -176,14 +176,14 @@ static int ti_musb_host_remove(struct udevice *dev) } #if CONFIG_IS_ENABLED(OF_CONTROL) -static int ti_musb_host_ofdata_to_platdata(struct udevice *dev) +static int ti_musb_host_of_to_plat(struct udevice *dev) { struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret; - ret = ti_musb_ofdata_to_platdata(dev); + ret = ti_musb_of_to_plat(dev); if (ret) { pr_err("plat dt parse error\n"); return ret; @@ -199,7 +199,7 @@ U_BOOT_DRIVER(ti_musb_host) = { .name = "ti-musb-host", .id = UCLASS_USB, #if CONFIG_IS_ENABLED(OF_CONTROL) - .ofdata_to_platdata = ti_musb_host_ofdata_to_platdata, + .of_to_plat = ti_musb_host_of_to_plat, #endif .probe = ti_musb_host_probe, .remove = ti_musb_host_remove, @@ -214,14 +214,14 @@ struct ti_musb_peripheral { }; #if CONFIG_IS_ENABLED(OF_CONTROL) -static int ti_musb_peripheral_ofdata_to_platdata(struct udevice *dev) +static int ti_musb_peripheral_of_to_plat(struct udevice *dev) { struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret; - ret = ti_musb_ofdata_to_platdata(dev); + ret = ti_musb_of_to_plat(dev); if (ret) { pr_err("plat dt parse error\n"); return ret; @@ -272,7 +272,7 @@ U_BOOT_DRIVER(ti_musb_peripheral) = { .name = "ti-musb-peripheral", .id = UCLASS_USB_GADGET_GENERIC, #if CONFIG_IS_ENABLED(OF_CONTROL) - .ofdata_to_platdata = ti_musb_peripheral_ofdata_to_platdata, + .of_to_plat = ti_musb_peripheral_of_to_plat, #endif .probe = ti_musb_peripheral_probe, .remove = ti_musb_peripheral_remove, |