diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index cd4d329..b50d306 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -401,6 +401,6 @@
 	.id	= UCLASS_MTD,
 	.of_match = altera_qspi_ids,
 	.ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata),
+	.platdata_auto	= sizeof(struct altera_qspi_platdata),
 	.probe	= altera_qspi_probe,
 };
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 846b0e8..c86e504 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -102,5 +102,5 @@
 	.of_match = am654_hbmc_dt_ids,
 	.probe = am654_hbmc_probe,
 	.bind = am654_hbmc_bind,
-	.priv_auto_alloc_size = sizeof(struct am654_hbmc_priv),
+	.priv_auto	= sizeof(struct am654_hbmc_priv),
 };
diff --git a/drivers/mtd/mtd-uclass.c b/drivers/mtd/mtd-uclass.c
index 5418217..9f5f672 100644
--- a/drivers/mtd/mtd-uclass.c
+++ b/drivers/mtd/mtd-uclass.c
@@ -32,5 +32,5 @@
 UCLASS_DRIVER(mtd) = {
 	.id		= UCLASS_MTD,
 	.name		= "mtd",
-	.per_device_auto_alloc_size = sizeof(struct mtd_info),
+	.per_device_auto	= sizeof(struct mtd_info),
 };
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 0615e50..d4e8f8d 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -1310,7 +1310,7 @@
 	.id = UCLASS_MTD,
 	.of_match = arasan_nand_dt_ids,
 	.probe = arasan_probe,
-	.priv_auto_alloc_size = sizeof(struct arasan_nand_info),
+	.priv_auto	= sizeof(struct arasan_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index 6313403..71682cb 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -109,7 +109,7 @@
 	.id = UCLASS_MTD,
 	.of_match = bcm63158_nand_dt_ids,
 	.probe = bcm63158_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm63158_nand_soc),
+	.priv_auto	= sizeof(struct bcm63158_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index cd4b24a..f424194 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -102,7 +102,7 @@
 	.id = UCLASS_MTD,
 	.of_match = bcm6368_nand_dt_ids,
 	.probe = bcm6368_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6368_nand_soc),
+	.priv_auto	= sizeof(struct bcm6368_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index aa042be..47ddde4 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -108,7 +108,7 @@
 	.id = UCLASS_MTD,
 	.of_match = bcm68360_nand_dt_ids,
 	.probe = bcm68360_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm68360_nand_soc),
+	.priv_auto	= sizeof(struct bcm68360_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 0788455..6464950 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -108,7 +108,7 @@
 	.id = UCLASS_MTD,
 	.of_match = bcm6838_nand_dt_ids,
 	.probe = bcm6838_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6838_nand_soc),
+	.priv_auto	= sizeof(struct bcm6838_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index 818eae8..7573cd9 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -109,7 +109,7 @@
 	.id = UCLASS_MTD,
 	.of_match = bcm6858_nand_dt_ids,
 	.probe = bcm6858_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6858_nand_soc),
+	.priv_auto	= sizeof(struct bcm6858_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 4416b8f..4645cc1 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -816,7 +816,7 @@
 	.id		= UCLASS_MTD,
 	.of_match	= davinci_nand_ids,
 	.probe		= davinci_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct nand_chip),
+	.priv_auto	= sizeof(struct nand_chip),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 8318ff5..140ef7f 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -172,7 +172,7 @@
 	.id = UCLASS_MTD,
 	.of_match = denali_nand_dt_ids,
 	.probe = denali_dt_probe,
-	.priv_auto_alloc_size = sizeof(struct denali_nand_info),
+	.priv_auto	= sizeof(struct denali_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c
index 43dbe9e..78a423d 100644
--- a/drivers/mtd/nand/raw/mxs_nand_dt.c
+++ b/drivers/mtd/nand/raw/mxs_nand_dt.c
@@ -168,7 +168,7 @@
 	.id = UCLASS_MTD,
 	.of_match = mxs_nand_dt_ids,
 	.probe = mxs_nand_dt_probe,
-	.priv_auto_alloc_size = sizeof(struct mxs_nand_info),
+	.priv_auto	= sizeof(struct mxs_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/octeontx_bch.c b/drivers/mtd/nand/raw/octeontx_bch.c
index 6937062..a417728 100644
--- a/drivers/mtd/nand/raw/octeontx_bch.c
+++ b/drivers/mtd/nand/raw/octeontx_bch.c
@@ -410,7 +410,7 @@
 	.id	= UCLASS_MISC,
 	.probe	= octeontx_pci_bchpf_probe,
 	.remove = octeontx_pci_bchpf_remove,
-	.priv_auto_alloc_size = sizeof(struct bch_device),
+	.priv_auto	= sizeof(struct bch_device),
 	.flags = DM_FLAG_OS_PREPARE,
 };
 
@@ -418,7 +418,7 @@
 	.name	= BCHVF_DRIVER_NAME,
 	.id	= UCLASS_MISC,
 	.probe = octeontx_pci_bchvf_probe,
-	.priv_auto_alloc_size = sizeof(struct bch_vf),
+	.priv_auto	= sizeof(struct bch_vf),
 };
 
 U_BOOT_PCI_DEVICE(octeontx_pci_bchpf, octeontx_bchpf_pci_id_table);
diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c
index ad21917..cfeca1e 100644
--- a/drivers/mtd/nand/raw/octeontx_nand.c
+++ b/drivers/mtd/nand/raw/octeontx_nand.c
@@ -2219,7 +2219,7 @@
 	.of_match = of_match_ptr(octeontx_nand_ids),
 	.ofdata_to_platdata = octeontx_nand_ofdata_to_platdata,
 	.probe = octeontx_pci_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct octeontx_nfc),
+	.priv_auto	= sizeof(struct octeontx_nfc),
 	.remove = octeontx_pci_nand_disable,
 	.flags = DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 361a9e3..e923ce3 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -1937,7 +1937,7 @@
 	.id = UCLASS_MTD,
 	.of_match = pxa3xx_nand_dt_ids,
 	.probe = pxa3xx_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct pxa3xx_nand_info) +
+	.priv_auto	= sizeof(struct pxa3xx_nand_info) +
 		sizeof(struct pxa3xx_nand_host) * CONFIG_SYS_MAX_NAND_DEVICE,
 };
 
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 47fe610..8fe7ec1 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -1033,7 +1033,7 @@
 	.id = UCLASS_MTD,
 	.of_match = stm32_fmc2_nfc_match,
 	.probe = stm32_fmc2_nfc_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_fmc2_nfc),
+	.priv_auto	= sizeof(struct stm32_fmc2_nfc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index b9f5bdd..797fc23 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -990,7 +990,7 @@
 	.id = UCLASS_MTD,
 	.of_match = tegra_nand_dt_ids,
 	.probe = tegra_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra_nand_info),
+	.priv_auto	= sizeof(struct tegra_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 4e6fdc6..422b9c5 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -784,7 +784,7 @@
 	.name = "vf610-nfc-dt",
 	.id = UCLASS_MTD,
 	.of_match = vf610_nfc_dt_ids,
-	.priv_auto_alloc_size = sizeof(struct vf610_nfc),
+	.priv_auto	= sizeof(struct vf610_nfc),
 	.probe = vf610_nfc_dt_probe,
 };
 
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 92db2aa..7cf0ccb 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1286,7 +1286,7 @@
 	.id = UCLASS_MTD,
 	.of_match = zynq_nand_dt_ids,
 	.probe = zynq_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct zynq_nand_info),
+	.priv_auto	= sizeof(struct zynq_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 8c7e07d..fc9d4ed 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -1255,6 +1255,6 @@
 	.name = "spi_nand",
 	.id = UCLASS_MTD,
 	.of_match = spinand_ids,
-	.priv_auto_alloc_size = sizeof(struct spinand_device),
+	.priv_auto	= sizeof(struct spinand_device),
 	.probe = spinand_probe,
 };
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 1d0c1cb..f52295a 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -600,7 +600,7 @@
 	.ofdata_to_platdata = sandbox_sf_ofdata_to_platdata,
 	.probe		= sandbox_sf_probe,
 	.remove		= sandbox_sf_remove,
-	.priv_auto_alloc_size = sizeof(struct sandbox_spi_flash),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_spi_flash_plat_data),
+	.priv_auto	= sizeof(struct sandbox_spi_flash),
+	.platdata_auto	= sizeof(struct sandbox_spi_flash_plat_data),
 	.ops		= &sandbox_sf_emul_ops,
 };
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 09c1143..ed629f1 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -100,5 +100,5 @@
 	.id		= UCLASS_SPI_FLASH,
 	.name		= "spi_flash",
 	.post_bind	= spi_flash_post_bind,
-	.per_device_auto_alloc_size = sizeof(struct spi_flash),
+	.per_device_auto	= sizeof(struct spi_flash),
 };
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 27d847d..b59edd1 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -693,6 +693,6 @@
 	.id		= UCLASS_SPI_FLASH,
 	.of_match	= spi_dataflash_ids,
 	.probe		= spi_dataflash_probe,
-	.priv_auto_alloc_size = sizeof(struct dataflash),
+	.priv_auto	= sizeof(struct dataflash),
 	.ops		= &spi_dataflash_ops,
 };
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index b959e34..c8bcec3 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -166,7 +166,7 @@
 	.of_match	= spi_flash_std_ids,
 	.probe		= spi_flash_std_probe,
 	.remove		= spi_flash_std_remove,
-	.priv_auto_alloc_size = sizeof(struct spi_flash),
+	.priv_auto	= sizeof(struct spi_flash),
 	.ops		= &spi_flash_std_ops,
 };