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>

43 files changed, 58 insertions, 58 deletions

diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 64717a6780..0c06301a81 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -187,6 +187,6 @@ U_BOOT_DRIVER(74x164) = {
 	.id		= UCLASS_GPIO,
 	.ops		= &gen_74x164_ops,
 	.probe		= gen_74x164_probe,
-	.priv_auto_alloc_size = sizeof(struct gen_74x164_priv),
+	.priv_auto	= sizeof(struct gen_74x164_priv),
 	.of_match	= gen_74x164_ids,
 };
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index 75800d9f31..cf0785aeb6 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -117,6 +117,6 @@ U_BOOT_DRIVER(altera_pio) = {
 	.of_match	= altera_pio_ids,
 	.ops		= &altera_pio_ops,
 	.ofdata_to_platdata = altera_pio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_pio_platdata),
+	.platdata_auto	= sizeof(struct altera_pio_platdata),
 	.probe		= altera_pio_probe,
 };
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index ef7984374b..90e692c13e 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -629,10 +629,10 @@ U_BOOT_DRIVER(atmel_at91rm9200_gpio) = {
 	.id	= UCLASS_GPIO,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = at91_gpio_ids,
-	.platdata_auto_alloc_size = sizeof(struct at91_port_platdata),
+	.platdata_auto	= sizeof(struct at91_port_platdata),
 #endif
 	.ops	= &gpio_at91_ops,
 	.probe	= at91_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct at91_port_priv),
+	.priv_auto	= sizeof(struct at91_port_priv),
 };
 #endif
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 18f365fa41..d92c061928 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_atmel_pio4) = {
 	.probe	= atmel_pio4_probe,
 	.bind	= atmel_pio4_bind,
 	.of_match = atmel_pio4_ids,
-	.platdata_auto_alloc_size = sizeof(struct atmel_pio4_platdata),
+	.platdata_auto	= sizeof(struct atmel_pio4_platdata),
 };
 
 #endif
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index 0dff9ac711..db349cf24b 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -134,9 +134,9 @@ U_BOOT_DRIVER(gpio_bcm2835) = {
 	.name	= "gpio_bcm2835",
 	.id	= UCLASS_GPIO,
 	.ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct bcm2835_gpio_platdata),
+	.platdata_auto	= sizeof(struct bcm2835_gpio_platdata),
 	.ops	= &gpio_bcm2835_ops,
 	.probe	= bcm2835_gpio_probe,
 	.flags	= DM_FLAG_PRE_RELOC,
-	.priv_auto_alloc_size = sizeof(struct bcm2835_gpios),
+	.priv_auto	= sizeof(struct bcm2835_gpios),
 };
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 5da11d988e..e031f71a78 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -114,6 +114,6 @@ U_BOOT_DRIVER(bcm6345_gpio) = {
 	.id = UCLASS_GPIO,
 	.of_match = bcm6345_gpio_ids,
 	.ops = &bcm6345_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_gpio_priv),
+	.priv_auto	= sizeof(struct bcm6345_gpio_priv),
 	.probe = bcm6345_gpio_probe,
 };
diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c
index 055907c1a1..72ef523be9 100644
--- a/drivers/gpio/cortina_gpio.c
+++ b/drivers/gpio/cortina_gpio.c
@@ -107,7 +107,7 @@ U_BOOT_DRIVER(cortina_gpio) = {
 	.id = UCLASS_GPIO,
 	.ops = &gpio_cortina_ops,
 	.probe = ca_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct cortina_gpio_bank),
+	.priv_auto	= sizeof(struct cortina_gpio_bank),
 	.of_match = ca_gpio_ids,
 };
 #endif /* CONFIG_DM_GPIO */
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index f875888510..507f8b18c2 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -560,9 +560,9 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = {
 	.ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata),
 	.of_match = davinci_gpio_ids,
 	.bind   = dm_scan_fdt_dev,
