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>

51 files changed, 81 insertions, 81 deletions

diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 61372c5..bca2cfb 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -203,7 +203,7 @@ U_BOOT_DRIVER(altera_spi) = {
 	.of_match = altera_spi_ids,
 	.ops	= &altera_spi_ops,
 	.ofdata_to_platdata = altera_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct altera_spi_priv),
+	.platdata_auto	= sizeof(struct altera_spi_platdata),
+	.priv_auto	= sizeof(struct altera_spi_priv),
 	.probe	= altera_spi_probe,
 };
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 39c6e22..82534d9 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -409,6 +409,6 @@ U_BOOT_DRIVER(atcspi200_spi) = {
 	.of_match = atcspi200_spi_ids,
 	.ops = &atcspi200_spi_ops,
 	.ofdata_to_platdata = atcspi200_ofdata_to_platadata,
-	.priv_auto_alloc_size = sizeof(struct nds_spi_slave),
+	.priv_auto	= sizeof(struct nds_spi_slave),
 	.probe = atcspi200_spi_probe,
 };
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index 70bedc7..e5d54fa 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -224,6 +224,6 @@ U_BOOT_DRIVER(ath79_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = ath79_spi_ids,
 	.ops    = &ath79_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct ath79_spi_priv),
+	.priv_auto	= sizeof(struct ath79_spi_priv),
 	.probe  = ath79_spi_probe,
 };
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 9320a8b..b1a3aa9 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -624,6 +624,6 @@ U_BOOT_DRIVER(atmel_qspi) = {
 	.id             = UCLASS_SPI,
 	.of_match       = atmel_qspi_ids,
 	.ops            = &atmel_qspi_ops,
-	.priv_auto_alloc_size = sizeof(struct atmel_qspi),
+	.priv_auto	= sizeof(struct atmel_qspi),
 	.probe          = atmel_qspi_probe,
 };
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c65733c..873f854 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -388,7 +388,7 @@ U_BOOT_DRIVER(atmel_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = atmel_spi_ids,
 	.ops	= &atmel_spi_ops,
-	.platdata_auto_alloc_size = sizeof(struct atmel_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct atmel_spi_priv),
+	.platdata_auto	= sizeof(struct atmel_spi_platdata),
+	.priv_auto	= sizeof(struct atmel_spi_priv),
 	.probe	= atmel_spi_probe,
 };
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f30a8a4..c4a04ba 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -403,7 +403,7 @@ U_BOOT_DRIVER(bcm63xx_hsspi) = {
 	.id = UCLASS_SPI,
 	.of_match = bcm63xx_hsspi_ids,
 	.ops = &bcm63xx_hsspi_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm63xx_hsspi_priv),
+	.priv_auto	= sizeof(struct bcm63xx_hsspi_priv),
 	.child_pre_probe = bcm63xx_hsspi_child_pre_probe,
 	.probe = bcm63xx_hsspi_probe,
 };
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index acc1a49..97b72d2 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -422,7 +422,7 @@ U_BOOT_DRIVER(bcm63xx_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = bcm63xx_spi_ids,
 	.ops = &bcm63xx_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm63xx_spi_priv),
+	.priv_auto	= sizeof(struct bcm63xx_spi_priv),
 	.child_pre_probe = bcm63xx_spi_child_pre_probe,
 	.probe = bcm63xx_spi_probe,
 };
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index fb1dc46..d5ec2bc 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -434,6 +434,6 @@ U_BOOT_DRIVER(bcmstb_spi) = {
 	.ops				= &bcmstb_spi_ops,
 	.ofdata_to_platdata		= bcmstb_spi_ofdata_to_platdata,
 	.probe				= bcmstb_spi_probe,
-	.platdata_auto_alloc_size	= sizeof(struct bcmstb_spi_platdata),
-	.priv_auto_alloc_size		= sizeof(struct bcmstb_spi_priv),
+	.platdata_auto	= sizeof(struct bcmstb_spi_platdata),
+	.priv_auto		= sizeof(struct bcmstb_spi_priv),
 };
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 1e85749..dcee7b7 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -354,8 +354,8 @@ U_BOOT_DRIVER(cadence_spi) = {
 	.of_match = cadence_spi_ids,
 	.ops = &cadence_spi_ops,
 	.ofdata_to_platdata = cadence_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct cadence_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct cadence_spi_priv),
