dm: treewide: Rename auto_alloc_size members to be shorter

This construct is quite long-winded. In earlier days it made some sense
since auto-allocation was a strange concept. But with driver model now
used pretty universally, we can shorten this to 'auto'. This reduces
verbosity and makes it easier to read.

Coincidentally it also ensures that every declaration is on one line,
thus making dtoc's job easier.

Signed-off-by: Simon Glass <sjg@chromium.org>

48 files changed, 91 insertions, 91 deletions

diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 82abf484e4f..926fba68638 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -494,6 +494,6 @@ U_BOOT_DRIVER(am654_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= am654_sdhci_bind,
 	.probe		= am654_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct am654_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct am654_sdhci_plat),
 };
diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index 846622892a9..6c118b48190 100644
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -551,7 +551,7 @@ U_BOOT_DRIVER(arm_pl180_mmc) = {
 	.probe = arm_pl180_mmc_probe,
 	.ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata,
 	.bind = arm_pl180_mmc_bind,
-	.priv_auto_alloc_size = sizeof(struct pl180_mmc_host),
-	.platdata_auto_alloc_size = sizeof(struct arm_pl180_mmc_plat),
+	.priv_auto	= sizeof(struct pl180_mmc_host),
+	.platdata_auto	= sizeof(struct arm_pl180_mmc_plat),
 };
 #endif
diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c
index 543c65a8e35..4bf02c3bb47 100644
--- a/drivers/mmc/aspeed_sdhci.c
+++ b/drivers/mmc/aspeed_sdhci.c
@@ -86,6 +86,6 @@ U_BOOT_DRIVER(aspeed_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= aspeed_sdhci_bind,
 	.probe		= aspeed_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct aspeed_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct aspeed_sdhci_plat),
 };
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index f56ae63bc2c..6f3b21b98d2 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -130,7 +130,7 @@ U_BOOT_DRIVER(atmel_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= atmel_sdhci_bind,
 	.probe		= atmel_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct atmel_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct atmel_sdhci_plat),
 };
 #endif
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 7a410d1dd36..7beb3b562cf 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -250,7 +250,7 @@ U_BOOT_DRIVER(sdhci_cdns) = {
 	.of_match = bcm2835_sdhci_match,
 	.bind = bcm2835_sdhci_bind,
 	.probe = bcm2835_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm2835_sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct bcm2835_sdhci_plat),
+	.priv_auto	= sizeof(struct bcm2835_sdhci_host),
+	.platdata_auto	= sizeof(struct bcm2835_sdhci_plat),
 	.ops = &sdhci_ops,
 };
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index ea8b385d7e1..06bebc27d3b 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -806,7 +806,7 @@ U_BOOT_DRIVER(bcm2835_sdhost) = {
 	.of_match = bcm2835_match,
 	.bind = bcm2835_bind,
 	.probe = bcm2835_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm2835_host),
-	.platdata_auto_alloc_size = sizeof(struct bcm2835_plat),
+	.priv_auto	= sizeof(struct bcm2835_host),
+	.platdata_auto	= sizeof(struct bcm2835_plat),
 	.ops = &bcm2835_ops,
 };
diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c
index 5269aa77ceb..a92467f8004 100644
--- a/drivers/mmc/bcmstb_sdhci.c
+++ b/drivers/mmc/bcmstb_sdhci.c
@@ -100,6 +100,6 @@ U_BOOT_DRIVER(sdhci_bcmstb) = {
 	.ops = &sdhci_ops,
 	.bind = sdhci_bcmstb_bind,
 	.probe = sdhci_bcmstb_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sdhci_bcmstb_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sdhci_bcmstb_plat),
 };
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 198c41f451f..98d7f6b0b53 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -166,6 +166,6 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = {
 	.bind		= ca_dwmmc_bind,
 	.ops		= &ca_dwmci_dm_ops,
 	.probe		= ca_dwmmc_probe,
-	.priv_auto_alloc_size	= sizeof(struct ca_dwmmc_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct ca_mmc_plat),
+	.priv_auto	= sizeof(struct ca_dwmmc_priv_data),
+	.platdata_auto	= sizeof(struct ca_mmc_plat),
 };
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 0a05fb13bc9..0b9669abbc8 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -527,7 +527,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = {
 	.id		= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match	= davinci_mmc_ids,
-	.platdata_auto_alloc_size = sizeof(struct davinci_mmc_plat),
+	.platdata_auto	= sizeof(struct davinci_mmc_plat),
 	.ofdata_to_platdata = davinci_mmc_ofdata_to_platdata,
 #endif
 #if CONFIG_BLK
@@ -535,7 +535,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = {
 #endif
 	.probe = davinci_mmc_probe,
 	.ops = &davinci_mmc_ops,
-	.priv_auto_alloc_size = sizeof(struct davinci_mmc_priv),
+	.priv_auto	= sizeof(struct davinci_mmc_priv),
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 435ccac5942..63d00a3141f 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -306,7 +306,7 @@ U_BOOT_DRIVER(exynos_dwmmc_drv) = {
 	.bind		= exynos_dwmmc_bind,
 	.ops		= &dm_dwmci_ops,
 	.probe		= exynos_dwmmc_probe,
-	.priv_auto_alloc_size	= sizeof(struct dwmci_exynos_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct exynos_mmc_plat),
+	.priv_auto	= sizeof(struct dwmci_exynos_priv_data),
+	.platdata_auto	= sizeof(struct exynos_mmc_plat),
 };
 #endif
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index a18316eda71..0a644853f1a 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1136,7 +1136,7 @@ U_BOOT_DRIVER(fsl_esdhc) = {
 	.ops	= &fsl_esdhc_ops,
 	.bind	= fsl_esdhc_bind,
 	.probe	= fsl_esdhc_probe,
-	.platdata_auto_alloc_size = sizeof(struct fsl_esdhc_plat),
-	.priv_auto_alloc_size = sizeof(struct fsl_esdhc_priv),
+	.platdata_auto	= sizeof(struct fsl_esdhc_plat),
+	.priv_auto	= sizeof(struct fsl_esdhc_priv),
 };
 #endif
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 22040c67a84..25129fd690e 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -1707,8 +1707,8 @@ U_BOOT_DRIVER(fsl_esdhc) = {
 	.bind	= fsl_esdhc_bind,
 #endif
 	.probe	= fsl_esdhc_probe,
-	.platdata_auto_alloc_size = sizeof(struct fsl_esdhc_plat),
-	.priv_auto_alloc_size = sizeof(struct fsl_esdhc_priv),
+	.platdata_auto	= sizeof(struct fsl_esdhc_plat),
+	.priv_auto	= sizeof(struct fsl_esdhc_priv),
 };
 
 U_BOOT_DRIVER_ALIAS(fsl_esdhc, fsl_imx6q_usdhc)
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index bc0d5ffed51..5d312df2b48 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -477,6 +477,6 @@ U_BOOT_DRIVER(ftsdc010_mmc) = {
 	.ops		= &dm_ftsdc010_mmc_ops,
 	.bind		= ftsdc010_mmc_bind,
 	.probe		= ftsdc010_mmc_probe,
-	.priv_auto_alloc_size = sizeof(struct ftsdc_priv),
-	.platdata_auto_alloc_size = sizeof(struct ftsdc010_plat),
+	.priv_auto	= sizeof(struct ftsdc_priv),
+	.platdata_auto	= sizeof(struct ftsdc010_plat),
 };
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 0a347b2fb20..c135ee9b7ca 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -624,8 +624,8 @@ U_BOOT_DRIVER(atmel_mci) = {
 	.of_match = atmel_mci_ids,
 	.bind = atmel_mci_bind,
 	.probe = atmel_mci_probe,
-	.platdata_auto_alloc_size = sizeof(struct atmel_mci_plat),
-	.priv_auto_alloc_size = sizeof(struct atmel_mci_priv),
+	.platdata_auto	= sizeof(struct atmel_mci_plat),
+	.priv_auto	= sizeof(struct atmel_mci_priv),
 	.ops = &atmel_mci_mmc_ops,
 };
 #endif
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 67d6a05b3b5..cdc9a44e3e6 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -112,6 +112,6 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = {
 	.ops = &dm_dwmci_ops,
 	.bind = hi6220_dwmmc_bind,
 	.probe = hi6220_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct hi6220_dwmmc_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct hi6220_dwmmc_plat),
+	.priv_auto	= sizeof(struct hi6220_dwmmc_priv_data),
+	.platdata_auto	= sizeof(struct hi6220_dwmmc_plat),
 };
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 9f530638e31..e5c453e2159 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -247,6 +247,6 @@ U_BOOT_DRIVER(iproc_sdhci_drv) = {
 	.ops = &sdhci_ops,
 	.bind = iproc_sdhci_bind,
 	.probe = iproc_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct iproc_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct iproc_sdhci_plat),
 };
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index b33f0850738..e3a28234463 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -501,8 +501,8 @@ U_BOOT_DRIVER(jz_mmc_drv) = {
 	.ofdata_to_platdata	= jz_mmc_ofdata_to_platdata,
 	.bind			= jz_mmc_bind,
 	.probe			= jz_mmc_probe,
-	.priv_auto_alloc_size	= sizeof(struct jz_mmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct jz_mmc_plat),
+	.priv_auto	= sizeof(struct jz_mmc_priv),
+	.platdata_auto	= sizeof(struct jz_mmc_plat),
 	.ops			= &jz_msc_ops,
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index a5e9ac5637b..a03a37783da 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -340,7 +340,7 @@ U_BOOT_DRIVER(meson_mmc) = {
 	.probe = meson_mmc_probe,
 	.bind = meson_mmc_bind,
 	.ofdata_to_platdata = meson_mmc_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct meson_mmc_platdata),
+	.platdata_auto	= sizeof(struct meson_mmc_platdata),
 };
 
 #ifdef CONFIG_PWRSEQ
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 285ac480615..269f31afeee 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -508,5 +508,5 @@ UCLASS_DRIVER(mmc) = {
 	.id		= UCLASS_MMC,
 	.name		= "mmc",
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
-	.per_device_auto_alloc_size = sizeof(struct mmc_uclass_priv),
+	.per_device_auto	= sizeof(struct mmc_uclass_priv),
 };
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 50fcd32674f..31c8f06ca65 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -468,6 +468,6 @@ U_BOOT_DRIVER(mmc_spi) = {
 	.ops = &mmc_spi_ops,
 	.probe = mmc_spi_probe,
 	.bind = mmc_spi_bind,
-	.platdata_auto_alloc_size = sizeof(struct mmc_spi_plat),
-	.priv_auto_alloc_size = sizeof(struct mmc_spi_priv),
+	.platdata_auto	= sizeof(struct mmc_spi_plat),
+	.priv_auto	= sizeof(struct mmc_spi_priv),
 };
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 2a1f412278e..049dd33ce4f 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -208,6 +208,6 @@ U_BOOT_DRIVER(msm_sdc_drv) = {
 	.bind		= msm_sdc_bind,
 	.probe		= msm_sdc_probe,
 	.remove		= msm_sdc_remove,
-	.priv_auto_alloc_size = sizeof(struct msm_sdhc),
-	.platdata_auto_alloc_size = sizeof(struct msm_sdhc_plat),
+	.priv_auto	= sizeof(struct msm_sdhc),
+	.platdata_auto	= sizeof(struct msm_sdhc_plat),
 };
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 4f9fa7d0ec3..d701a4cd008 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -1692,6 +1692,6 @@ U_BOOT_DRIVER(mtk_sd_drv) = {
 	.bind = msdc_drv_bind,
 	.probe = msdc_drv_probe,
 	.ops = &msdc_ops,
-	.platdata_auto_alloc_size = sizeof(struct msdc_plat),
-	.priv_auto_alloc_size = sizeof(struct msdc_host),
+	.platdata_auto	= sizeof(struct msdc_plat),
+	.priv_auto	= sizeof(struct msdc_host),
 };
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 9b3dfa13e61..fb803e3be7d 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -151,7 +151,7 @@ U_BOOT_DRIVER(mv_sdhci_drv) = {
 	.bind		= mv_sdhci_bind,
 	.probe		= mv_sdhci_probe,
 	.ops		= &sdhci_ops,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct mv_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct mv_sdhci_plat),
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 2b3a3a992cb..fd43f27ade5 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -718,8 +718,8 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = {
 	.bind	= mxsmmc_bind,
 #endif
 	.probe	= mxsmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct mxsmmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct mxsmmc_platdata),