-	.platdata_auto_alloc_size = sizeof(struct davinci_gpio_platdata),
+	.platdata_auto	= sizeof(struct davinci_gpio_platdata),
 	.probe	= davinci_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct davinci_gpio_bank),
+	.priv_auto	= sizeof(struct davinci_gpio_bank),
 };
 
 #endif
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index cf20a5024e..3a86884443 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -237,5 +237,5 @@ U_BOOT_DRIVER(gpio_dwapb) = {
 	.bind		= gpio_dwapb_bind,
 	.probe		= gpio_dwapb_probe,
 	.remove		= gpio_dwapb_remove,
-	.priv_auto_alloc_size   = sizeof(struct gpio_dwapb_priv),
+	.priv_auto	  = sizeof(struct gpio_dwapb_priv),
 };
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index a993fd4d70..beae34f233 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -189,6 +189,6 @@ U_BOOT_DRIVER(rcar_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = rcar_gpio_ids,
 	.ops	= &rcar_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct rcar_gpio_priv),
+	.priv_auto	= sizeof(struct rcar_gpio_priv),
 	.probe	= rcar_gpio_probe,
 };
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 86804ac2f5..ee7de4c17e 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -130,6 +130,6 @@ U_BOOT_DRIVER(r7s72100_gpio) = {
 	.name	= "r7s72100-gpio",
 	.id	= UCLASS_GPIO,
 	.ops	= &r7s72100_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct r7s72100_gpio_priv),
+	.priv_auto	= sizeof(struct r7s72100_gpio_priv),
 	.probe	= r7s72100_gpio_probe,
 };
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 4785b6b34a..fb9393d39d 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -340,8 +340,8 @@ U_BOOT_DRIVER(gpio_hog) = {
 	.id	= UCLASS_NOP,
 	.ofdata_to_platdata = gpio_hog_ofdata_to_platdata,
 	.probe = gpio_hog_probe,
-	.priv_auto_alloc_size = sizeof(struct gpio_hog_priv),
-	.platdata_auto_alloc_size = sizeof(struct gpio_hog_data),
+	.priv_auto	= sizeof(struct gpio_hog_priv),
+	.platdata_auto	= sizeof(struct gpio_hog_data),
 };
 #else
 int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc)
@@ -1339,5 +1339,5 @@ UCLASS_DRIVER(gpio) = {
 	.post_probe	= gpio_post_probe,
 	.post_bind	= gpio_post_bind,
 	.pre_remove	= gpio_pre_remove,
-	.per_device_auto_alloc_size = sizeof(struct gpio_dev_priv),
+	.per_device_auto	= sizeof(struct gpio_dev_priv),
 };
diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index 54a38da0f1..61c705b5ac 100644
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -166,6 +166,6 @@ U_BOOT_DRIVER(uniphier_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = uniphier_gpio_match,
 	.probe	= uniphier_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_gpio_priv),
+	.priv_auto	= sizeof(struct uniphier_gpio_priv),
 	.ops	= &uniphier_gpio_ops,
 };
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 95de2ae366..c49dc78baa 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -89,7 +89,7 @@ U_BOOT_DRIVER(gpio_hi6220) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_hi6220_ops,
 	.probe	= hi6220_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct gpio_bank),
+	.priv_auto	= sizeof(struct gpio_bank),
 };
 
 
diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c
index 35b114904d..d40365e82d 100644
--- a/drivers/gpio/hsdk-creg-gpio.c
+++ b/drivers/gpio/hsdk-creg-gpio.c
@@ -165,5 +165,5 @@ U_BOOT_DRIVER(gpio_hsdk_creg) = {
 	.ops	= &hsdk_creg_gpio_ops,
 	.probe	= hsdk_creg_gpio_probe,
 	.of_match = hsdk_creg_gpio_ids,
-	.platdata_auto_alloc_size = sizeof(struct hsdk_creg_gpio),
+	.platdata_auto	= sizeof(struct hsdk_creg_gpio),
 };
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 1e876f6914..2a09975b6e 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -200,7 +200,7 @@ U_BOOT_DRIVER(imx_rgpio2p) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &imx_rgpio2p_ops,
 	.probe	= imx_rgpio2p_probe,