+	.platdata_auto	= sizeof(struct cadence_spi_platdata),
+	.priv_auto	= sizeof(struct cadence_spi_priv),
 	.probe = cadence_spi_probe,
 	.remove = cadence_spi_remove,
 	.flags = DM_FLAG_OS_PREPARE,
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 8fa6d35..ec3bf6b 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -452,9 +452,9 @@ U_BOOT_DRIVER(coldfire_spi) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = coldfire_spi_ids,
 	.ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct coldfire_spi_platdata),
+	.platdata_auto	= sizeof(struct coldfire_spi_platdata),
 #endif
 	.probe = coldfire_spi_probe,
 	.ops = &coldfire_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct coldfire_spi_priv),
+	.priv_auto	= sizeof(struct coldfire_spi_priv),
 };
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index a11433d..b69224e 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -420,9 +420,9 @@ U_BOOT_DRIVER(davinci_spi) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = davinci_spi_ids,
 	.ofdata_to_platdata = davinci_ofdata_to_platadata,
-        .platdata_auto_alloc_size = sizeof(struct davinci_spi_platdata),
+        .platdata_auto	= sizeof(struct davinci_spi_platdata),
 #endif
 	.probe = davinci_spi_probe,
 	.ops = &davinci_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct davinci_spi_slave),
+	.priv_auto	= sizeof(struct davinci_spi_slave),
 };
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 2559aac..8d48e04 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -560,8 +560,8 @@ U_BOOT_DRIVER(dw_spi) = {
 	.of_match = dw_spi_ids,
 	.ops = &dw_spi_ops,
 	.ofdata_to_platdata = dw_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct dw_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct dw_spi_priv),
+	.platdata_auto	= sizeof(struct dw_spi_platdata),
+	.priv_auto	= sizeof(struct dw_spi_priv),
 	.probe = dw_spi_probe,
 	.remove = dw_spi_remove,
 };
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index d338ff5..8a82e60 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -427,7 +427,7 @@ U_BOOT_DRIVER(exynos_spi) = {
 	.of_match = exynos_spi_ids,
 	.ops	= &exynos_spi_ops,
 	.ofdata_to_platdata = exynos_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct exynos_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct exynos_spi_priv),
+	.platdata_auto	= sizeof(struct exynos_spi_platdata),
+	.priv_auto	= sizeof(struct exynos_spi_priv),
 	.probe	= exynos_spi_probe,
 };
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index b22c9b3..49577af 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -660,8 +660,8 @@ U_BOOT_DRIVER(fsl_dspi) = {
 	.of_match = fsl_dspi_ids,
 	.ops	= &fsl_dspi_ops,
 	.ofdata_to_platdata = fsl_dspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct fsl_dspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct fsl_dspi_priv),
+	.platdata_auto	= sizeof(struct fsl_dspi_platdata),
+	.priv_auto	= sizeof(struct fsl_dspi_priv),
 	.probe	= fsl_dspi_probe,
 	.child_pre_probe = fsl_dspi_child_pre_probe,
 	.bind = fsl_dspi_bind,
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 5c76fd9..0553999 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -576,8 +576,8 @@ U_BOOT_DRIVER(fsl_espi) = {
 	.ofdata_to_platdata = fsl_espi_ofdata_to_platdata,
 #endif
 	.ops	= &fsl_espi_ops,
-	.platdata_auto_alloc_size = sizeof(struct fsl_espi_platdata),
-	.priv_auto_alloc_size = sizeof(struct fsl_spi_slave),
+	.platdata_auto	= sizeof(struct fsl_espi_platdata),
+	.priv_auto	= sizeof(struct fsl_spi_slave),
 	.probe	= fsl_espi_probe,
 	.child_pre_probe = fsl_espi_child_pre_probe,
 };
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 128f958..412d031 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -887,6 +887,6 @@ U_BOOT_DRIVER(fsl_qspi) = {
 	.id	= UCLASS_SPI,
 	.of_match = fsl_qspi_ids,
 	.ops	= &fsl_qspi_ops,
-	.priv_auto_alloc_size = sizeof(struct fsl_qspi),
+	.priv_auto	= sizeof(struct fsl_qspi),
 	.probe	= fsl_qspi_probe,
 };
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index a91cb78..d2fc9e2 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -1005,8 +1005,8 @@ U_BOOT_DRIVER(intel_fast_spi) = {
 	.of_match = ich_spi_ids,
 	.ops	= &ich_spi_ops,
 	.ofdata_to_platdata = ich_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ich_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct ich_spi_priv),