+	.priv_auto	= sizeof(struct mxsmmc_priv),
+	.platdata_auto	= sizeof(struct mxsmmc_platdata),
 };
 
 U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc)
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 04627594449..680459bae78 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -232,6 +232,6 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = {
 	.ops		= &dm_dwmci_ops,
 	.bind		= nexell_dwmmc_bind,
 	.probe		= nexell_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct nexell_dwmmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct nexell_mmc_plat),
+	.priv_auto	= sizeof(struct nexell_dwmmc_priv),
+	.platdata_auto	= sizeof(struct nexell_mmc_plat),
 };
diff --git a/drivers/mmc/octeontx_hsmmc.c b/drivers/mmc/octeontx_hsmmc.c
index 38ca3736841..8de1f92fcb7 100644
--- a/drivers/mmc/octeontx_hsmmc.c
+++ b/drivers/mmc/octeontx_hsmmc.c
@@ -3883,7 +3883,7 @@ U_BOOT_DRIVER(octeontx_hsmmc_host) = {
 	.id	= UCLASS_MISC,
 	.of_match = of_match_ptr(octeontx_hsmmc_host_ids),
 	.probe	= octeontx_mmc_host_probe,
-	.priv_auto_alloc_size = sizeof(struct octeontx_mmc_host),
+	.priv_auto	= sizeof(struct octeontx_mmc_host),
 	.child_pre_probe = octeontx_mmc_host_child_pre_probe,
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 715eee0e3e0..31003b3cb78 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -2029,14 +2029,14 @@ U_BOOT_DRIVER(omap_hsmmc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_hsmmc_ids,
 	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
+	.platdata_auto	= sizeof(struct omap_hsmmc_plat),
 #endif
 #ifdef CONFIG_BLK
 	.bind = omap_hsmmc_bind,
 #endif
 	.ops = &omap_hsmmc_ops,
 	.probe	= omap_hsmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
+	.priv_auto	= sizeof(struct omap_hsmmc_data),
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 0c45e1b8936..004b3cb7ea5 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -132,8 +132,8 @@ U_BOOT_DRIVER(pci_mmc) = {
 	.ofdata_to_platdata	= pci_mmc_ofdata_to_platdata,
 	.probe	= pci_mmc_probe,
 	.ops	= &sdhci_ops,
-	.priv_auto_alloc_size = sizeof(struct pci_mmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct pci_mmc_plat),
+	.priv_auto	= sizeof(struct pci_mmc_priv),
+	.platdata_auto	= sizeof(struct pci_mmc_plat),
 	ACPI_OPS_PTR(&pci_mmc_acpi_ops)
 };
 
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index e201bdb8f4e..dd10624dbfe 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -88,6 +88,6 @@ U_BOOT_DRIVER(pic32_sdhci_drv) = {
 	.ops			= &sdhci_ops,
 	.bind			= pic32_sdhci_bind,
 	.probe			= pic32_sdhci_probe,
-	.priv_auto_alloc_size	= sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct pic32_sdhci_plat)
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct pic32_sdhci_plat)
 };
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 2c081fdc69f..8be9ed6b550 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -530,7 +530,7 @@ U_BOOT_DRIVER(pxa_mmc) = {
 	.id	= UCLASS_MMC,
 	.name	= "pxa_mmc",
 	.ops	= &pxa_mmc_ops,
-	.priv_auto_alloc_size = sizeof(struct pxa_mmc_priv),
+	.priv_auto	= sizeof(struct pxa_mmc_priv),
 	.probe	= pxa_mmc_probe,
 };
 #endif /* !CONFIG_IS_ENABLED(DM_MMC) */
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index d80b3fc28f3..211e6904639 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -1014,7 +1014,7 @@ U_BOOT_DRIVER(renesas_sdhi) = {
 	.of_match = renesas_sdhi_match,
 	.bind = tmio_sd_bind,
 	.probe = renesas_sdhi_probe,
-	.priv_auto_alloc_size = sizeof(struct tmio_sd_priv),
-	.platdata_auto_alloc_size = sizeof(struct tmio_sd_plat),
+	.priv_auto	= sizeof(struct tmio_sd_priv),
+	.platdata_auto	= sizeof(struct tmio_sd_plat),
 	.ops = &renesas_sdhi_ops,
 };
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index f1dafa6ce71..e4c5288876f 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -176,8 +176,8 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = {
 	.ops		= &dm_dwmci_ops,
 	.bind		= rockchip_dwmmc_bind,
 	.probe		= rockchip_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct rockchip_dwmmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_mmc_plat),