-	.priv_auto_alloc_size = sizeof(struct imx_rgpio2p_plat),
+	.priv_auto	= sizeof(struct imx_rgpio2p_plat),
 	.of_match = imx_rgpio2p_ids,
 	.bind	= imx_rgpio2p_bind,
 };
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 95f8b2ba6c..cb217403cd 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -184,6 +184,6 @@ U_BOOT_DRIVER(gpio_broadwell) = {
 	.ops	= &gpio_broadwell_ops,
 	.ofdata_to_platdata	= broadwell_gpio_ofdata_to_platdata,
 	.probe	= broadwell_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct broadwell_bank_priv),
-	.platdata_auto_alloc_size = sizeof(struct broadwell_bank_platdata),
+	.priv_auto	= sizeof(struct broadwell_bank_priv),
+	.platdata_auto	= sizeof(struct broadwell_bank_platdata),
 };
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 73d98fde55..bba85b3791 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -236,6 +236,6 @@ U_BOOT_DRIVER(gpio_ich6) = {
 	.ops	= &gpio_ich6_ops,
 	.ofdata_to_platdata	= gpio_ich6_ofdata_to_platdata,
 	.probe	= ich6_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct ich6_bank_priv),
-	.platdata_auto_alloc_size = sizeof(struct ich6_bank_platdata),
+	.priv_auto	= sizeof(struct ich6_bank_priv),
+	.platdata_auto	= sizeof(struct ich6_bank_platdata),
 };
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index cc26a1306b..81eb2e1ebc 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -286,5 +286,5 @@ U_BOOT_DRIVER(iproc_gpio) = {
 	.of_match		= iproc_gpio_ids,
 	.ops			= &iproc_gpio_ops,
 	.ofdata_to_platdata	= iproc_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size	= sizeof(struct iproc_gpio_platdata),
+	.platdata_auto	= sizeof(struct iproc_gpio_platdata),
 };
diff --git a/drivers/gpio/lpc32xx_gpio.c b/drivers/gpio/lpc32xx_gpio.c
index 1265ee41a6..ffaec32ac2 100644
--- a/drivers/gpio/lpc32xx_gpio.c
+++ b/drivers/gpio/lpc32xx_gpio.c
@@ -317,5 +317,5 @@ U_BOOT_DRIVER(gpio_lpc32xx) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_lpc32xx_ops,
 	.probe	= lpc32xx_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct lpc32xx_gpio_priv),
+	.priv_auto	= sizeof(struct lpc32xx_gpio_priv),
 };
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index 54dc437e1c..3020cc9502 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -141,9 +141,9 @@ U_BOOT_DRIVER(spisel_boot_mpc83xx) = {
 	.ops	= &mpc83xx_spisel_boot_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.ofdata_to_platdata = mpc83xx_spisel_boot_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat),
+	.platdata_auto	= sizeof(struct mpc8xxx_gpio_plat),
 	.of_match = mpc83xx_spisel_boot_ids,
 #endif
 	.probe	= mpc83xx_spisel_boot_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_spisel_boot),
+	.priv_auto	= sizeof(struct mpc83xx_spisel_boot),
 };
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 27881a7322..fa08909b2b 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -295,9 +295,9 @@ U_BOOT_DRIVER(gpio_mpc8xxx) = {
 	.ops	= &gpio_mpc8xxx_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat),
+	.platdata_auto	= sizeof(struct mpc8xxx_gpio_plat),
 	.of_match = mpc8xxx_gpio_ids,
 #endif
 	.probe	= mpc8xxx_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc8xxx_gpio_data),