+	.platdata_auto	= sizeof(struct ich_spi_platdata),
+	.priv_auto	= sizeof(struct ich_spi_priv),
 	.child_pre_probe = ich_spi_child_pre_probe,
 	.probe	= ich_spi_probe,
 	.remove	= ich_spi_remove,
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index dc7d2bc..22f0540 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -296,7 +296,7 @@ U_BOOT_DRIVER(mvebu_spi) = {
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,
 	.ofdata_to_platdata = mvebu_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct mvebu_spi_priv),
+	.platdata_auto	= sizeof(struct mvebu_spi_platdata),
+	.priv_auto	= sizeof(struct mvebu_spi_priv),
 	.probe = mvebu_spi_probe,
 };
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 2cdc018..d99a151 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -318,5 +318,5 @@ U_BOOT_DRIVER(meson_spifc) = {
 	.of_match	= meson_spifc_ids,
 	.ops		= &meson_spifc_ops,
 	.probe		= meson_spifc_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_spifc_priv),
+	.priv_auto	= sizeof(struct meson_spifc_priv),
 };
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index ec39c12..378037f 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -281,5 +281,5 @@ U_BOOT_DRIVER(mpc8xxx_spi) = {
 	.ops	= &mpc8xxx_spi_ops,
 	.ofdata_to_platdata = mpc8xxx_spi_ofdata_to_platdata,
 	.probe	= mpc8xxx_spi_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc8xxx_priv),
+	.priv_auto	= sizeof(struct mpc8xxx_priv),
 };
diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index e77447b..a1b6172 100644
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -232,6 +232,6 @@ U_BOOT_DRIVER(mscc_bb) = {
 	.id	= UCLASS_SPI,
 	.of_match = mscc_bb_ids,
 	.ops	= &mscc_bb_ops,
-	.priv_auto_alloc_size = sizeof(struct mscc_bb_priv),
+	.priv_auto	= sizeof(struct mscc_bb_priv),
 	.probe	= mscc_bb_spi_probe,
 };
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 3a0738e..eb09317 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -304,6 +304,6 @@ U_BOOT_DRIVER(mt7621_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = mt7621_spi_ids,
 	.ops = &mt7621_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct mt7621_spi),
+	.priv_auto	= sizeof(struct mt7621_spi),
 	.probe = mt7621_spi_probe,
 };
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index c30c8f4..b6ab5fa 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -313,6 +313,6 @@ U_BOOT_DRIVER(mtk_snfi_spi) = {
 	.id			= UCLASS_SPI,
 	.of_match		= mtk_snfi_spi_ids,
 	.ops			= &mtk_snfi_spi_ops,
-	.priv_auto_alloc_size	= sizeof(struct mtk_snfi_priv),
+	.priv_auto	= sizeof(struct mtk_snfi_priv),
 	.probe			= mtk_snfi_spi_probe,
 };
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index eb13cf3..b9e058a 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -325,7 +325,7 @@ U_BOOT_DRIVER(mvebu_spi) = {
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,
 	.ofdata_to_platdata = mvebu_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_spi_platdata),
+	.platdata_auto	= sizeof(struct mvebu_spi_platdata),
 	.probe = mvebu_spi_probe,
 	.remove = mvebu_spi_remove,
 };
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index e90a06a..f571392 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -605,7 +605,7 @@ U_BOOT_DRIVER(mxc_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = mxc_spi_ids,
 	.ops	= &mxc_spi_ops,
-	.platdata_auto_alloc_size = sizeof(struct mxc_spi_slave),
+	.platdata_auto	= sizeof(struct mxc_spi_slave),
 	.probe	= mxc_spi_probe,
 };
 #endif
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index fb0af02..57e7a2e 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -487,9 +487,9 @@ U_BOOT_DRIVER(fsl_imx23_spi) = {
 	.of_match = mxs_spi_ids,
 	.ofdata_to_platdata = mxs_ofdata_to_platdata,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct mxs_spi_platdata),