+	.priv_auto	= sizeof(struct rockchip_dwmmc_priv),
+	.platdata_auto	= sizeof(struct rockchip_mmc_plat),
 };
 
 U_BOOT_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc)
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index b073f1a08d4..131c976eaf6 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -114,6 +114,6 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= rockchip_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct rockchip_sdhc),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_sdhc_plat),
+	.priv_auto	= sizeof(struct rockchip_sdhc),
+	.platdata_auto	= sizeof(struct rockchip_sdhc_plat),
 };
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 24f599e868a..6841be6a145 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -246,7 +246,7 @@ U_BOOT_DRIVER(s5p_sdhci_drv) = {
 	.bind		= s5p_sdhci_bind,
 	.ops		= &sdhci_ops,
 	.probe		= s5p_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct s5p_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct s5p_sdhci_plat),
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index e86ea8fe096..ece0e2d31cb 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -148,5 +148,5 @@ U_BOOT_DRIVER(mmc_sandbox) = {
 	.bind		= sandbox_mmc_bind,
 	.unbind		= sandbox_mmc_unbind,
 	.probe		= sandbox_mmc_probe,
-	.platdata_auto_alloc_size = sizeof(struct sandbox_mmc_plat),
+	.platdata_auto	= sizeof(struct sandbox_mmc_plat),
 };
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index cc99bebc305..efc09b91998 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -309,7 +309,7 @@ U_BOOT_DRIVER(sdhci_cdns) = {
 	.of_match = sdhci_cdns_match,
 	.bind = sdhci_cdns_bind,
 	.probe = sdhci_cdns_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sdhci_cdns_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sdhci_cdns_plat),
 	.ops = &sdhci_cdns_mmc_ops,
 };
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index ad386909e90..f3d10ac8be6 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -743,8 +743,8 @@ U_BOOT_DRIVER(sh_mmcif_mmc) = {
 	.of_match		= sh_mmcif_sd_match,
 	.bind			= sh_mmcif_dm_bind,
 	.probe			= sh_mmcif_dm_probe,
-	.priv_auto_alloc_size	= sizeof(struct sh_mmcif_host),
-	.platdata_auto_alloc_size = sizeof(struct sh_mmcif_plat),
+	.priv_auto	= sizeof(struct sh_mmcif_host),
+	.platdata_auto	= sizeof(struct sh_mmcif_plat),
 	.ops			= &sh_mmcif_dm_ops,
 };
 #endif
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 29f83b65542..04ce521a515 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -902,8 +902,8 @@ U_BOOT_DRIVER(sh_sdhi_mmc) = {
 	.of_match		= sh_sdhi_sd_match,
 	.bind			= sh_sdhi_dm_bind,
 	.probe			= sh_sdhi_dm_probe,
-	.priv_auto_alloc_size	= sizeof(struct sh_sdhi_host),
-	.platdata_auto_alloc_size = sizeof(struct sh_sdhi_plat),
+	.priv_auto	= sizeof(struct sh_sdhi_host),
+	.platdata_auto	= sizeof(struct sh_sdhi_plat),
 	.ops			= &sh_sdhi_dm_ops,
 };
 #endif
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index 4b468a1f3db..009933de5ef 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -195,6 +195,6 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = {
 	.ops				= &snps_dwmci_dm_ops,
 	.bind				= snps_dwmmc_bind,
 	.probe				= snps_dwmmc_probe,
-	.priv_auto_alloc_size		= sizeof(struct snps_dwmci_priv_data),
-	.platdata_auto_alloc_size	= sizeof(struct snps_dwmci_plat),
+	.priv_auto		= sizeof(struct snps_dwmci_priv_data),
+	.platdata_auto	= sizeof(struct snps_dwmci_plat),
 };
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 0022f943bd7..80c4d6ed4d4 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -189,6 +189,6 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
 	.ops		= &dm_dwmci_ops,
 	.bind		= socfpga_dwmmc_bind,
 	.probe		= socfpga_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dwmci_socfpga_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct socfpga_dwmci_plat),