+	.priv_auto	= sizeof(struct mpc8xxx_gpio_data),
 };
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 780d77b2f8..1cbcc43489 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -275,5 +275,5 @@ U_BOOT_DRIVER(gpio_mscc_sgpio) = {
 	.of_match		= mscc_sgpio_ids,
 	.ops			= &mscc_sgpio_ops,
 	.probe			= mscc_sgpio_probe,
-	.priv_auto_alloc_size	= sizeof(struct mscc_sgpio_priv),
+	.priv_auto	= sizeof(struct mscc_sgpio_priv),
 };
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 416fb56a98..0feafb30ee 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -129,5 +129,5 @@ U_BOOT_DRIVER(gpio_msm) = {
 	.ofdata_to_platdata = msm_gpio_ofdata_to_platdata,
 	.probe	= msm_gpio_probe,
 	.ops	= &gpio_msm_ops,
-	.priv_auto_alloc_size = sizeof(struct msm_gpio_bank),
+	.priv_auto	= sizeof(struct msm_gpio_bank),
 };
diff --git a/drivers/gpio/mvebu_gpio.c b/drivers/gpio/mvebu_gpio.c
index 65eaa71c20..166fc66884 100644
--- a/drivers/gpio/mvebu_gpio.c
+++ b/drivers/gpio/mvebu_gpio.c
@@ -117,5 +117,5 @@ U_BOOT_DRIVER(gpio_mvebu) = {
 	.of_match		= mvebu_gpio_ids,
 	.ops			= &mvebu_gpio_ops,
 	.probe			= mvebu_gpio_probe,
-	.priv_auto_alloc_size	= sizeof(struct mvebu_gpio_priv),
+	.priv_auto	= sizeof(struct mvebu_gpio_priv),
 };
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 88b920a074..488103219f 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -339,8 +339,8 @@ U_BOOT_DRIVER(gpio_mxc) = {
 	.ops	= &gpio_mxc_ops,
 	.probe	= mxc_gpio_probe,
 	.ofdata_to_platdata = mxc_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mxc_gpio_plat),
-	.priv_auto_alloc_size = sizeof(struct mxc_bank_info),
+	.platdata_auto	= sizeof(struct mxc_gpio_plat),
+	.priv_auto	= sizeof(struct mxc_bank_info),
 	.of_match = mxc_gpio_ids,
 	.bind	= mxc_gpio_bind,
 };
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index aaabb0216b..83147b4919 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -298,8 +298,8 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_mxs_ops,
 	.probe	= mxs_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct mxs_gpio_priv),
-	.platdata_auto_alloc_size = sizeof(struct mxs_gpio_platdata),
+	.priv_auto	= sizeof(struct mxs_gpio_priv),
+	.platdata_auto	= sizeof(struct mxs_gpio_platdata),
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = mxs_gpio_ids,
 	.ofdata_to_platdata = mxs_ofdata_to_platdata,
diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c
index 5ec73c4359..1bd12f1568 100644
--- a/drivers/gpio/nx_gpio.c
+++ b/drivers/gpio/nx_gpio.c
@@ -245,6 +245,6 @@ U_BOOT_DRIVER(nx_gpio) = {
 	.of_match	= nx_gpio_ids,
 	.ops		= &nx_gpio_ops,
 	.ofdata_to_platdata = nx_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct nx_gpio_platdata),
+	.platdata_auto	= sizeof(struct nx_gpio_platdata),
 	.probe		= nx_gpio_probe,
 };
diff --git a/drivers/gpio/octeon_gpio.c b/drivers/gpio/octeon_gpio.c
index 45acaadcdb..f34b05d427 100644
--- a/drivers/gpio/octeon_gpio.c
+++ b/drivers/gpio/octeon_gpio.c
@@ -236,7 +236,7 @@ U_BOOT_DRIVER(octeon_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = of_match_ptr(octeon_gpio_ids),
 	.probe = octeon_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct octeon_gpio),