+	.platdata_auto	= sizeof(struct mxs_spi_platdata),
 	.ops	= &mxs_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct mxs_spi_priv),
+	.priv_auto	= sizeof(struct mxs_spi_priv),
 	.probe	= mxs_spi_probe,
 };
 
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index 9661e9e..96f981a 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -994,6 +994,6 @@ U_BOOT_DRIVER(nxp_fspi) = {
 	.of_match = nxp_fspi_ids,
 	.ops	= &nxp_fspi_ops,
 	.ofdata_to_platdata = nxp_fspi_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct nxp_fspi),
+	.priv_auto	= sizeof(struct nxp_fspi),
 	.probe	= nxp_fspi_probe,
 };
diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c
index 7e88e55..c0c248d 100644
--- a/drivers/spi/octeon_spi.c
+++ b/drivers/spi/octeon_spi.c
@@ -611,6 +611,6 @@ U_BOOT_DRIVER(octeon_spi) = {
 	.id			= UCLASS_SPI,
 	.of_match		= octeon_spi_ids,
 	.probe			= octeon_spi_probe,
-	.priv_auto_alloc_size	= sizeof(struct octeon_spi),
+	.priv_auto	= sizeof(struct octeon_spi),
 	.ops			= &octeon_spi_ops,
 };
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 56cb217..1beaea7 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -507,9 +507,9 @@ U_BOOT_DRIVER(omap3_spi) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap3_spi_ids,
 	.ofdata_to_platdata = omap3_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct omap3_spi_plat),
+	.platdata_auto	= sizeof(struct omap3_spi_plat),
 #endif
 	.probe = omap3_spi_probe,
 	.ops    = &omap3_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct omap3_spi_priv),
+	.priv_auto	= sizeof(struct omap3_spi_priv),
 };
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 52e9eff..b208000 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -444,6 +444,6 @@ U_BOOT_DRIVER(pic32_spi) = {
 	.id		= UCLASS_SPI,
 	.of_match	= pic32_spi_ids,
 	.ops		= &pic32_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct pic32_spi_priv),
+	.priv_auto	= sizeof(struct pic32_spi_priv),
 	.probe		= pic32_spi_probe,
 };
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 32bb8c8..e9fd618 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -319,7 +319,7 @@ U_BOOT_DRIVER(pl022_spi) = {
 	.ofdata_to_platdata = pl022_spi_ofdata_to_platdata,
 #endif
 	.ops    = &pl022_spi_ops,
-	.platdata_auto_alloc_size = sizeof(struct pl022_spi_pdata),
-	.priv_auto_alloc_size = sizeof(struct pl022_spi_slave),
+	.platdata_auto	= sizeof(struct pl022_spi_pdata),
+	.priv_auto	= sizeof(struct pl022_spi_slave),
 	.probe  = pl022_spi_probe,
 };
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index d0ff918..7018814 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -464,8 +464,8 @@ U_BOOT_DRIVER(rpc_spi) = {
 	.of_match	= rpc_spi_ids,
 	.ops		= &rpc_spi_ops,
 	.ofdata_to_platdata = rpc_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rpc_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct rpc_spi_priv),
+	.platdata_auto	= sizeof(struct rpc_spi_platdata),
+	.priv_auto	= sizeof(struct rpc_spi_priv),
 	.bind		= rpc_spi_bind,
 	.probe		= rpc_spi_probe,
 };
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index c5363c2..cf9084c 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -561,8 +561,8 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = {
 	.of_match = rockchip_spi_ids,
 	.ops	= &rockchip_spi_ops,
 	.ofdata_to_platdata = rockchip_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rockchip_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct rockchip_spi_priv),
+	.platdata_auto	= sizeof(struct rockchip_spi_platdata),
+	.priv_auto	= sizeof(struct rockchip_spi_priv),
 	.probe	= rockchip_spi_probe,
 };
 
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index aa1c030..35381c1 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -354,7 +354,7 @@ U_BOOT_DRIVER(sh_qspi) = {
 	.of_match	= sh_qspi_ids,
 	.ops		= &sh_qspi_ops,
 	.ofdata_to_platdata = sh_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sh_qspi_slave),
