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>

22 files changed, 44 insertions, 44 deletions

diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 1fca3e6dd9..baa935e0d5 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -408,7 +408,7 @@ static int am654_sdhci_probe(struct udevice *dev)
 	return 0;
 }
 
-static int am654_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int am654_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct am654_sdhci_plat *plat = dev_get_plat(dev);
 	struct sdhci_host *host = dev_get_priv(dev);
@@ -490,7 +490,7 @@ U_BOOT_DRIVER(am654_sdhci_drv) = {
 	.name		= "am654_sdhci",
 	.id		= UCLASS_MMC,
 	.of_match	= am654_sdhci_ids,
-	.ofdata_to_platdata = am654_sdhci_ofdata_to_platdata,
+	.of_to_plat = am654_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= am654_sdhci_bind,
 	.probe		= am654_sdhci_probe,
diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index 7dc23ca226..fe406fe4ad 100644
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -523,7 +523,7 @@ static const struct dm_mmc_ops arm_pl180_dm_mmc_ops = {
 	.get_cd = dm_mmc_getcd,
 };
 
-static int arm_pl180_mmc_ofdata_to_platdata(struct udevice *dev)
+static int arm_pl180_mmc_of_to_plat(struct udevice *dev)
 {
 	struct pl180_mmc_host *host = dev->priv;
 	fdt_addr_t addr;
@@ -549,7 +549,7 @@ U_BOOT_DRIVER(arm_pl180_mmc) = {
 	.of_match = arm_pl180_mmc_match,
 	.ops = &arm_pl180_dm_mmc_ops,
 	.probe = arm_pl180_mmc_probe,
-	.ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata,
+	.of_to_plat = arm_pl180_mmc_of_to_plat,
 	.bind = arm_pl180_mmc_bind,
 	.priv_auto	= sizeof(struct pl180_mmc_host),
 	.plat_auto	= sizeof(struct arm_pl180_mmc_plat),
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 5b08d09912..fad2ff5aaf 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -87,7 +87,7 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq)
 	return SD_SCLK_MAX / clk_div / (host->div + 1);
 }
 
-static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int ca_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct ca_dwmmc_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -162,7 +162,7 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = {
 	.name		= "cortina_dwmmc",
 	.id		= UCLASS_MMC,
 	.of_match	= ca_dwmmc_ids,
-	.ofdata_to_platdata = ca_dwmmc_ofdata_to_platdata,
+	.of_to_plat = ca_dwmmc_of_to_plat,
 	.bind		= ca_dwmmc_bind,
 	.ops		= &ca_dwmci_dm_ops,
 	.probe		= ca_dwmmc_probe,
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 975a6bec06..05ca361280 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -501,7 +501,7 @@ static int davinci_mmc_bind(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int davinci_mmc_ofdata_to_platdata(struct udevice *dev)
+static int davinci_mmc_of_to_plat(struct udevice *dev)
 {
 	struct davinci_mmc_plat *plat = dev_get_plat(dev);
 	struct mmc_config *cfg = &plat->cfg;
@@ -528,7 +528,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match	= davinci_mmc_ids,
 	.plat_auto	= sizeof(struct davinci_mmc_plat),
-	.ofdata_to_platdata = davinci_mmc_ofdata_to_platdata,
+	.of_to_plat = davinci_mmc_of_to_plat,
 #endif
 #if CONFIG_BLK
 	.bind		= davinci_mmc_bind,
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 2b89b96f59..6bf8695e45 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -1384,7 +1384,7 @@ __weak void init_clk_usdhc(u32 index)
 {
 }
 
-static int fsl_esdhc_ofdata_to_platdata(struct udevice *dev)
+static int fsl_esdhc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
@@ -1701,7 +1701,7 @@ U_BOOT_DRIVER(fsl_esdhc) = {
 	.name	= "fsl_esdhc",
 	.id	= UCLASS_MMC,
 	.of_match = fsl_esdhc_ids,
-	.ofdata_to_platdata = fsl_esdhc_ofdata_to_platdata,
+	.of_to_plat = fsl_esdhc_of_to_plat,
 	.ops	= &fsl_esdhc_ops,
 #if CONFIG_IS_ENABLED(BLK)
 	.bind	= fsl_esdhc_bind,
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 1c31874235..fa6181d85f 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -389,7 +389,7 @@ static void ftsdc_setup_cfg(struct mmc_config *cfg, const char *name, int buswid
 	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 }
 
-static int ftsdc010_mmc_ofdata_to_platdata(struct udevice *dev)
+static int ftsdc010_mmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct ftsdc_priv *priv = dev_get_priv(dev);
@@ -473,7 +473,7 @@ U_BOOT_DRIVER(ftsdc010_mmc) = {
 	.name		= "ftsdc010_mmc",
 	.id		= UCLASS_MMC,
 	.of_match	= ftsdc010_mmc_ids,
-	.ofdata_to_platdata = ftsdc010_mmc_ofdata_to_platdata,
+	.of_to_plat = ftsdc010_mmc_of_to_plat,
 	.ops		= &dm_ftsdc010_mmc_ops,
 	.bind		= ftsdc010_mmc_bind,
 	.probe		= ftsdc010_mmc_probe,
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 5fd71b8a40..bb5d0922be 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -27,7 +27,7 @@ struct hisi_mmc_data {
 	bool use_fifo;
 };
 
-static int hi6220_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int hi6220_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct hi6220_dwmmc_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -108,7 +108,7 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = {
 	.name = "hi6220_dwmmc",
 	.id = UCLASS_MMC,
 	.of_match = hi6220_dwmmc_ids,
-	.ofdata_to_platdata = hi6220_dwmmc_ofdata_to_platdata,
+	.of_to_plat = hi6220_dwmmc_of_to_plat,
 	.ops = &dm_dwmci_ops,
 	.bind = hi6220_dwmmc_bind,
 	.probe = hi6220_dwmmc_probe,
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index edcfbfbce9..ae3af3927d 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -443,7 +443,7 @@ static const struct dm_mmc_ops jz_msc_ops = {
 	.set_ios	= jz_mmc_dm_set_ios,
 };
 
-static int jz_mmc_ofdata_to_platdata(struct udevice *dev)
+static int jz_mmc_of_to_plat(struct udevice *dev)
 {
 	struct jz_mmc_priv *priv = dev_get_priv(dev);
 	struct jz_mmc_plat *plat = dev_get_plat(dev);
@@ -498,7 +498,7 @@ U_BOOT_DRIVER(jz_mmc_drv) = {
 	.name			= "jz_mmc",
 	.id			= UCLASS_MMC,
 	.of_match		= jz_mmc_ids,
-	.ofdata_to_platdata	= jz_mmc_ofdata_to_platdata,
+	.of_to_plat	= jz_mmc_of_to_plat,
 	.bind			= jz_mmc_bind,
 	.probe			= jz_mmc_probe,
 	.priv_auto	= sizeof(struct jz_mmc_priv),
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index ab10d7c509..518e24e041 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -241,7 +241,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = {
 	.set_ios = meson_dm_mmc_set_ios,
 };
 
-static int meson_mmc_ofdata_to_platdata(struct udevice *dev)
+static int meson_mmc_of_to_plat(struct udevice *dev)
 {
 	struct meson_mmc_platdata *pdata = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -339,7 +339,7 @@ U_BOOT_DRIVER(meson_mmc) = {
 	.ops = &meson_dm_mmc_ops,
 	.probe = meson_mmc_probe,
 	.bind = meson_mmc_bind,
-	.ofdata_to_platdata = meson_mmc_ofdata_to_platdata,
+	.of_to_plat = meson_mmc_of_to_plat,
 	.plat_auto	= sizeof(struct meson_mmc_platdata),
 };
 
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index da4cecd760..bfbba46c5d 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -167,7 +167,7 @@ static int msm_sdc_remove(struct udevice *dev)
 	return 0;
 }
 
-static int msm_ofdata_to_platdata(struct udevice *dev)
+static int msm_of_to_plat(struct udevice *dev)
 {
 	struct udevice *parent = dev->parent;
 	struct msm_sdhc *priv = dev_get_priv(dev);
@@ -203,7 +203,7 @@ U_BOOT_DRIVER(msm_sdc_drv) = {
 	.name		= "msm_sdc",
 	.id		= UCLASS_MMC,
 	.of_match	= msm_mmc_ids,
-	.ofdata_to_platdata = msm_ofdata_to_platdata,
+	.of_to_plat = msm_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= msm_sdc_bind,
 	.probe		= msm_sdc_probe,
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index cc9d68546f..95dc9daee9 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -1545,7 +1545,7 @@ static int msdc_drv_probe(struct udevice *dev)
 	return 0;
 }
 
-static int msdc_ofdata_to_platdata(struct udevice *dev)
+static int msdc_of_to_plat(struct udevice *dev)
 {
 	struct msdc_plat *plat = dev_get_plat(dev);
 	struct msdc_host *host = dev_get_priv(dev);
@@ -1688,7 +1688,7 @@ U_BOOT_DRIVER(mtk_sd_drv) = {
 	.name = "mtk_sd",
 	.id = UCLASS_MMC,
 	.of_match = msdc_ids,
-	.ofdata_to_platdata = msdc_ofdata_to_platdata,
+	.of_to_plat = msdc_of_to_plat,
 	.bind = msdc_drv_bind,
 	.probe = msdc_drv_probe,
 	.ops = &msdc_ops,
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index dcf6c7c03f..c96334f96b 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -666,7 +666,7 @@ static const struct dm_mmc_ops mxsmmc_ops = {
 };
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int mxsmmc_ofdata_to_platdata(struct udevice *bus)
+static int mxsmmc_of_to_plat(struct udevice *bus)
 {
 	struct mxsmmc_platdata *plat = bus->plat;
 	u32 prop[2];
@@ -711,7 +711,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = {
 	.id	= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = mxsmmc_ids,
-	.ofdata_to_platdata = mxsmmc_ofdata_to_platdata,
+	.of_to_plat = mxsmmc_of_to_plat,
 #endif
 	.ops	= &mxsmmc_ops,
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 537be0d0d7..753c89d278 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -139,7 +139,7 @@ static unsigned long nx_dw_mmc_set_clk(struct dwmci_host *host,
 	return rate;
 }
 
-static int nexell_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int nexell_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct nexell_dwmmc_priv *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -228,7 +228,7 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = {
 	.name		= "nexell_dwmmc",
 	.id		= UCLASS_MMC,
 	.of_match	= nexell_dwmmc_ids,
-	.ofdata_to_platdata = nexell_dwmmc_ofdata_to_platdata,
+	.of_to_plat = nexell_dwmmc_of_to_plat,
 	.ops		= &dm_dwmci_ops,
 	.bind		= nexell_dwmmc_bind,
 	.probe		= nexell_dwmmc_probe,
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c4e9e82b19..52f044e37a 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -1898,7 +1898,7 @@ __weak const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr)
 }
 #endif
 
-static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
+static int omap_hsmmc_of_to_plat(struct udevice *dev)
 {
 	struct omap_hsmmc_plat *plat = dev_get_plat(dev);
 	struct omap_mmc_of_data *of_data = (void *)dev_get_driver_data(dev);
@@ -2028,7 +2028,7 @@ U_BOOT_DRIVER(omap_hsmmc) = {
 	.id	= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_hsmmc_ids,
-	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
+	.of_to_plat = omap_hsmmc_of_to_plat,
 	.plat_auto	= sizeof(struct omap_hsmmc_plat),
 #endif
 #ifdef CONFIG_BLK
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 0aec3f7de7..fc09ad99e5 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -50,7 +50,7 @@ static int pci_mmc_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int pci_mmc_ofdata_to_platdata(struct udevice *dev)
+static int pci_mmc_of_to_plat(struct udevice *dev)
 {
 	struct pci_mmc_priv *priv = dev_get_priv(dev);
 
@@ -129,7 +129,7 @@ U_BOOT_DRIVER(pci_mmc) = {
 	.id	= UCLASS_MMC,
 	.of_match = pci_mmc_match,
 	.bind	= pci_mmc_bind,
-	.ofdata_to_platdata	= pci_mmc_ofdata_to_platdata,
+	.of_to_plat	= pci_mmc_of_to_plat,
 	.probe	= pci_mmc_probe,
 	.ops	= &sdhci_ops,
 	.priv_auto	= sizeof(struct pci_mmc_priv),
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index 51a6b4dd1b..75db81ba4c 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -50,7 +50,7 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq)
 	return freq;
 }
 
-static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_dwmmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_dwmmc_priv *priv = dev_get_priv(dev);
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = {
 	.name		= "rockchip_rk3288_dw_mshc",
 	.id		= UCLASS_MMC,
 	.of_match	= rockchip_dwmmc_ids,
-	.ofdata_to_platdata = rockchip_dwmmc_ofdata_to_platdata,
+	.of_to_plat = rockchip_dwmmc_of_to_plat,
 	.ops		= &dm_dwmci_ops,
 	.bind		= rockchip_dwmmc_bind,
 	.probe		= rockchip_dwmmc_probe,
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 939b2344f9..d95f8b2a15 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -81,7 +81,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int arasan_sdhci_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct sdhci_host *host = dev_get_priv(dev);
@@ -110,7 +110,7 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.name		= "rockchip_rk3399_sdhci_5_1",
 	.id		= UCLASS_MMC,
 	.of_match	= arasan_sdhci_ids,
-	.ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata,
+	.of_to_plat = arasan_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= rockchip_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index ad274f5af7..50a8805e73 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -76,7 +76,7 @@ clk_err:
 	return ret;
 }
 
-static int snps_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int snps_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct snps_dwmci_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -191,7 +191,7 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = {
 	.name				= "snps_dw_mmc",
 	.id				= UCLASS_MMC,
 	.of_match			= snps_dwmmc_ids,
-	.ofdata_to_platdata		= snps_dwmmc_ofdata_to_platdata,
+	.of_to_plat		= snps_dwmmc_of_to_plat,
 	.ops				= &snps_dwmci_dm_ops,
 	.bind				= snps_dwmmc_bind,
 	.probe				= snps_dwmmc_probe,
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 84f8b8db2b..dc008c5e2f 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -95,7 +95,7 @@ static int socfpga_dwmmc_get_clk_rate(struct udevice *dev)
 	return 0;
 }
 
-static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int socfpga_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -185,7 +185,7 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
 	.name		= "socfpga_dwmmc",
 	.id		= UCLASS_MMC,
 	.of_match	= socfpga_dwmmc_ids,
-	.ofdata_to_platdata = socfpga_dwmmc_ofdata_to_platdata,
+	.of_to_plat = socfpga_dwmmc_of_to_plat,
 	.ops		= &dm_dwmci_ops,
 	.bind		= socfpga_dwmmc_bind,
 	.probe		= socfpga_dwmmc_probe,
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 4ad408a2a3..a09534255b 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -111,7 +111,7 @@ static int sti_sdhci_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int sti_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int sti_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct sdhci_host *host = dev_get_priv(dev);
 
@@ -142,7 +142,7 @@ U_BOOT_DRIVER(sti_mmc) = {
 	.of_match = sti_sdhci_ids,
 	.bind = sti_sdhci_bind,
 	.ops = &sdhci_ops,
-	.ofdata_to_platdata = sti_sdhci_ofdata_to_platdata,
+	.of_to_plat = sti_sdhci_of_to_plat,
 	.probe = sti_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
 	.plat_auto	= sizeof(struct sti_sdhci_plat),
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 5062397a79..b8e833e6a3 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -515,7 +515,7 @@ static int xenon_sdhci_probe(struct udevice *dev)
 	return ret;
 }
 
-static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int xenon_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct sdhci_host *host = dev_get_priv(dev);
 	struct xenon_sdhci_priv *priv = dev_get_priv(dev);
@@ -560,7 +560,7 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
 	.name		= "xenon_sdhci",
 	.id		= UCLASS_MMC,
 	.of_match	= xenon_sdhci_ids,
-	.ofdata_to_platdata = xenon_sdhci_ofdata_to_platdata,
+	.of_to_plat = xenon_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= xenon_sdhci_bind,
 	.probe		= xenon_sdhci_probe,
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 29850a435b..d9ad0ff199 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -613,7 +613,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int arasan_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct arasan_sdhci_priv *priv = dev_get_priv(dev);
 
@@ -655,7 +655,7 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.name		= "arasan_sdhci",
 	.id		= UCLASS_MMC,
 	.of_match	= arasan_sdhci_ids,
-	.ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata,
+	.of_to_plat = arasan_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= arasan_sdhci_bind,
 	.probe		= arasan_sdhci_probe,