+	.priv_auto	= sizeof(struct octeon_gpio),
 	.ops	= &octeon_gpio_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 6eaa0a08a2..9e828058cd 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -363,14 +363,14 @@ U_BOOT_DRIVER(gpio_omap) = {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_gpio_ids,
 	.ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct omap_gpio_platdata),
+	.platdata_auto	= sizeof(struct omap_gpio_platdata),
 #endif
 #else
 	.bind   = omap_gpio_bind,
 #endif
 	.ops	= &gpio_omap_ops,
 	.probe	= omap_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct gpio_bank),
+	.priv_auto	= sizeof(struct gpio_bank),
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags = DM_FLAG_PRE_RELOC,
 #endif
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index fd17d1a591..32d4a83613 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -385,6 +385,6 @@ U_BOOT_DRIVER(pca953x) = {
 	.id		= UCLASS_GPIO,
 	.ops		= &pca953x_ops,
 	.probe		= pca953x_probe,
-	.platdata_auto_alloc_size = sizeof(struct pca953x_info),
+	.platdata_auto	= sizeof(struct pca953x_info),
 	.of_match	= pca953x_ids,
 };
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 1b9a18fe5d..7fcadc79c1 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -177,5 +177,5 @@ U_BOOT_DRIVER(gpio_pcf8575) = {
 	.of_match = pcf8575_gpio_ids,
 	.ofdata_to_platdata = pcf8575_ofdata_platdata,
 	.probe	= pcf8575_gpio_probe,
-	.platdata_auto_alloc_size = sizeof(struct pcf8575_chip),
+	.platdata_auto	= sizeof(struct pcf8575_chip),
 };
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index bb1ad256fa..253a9ba2f8 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -161,5 +161,5 @@ U_BOOT_DRIVER(gpio_pic32) = {
 	.of_match	= pic32_gpio_ids,
 	.ops		= &gpio_pic32_ops,
 	.probe		= pic32_gpio_probe,
-	.priv_auto_alloc_size	= sizeof(struct pic32_gpio_priv),
+	.priv_auto	= sizeof(struct pic32_gpio_priv),
 };
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 58f044678b..20d5bd55d0 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -212,7 +212,7 @@ U_BOOT_DRIVER(gpio_pm8916) = {
 	.ofdata_to_platdata = pm8916_gpio_ofdata_to_platdata,
 	.probe	= pm8916_gpio_probe,
 	.ops	= &pm8916_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct pm8916_gpio_bank),
+	.priv_auto	= sizeof(struct pm8916_gpio_bank),
 };
 
 