+	.platdata_auto	= sizeof(struct sh_qspi_slave),
 	.probe		= sh_qspi_probe,
 };
 #endif
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 153bbf8..c713577 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -281,7 +281,7 @@ U_BOOT_DRIVER(soft_spi) = {
 	.of_match = soft_spi_ids,
 	.ops	= &soft_spi_ops,
 	.ofdata_to_platdata = soft_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct soft_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct soft_spi_priv),
+	.platdata_auto	= sizeof(struct soft_spi_platdata),
+	.priv_auto	= sizeof(struct soft_spi_priv),
 	.probe	= soft_spi_probe,
 };
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 6f8df55..721d654 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -798,6 +798,6 @@ U_BOOT_DRIVER(spi_qup) = {
 	.id	= UCLASS_SPI,
 	.of_match = qup_spi_ids,
 	.ops	= &qup_spi_ops,
-	.priv_auto_alloc_size	= sizeof(struct qup_spi_priv),
+	.priv_auto	= sizeof(struct qup_spi_priv),
 	.probe	= qup_spi_probe,
 };
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index c7345d9..fdbcdb8 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -475,6 +475,6 @@ U_BOOT_DRIVER(sifive_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = sifive_spi_ids,
 	.ops	= &sifive_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct sifive_spi),
+	.priv_auto	= sizeof(struct sifive_spi),
 	.probe	= sifive_spi_probe,
 };
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 0844a5a..84c1ece 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -631,7 +631,7 @@ U_BOOT_DRIVER(sun4i_spi) = {
 	.of_match	= sun4i_spi_ids,
 	.ops	= &sun4i_spi_ops,
 	.ofdata_to_platdata	= sun4i_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size	= sizeof(struct sun4i_spi_platdata),
-	.priv_auto_alloc_size	= sizeof(struct sun4i_spi_priv),
+	.platdata_auto	= sizeof(struct sun4i_spi_platdata),
+	.priv_auto	= sizeof(struct sun4i_spi_priv),
 	.probe	= sun4i_spi_probe,
 };
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 55a8eed..b48d241 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -502,9 +502,9 @@ UCLASS_DRIVER(spi) = {
 #endif
 	.post_probe	= spi_post_probe,
 	.child_pre_probe = spi_child_pre_probe,
-	.per_device_auto_alloc_size = sizeof(struct dm_spi_bus),
-	.per_child_auto_alloc_size = sizeof(struct spi_slave),
-	.per_child_platdata_auto_alloc_size =
+	.per_device_auto	= sizeof(struct dm_spi_bus),
+	.per_child_auto	= sizeof(struct spi_slave),
+	.per_child_platdata_auto	=
 			sizeof(struct dm_spi_slave_platdata),
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.child_post_bind = spi_child_post_bind,
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index a53b941..4431778 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -541,6 +541,6 @@ U_BOOT_DRIVER(stm32_qspi) = {
 	.id = UCLASS_SPI,
 	.of_match = stm32_qspi_ids,
 	.ops = &stm32_qspi_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_qspi_priv),
+	.priv_auto	= sizeof(struct stm32_qspi_priv),
 	.probe = stm32_qspi_probe,
 };
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 4a0833b..4c7fee6 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -615,7 +615,7 @@ U_BOOT_DRIVER(stm32_spi) = {
 	.id			= UCLASS_SPI,
 	.of_match		= stm32_spi_ids,
 	.ops			= &stm32_spi_ops,
-	.priv_auto_alloc_size	= sizeof(struct stm32_spi_priv),
+	.priv_auto	= sizeof(struct stm32_spi_priv),
 	.probe			= stm32_spi_probe,
 	.remove			= stm32_spi_remove,
 };
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index 0e8198c..3848f9f 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -394,7 +394,7 @@ U_BOOT_DRIVER(tegra114_spi) = {
 	.of_match = tegra114_spi_ids,
 	.ops	= &tegra114_spi_ops,
 	.ofdata_to_platdata = tegra114_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra114_spi_priv),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra114_spi_priv),
 	.probe	= tegra114_spi_probe,
 };
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 771744d..bc39e8b 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -354,7 +354,7 @@ U_BOOT_DRIVER(tegra20_sflash) = {
 	.of_match = tegra20_sflash_ids,
 	.ops	= &tegra20_sflash_ops,
 	.ofdata_to_platdata = tegra20_sflash_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra20_sflash_priv),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra20_sflash_priv),
 	.probe	= tegra20_sflash_probe,
 };
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index f9846ee..9bec741 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -373,7 +373,7 @@ U_BOOT_DRIVER(tegra30_spi) = {
 	.of_match = tegra30_spi_ids,
 	.ops	= &tegra30_spi_ops,
 	.ofdata_to_platdata = tegra30_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra30_spi_priv),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra30_spi_priv),
 	.probe	= tegra30_spi_probe,
 };
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index ae16b45..c851a7a 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -423,8 +423,8 @@ U_BOOT_DRIVER(tegra210_qspi) = {
 	.of_match = tegra210_qspi_ids,
 	.ops = &tegra210_qspi_ops,
 	.ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra210_qspi_priv),