+	.priv_auto	= sizeof(struct dwmci_socfpga_priv_data),
+	.platdata_auto	= sizeof(struct socfpga_dwmci_plat),
 };
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 5578feebef7..49ddabcbe5e 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -144,6 +144,6 @@ U_BOOT_DRIVER(sti_mmc) = {
 	.ops = &sdhci_ops,
 	.ofdata_to_platdata = sti_sdhci_ofdata_to_platdata,
 	.probe = sti_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sti_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sti_sdhci_plat),
 };
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 77871d5afc9..80eecb60e8e 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -717,6 +717,6 @@ U_BOOT_DRIVER(stm32_sdmmc2) = {
 	.ops = &stm32_sdmmc2_ops,
 	.probe = stm32_sdmmc2_probe,
 	.bind = stm32_sdmmc_bind,
-	.priv_auto_alloc_size = sizeof(struct stm32_sdmmc2_priv),
-	.platdata_auto_alloc_size = sizeof(struct stm32_sdmmc2_plat),
+	.priv_auto	= sizeof(struct stm32_sdmmc2_priv),
+	.platdata_auto	= sizeof(struct stm32_sdmmc2_plat),
 };
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 0e03b07ce55..12e8c99076b 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -746,7 +746,7 @@ U_BOOT_DRIVER(sunxi_mmc_drv) = {
 	.bind		= sunxi_mmc_bind,
 	.probe		= sunxi_mmc_probe,
 	.ops		= &sunxi_mmc_ops,
-	.platdata_auto_alloc_size = sizeof(struct sunxi_mmc_plat),
-	.priv_auto_alloc_size = sizeof(struct sunxi_mmc_priv),
+	.platdata_auto	= sizeof(struct sunxi_mmc_plat),
+	.priv_auto	= sizeof(struct sunxi_mmc_priv),
 };
 #endif
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 879e2c98a21..46e185e3172 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -76,6 +76,6 @@ U_BOOT_DRIVER(sdhci_tangier) = {
 	.bind		= sdhci_tangier_bind,
 	.probe		= sdhci_tangier_probe,
 	.ops		= &sdhci_ops,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sdhci_tangier_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sdhci_tangier_plat),
 };
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index cc78a2f2f08..f915c78f5d4 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -771,6 +771,6 @@ U_BOOT_DRIVER(tegra_mmc_drv) = {
 	.bind		= tegra_mmc_bind,
 	.probe		= tegra_mmc_probe,
 	.ops		= &tegra_mmc_ops,
-	.platdata_auto_alloc_size = sizeof(struct tegra_mmc_plat),
-	.priv_auto_alloc_size = sizeof(struct tegra_mmc_priv),
+	.platdata_auto	= sizeof(struct tegra_mmc_plat),
+	.priv_auto	= sizeof(struct tegra_mmc_priv),
 };
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 4dbe71fa2e1..ca674272fc0 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -84,7 +84,7 @@ U_BOOT_DRIVER(uniphier_mmc) = {
 	.of_match = uniphier_sd_match,
 	.bind = tmio_sd_bind,
 	.probe = uniphier_sd_probe,
-	.priv_auto_alloc_size = sizeof(struct tmio_sd_priv),
-	.platdata_auto_alloc_size = sizeof(struct tmio_sd_plat),
+	.priv_auto	= sizeof(struct tmio_sd_priv),
+	.platdata_auto	= sizeof(struct tmio_sd_plat),
 	.ops = &uniphier_sd_ops,
 };
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 6ce9d00d0ae..c0897258199 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -564,6 +564,6 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= xenon_sdhci_bind,
 	.probe		= xenon_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct xenon_sdhci_priv),
-	.platdata_auto_alloc_size = sizeof(struct xenon_sdhci_plat),
+	.priv_auto	= sizeof(struct xenon_sdhci_priv),
+	.platdata_auto	= sizeof(struct xenon_sdhci_plat),
 };
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 147ecc0d708..2ef63976e96 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -659,6 +659,6 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= arasan_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct arasan_sdhci_priv),
-	.platdata_auto_alloc_size = sizeof(struct arasan_sdhci_plat),
+	.priv_auto	= sizeof(struct arasan_sdhci_priv),
+	.platdata_auto	= sizeof(struct arasan_sdhci_plat),
 };