@@ -297,5 +297,5 @@ U_BOOT_DRIVER(pwrkey_pm8941) = {
 	.ofdata_to_platdata = pm8941_pwrkey_ofdata_to_platdata,
 	.probe	= pm8941_pwrkey_probe,
 	.ops	= &pm8941_pwrkey_ops,
-	.priv_auto_alloc_size = sizeof(struct pm8916_gpio_bank),
+	.priv_auto	= sizeof(struct pm8916_gpio_bank),
 };
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 8cc288581c..68f30157a9 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -177,6 +177,6 @@ U_BOOT_DRIVER(rockchip_gpio_bank) = {
 	.id	= UCLASS_GPIO,
 	.of_match = rockchip_gpio_ids,
 	.ops	= &gpio_rockchip_ops,
-	.priv_auto_alloc_size = sizeof(struct rockchip_gpio_priv),
+	.priv_auto	= sizeof(struct rockchip_gpio_priv),
 	.probe	= rockchip_gpio_probe,
 };
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index ec8d54922d..3fc436759c 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -365,7 +365,7 @@ U_BOOT_DRIVER(gpio_exynos) = {
 	.of_match = exynos_gpio_ids,
 	.bind	= gpio_exynos_bind,
 	.probe = gpio_exynos_probe,
-	.priv_auto_alloc_size = sizeof(struct exynos_bank_info),
+	.priv_auto	= sizeof(struct exynos_bank_info),
 	.ops	= &gpio_exynos_ops,
 };
 #endif
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index eb2600de31..fa871305ba 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -532,6 +532,6 @@ U_BOOT_DRIVER(sandbox_pinctrl_gpio) = {
 	.ops = &sandbox_pinctrl_gpio_ops,
 	.bind = dm_scan_fdt_dev,
 	.probe = sandbox_pinctrl_probe,
-	.priv_auto_alloc_size	= sizeof(struct sb_pinctrl_priv),
+	.priv_auto	= sizeof(struct sb_pinctrl_priv),
 	ACPI_OPS_PTR(&pinctrl_sandbox_acpi_ops)
 };
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index bf3537b76b..19239f5db9 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(gpio_sifive) = {
 	.id	= UCLASS_GPIO,
 	.of_match = sifive_gpio_match,
 	.ofdata_to_platdata = of_match_ptr(sifive_gpio_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct sifive_gpio_platdata),
+	.platdata_auto	= sizeof(struct sifive_gpio_platdata),
 	.ops	= &sifive_gpio_ops,
 	.probe	= sifive_gpio_probe,
 };
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
index 51e1efd701..79d55e812d 100644
--- a/drivers/gpio/stm32_gpio.c
+++ b/drivers/gpio/stm32_gpio.c
@@ -342,5 +342,5 @@ U_BOOT_DRIVER(gpio_stm32) = {
 	.probe	= gpio_stm32_probe,
 	.ops	= &gpio_stm32_ops,
 	.flags	= DM_UC_FLAG_SEQ_ALIAS,
-	.priv_auto_alloc_size	= sizeof(struct stm32_gpio_priv),
+	.priv_auto	= sizeof(struct stm32_gpio_priv),
 };
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 22d2531322..7583c8d6b2 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -377,6 +377,6 @@ U_BOOT_DRIVER(gpio_tegra) = {
 	.of_match = tegra_gpio_ids,
 	.bind	= gpio_tegra_bind,
 	.probe = gpio_tegra_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra_port_info),
+	.priv_auto	= sizeof(struct tegra_port_info),
 	.ops	= &gpio_tegra_ops,
 };
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 4efff5c364..9c4bba8e37 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -132,6 +132,6 @@ U_BOOT_DRIVER(gpio_vybrid) = {
 	.of_match = vybrid_gpio_ids,
 	.ofdata_to_platdata = vybrid_gpio_odata_to_platdata,
 	.probe	= vybrid_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct vybrid_gpios),
-	.platdata_auto_alloc_size = sizeof(struct vybrid_gpio_platdata),
+	.priv_auto	= sizeof(struct vybrid_gpios),
+	.platdata_auto	= sizeof(struct vybrid_gpio_platdata),
 };
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 014f120d60..1bb70b12c9 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -307,6 +307,6 @@ U_BOOT_DRIVER(xilinx_gpio) = {
 	.of_match = xilinx_gpio_ids,
 	.ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata,
 	.probe = xilinx_gpio_probe,
-	.platdata_auto_alloc_size = sizeof(struct xilinx_gpio_platdata),
-	.priv_auto_alloc_size = sizeof(struct xilinx_gpio_privdata),
+	.platdata_auto	= sizeof(struct xilinx_gpio_platdata),
+	.priv_auto	= sizeof(struct xilinx_gpio_privdata),
 };
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index d0e90b8d63..4ef2985e76 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -407,5 +407,5 @@ U_BOOT_DRIVER(gpio_zynq) = {
 	.of_match = zynq_gpio_ids,
 	.ofdata_to_platdata = zynq_gpio_ofdata_to_platdata,
 	.probe	= zynq_gpio_probe,
-	.platdata_auto_alloc_size = sizeof(struct zynq_gpio_platdata),
+	.platdata_auto	= sizeof(struct zynq_gpio_platdata),
 };