-	.per_child_auto_alloc_size = sizeof(struct spi_slave),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra210_qspi_priv),
+	.per_child_auto	= sizeof(struct spi_slave),
 	.probe = tegra210_qspi_probe,
 };
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 5fdbb49..77353ba 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -505,6 +505,6 @@ U_BOOT_DRIVER(ti_qspi) = {
 	.of_match = ti_qspi_ids,
 	.ops	= &ti_qspi_ops,
 	.ofdata_to_platdata = ti_qspi_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ti_qspi_priv),
+	.priv_auto	= sizeof(struct ti_qspi_priv),
 	.probe	= ti_qspi_probe,
 };
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index b645668..048d74f 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -412,7 +412,7 @@ U_BOOT_DRIVER(uniphier_spi) = {
 	.of_match = uniphier_spi_ids,
 	.ops	= &uniphier_spi_ops,
 	.ofdata_to_platdata = uniphier_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct uniphier_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct uniphier_spi_priv),
+	.platdata_auto	= sizeof(struct uniphier_spi_platdata),
+	.priv_auto	= sizeof(struct uniphier_spi_priv),
 	.probe	= uniphier_spi_probe,
 };
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 47a5571..af7a7b2 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -364,6 +364,6 @@ U_BOOT_DRIVER(xilinx_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = xilinx_spi_ids,
 	.ops	= &xilinx_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct xilinx_spi_priv),
+	.priv_auto	= sizeof(struct xilinx_spi_priv),
 	.probe	= xilinx_spi_probe,
 };
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index f2eddec..d11b0d6 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -667,7 +667,7 @@ U_BOOT_DRIVER(zynq_qspi) = {
 	.of_match = zynq_qspi_ids,
 	.ops    = &zynq_qspi_ops,
 	.ofdata_to_platdata = zynq_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynq_qspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynq_qspi_priv),
+	.platdata_auto	= sizeof(struct zynq_qspi_platdata),
+	.priv_auto	= sizeof(struct zynq_qspi_priv),
 	.probe  = zynq_qspi_probe,
 };
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index cb911c3..d26c2f6 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -372,7 +372,7 @@ U_BOOT_DRIVER(zynq_spi) = {
 	.of_match = zynq_spi_ids,
 	.ops	= &zynq_spi_ops,
 	.ofdata_to_platdata = zynq_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynq_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynq_spi_priv),
+	.platdata_auto	= sizeof(struct zynq_spi_platdata),
+	.priv_auto	= sizeof(struct zynq_spi_priv),
 	.probe	= zynq_spi_probe,
 };
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index e0e6687..4585222 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -728,7 +728,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = {
 	.of_match = zynqmp_qspi_ids,
 	.ops    = &zynqmp_qspi_ops,
 	.ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynqmp_qspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynqmp_qspi_priv),
+	.platdata_auto	= sizeof(struct zynqmp_qspi_platdata),
+	.priv_auto	= sizeof(struct zynqmp_qspi_priv),
 	.probe  = zynqmp_qspi_probe,
 };