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>

41 files changed, 48 insertions, 48 deletions

diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index 2cdfb55..9a223d8 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -352,6 +352,6 @@ U_BOOT_DRIVER(ast_i2c) = {
 	.of_match = ast_i2c_ids,
 	.probe = ast_i2c_probe,
 	.ofdata_to_platdata = ast_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ast_i2c_priv),
+	.priv_auto	= sizeof(struct ast_i2c_priv),
 	.ops = &ast_i2c_ops,
 };
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index 9d6c6d8..db2fbc9 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -318,7 +318,7 @@ U_BOOT_DRIVER(i2c_at91) = {
 	.of_match = at91_i2c_ids,
 	.probe = at91_i2c_probe,
 	.ofdata_to_platdata = at91_i2c_ofdata_to_platdata,
-	.per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
-	.priv_auto_alloc_size = sizeof(struct at91_i2c_bus),
+	.per_child_auto	= sizeof(struct dm_i2c_chip),
+	.priv_auto	= sizeof(struct at91_i2c_bus),
 	.ops	= &at91_i2c_ops,
 };
diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index a630817..1cc5c06 100644
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -56,6 +56,6 @@ U_BOOT_DRIVER(cros_ec_tunnel) = {
 	.id	= UCLASS_I2C,
 	.of_match = cros_ec_i2c_ids,
 	.ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct cros_ec_i2c_bus),
+	.priv_auto	= sizeof(struct cros_ec_i2c_bus),
 	.ops	= &cros_ec_i2c_ops,
 };
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index a54f215..074d609 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -504,7 +504,7 @@ U_BOOT_DRIVER(i2c_davinci) = {
 	.id	= UCLASS_I2C,
 	.of_match = davinci_i2c_ids,
 	.probe	= davinci_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct i2c_bus),
+	.priv_auto	= sizeof(struct i2c_bus),
 	.ops	= &davinci_i2c_ops,
 };
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index c549895..1a083d9 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -844,7 +844,7 @@ U_BOOT_DRIVER(i2c_designware) = {
 	.of_match = designware_i2c_ids,
 	.ofdata_to_platdata = designware_i2c_ofdata_to_platdata,
 	.probe	= designware_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct dw_i2c),
+	.priv_auto	= sizeof(struct dw_i2c),
 	.remove = designware_i2c_remove,
 	.flags	= DM_FLAG_OS_PREPARE,
 	.ops	= &designware_i2c_ops,
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index d0d869c..d62805a 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -213,7 +213,7 @@ U_BOOT_DRIVER(i2c_designware_pci) = {
 	.bind	= designware_i2c_pci_bind,
 	.ofdata_to_platdata	= designware_i2c_pci_ofdata_to_platdata,
 	.probe	= designware_i2c_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct dw_i2c),
+	.priv_auto	= sizeof(struct dw_i2c),
 	.remove = designware_i2c_remove,
 	.flags = DM_FLAG_OS_PREPARE,
 	.ops	= &designware_i2c_ops,
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index 5785ade..2ef6f53 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -558,6 +558,6 @@ U_BOOT_DRIVER(hs_i2c) = {
 	.id	= UCLASS_I2C,
 	.of_match = exynos_hs_i2c_ids,
 	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
+	.priv_auto	= sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &exynos_hs_i2c_ops,
 };
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index da93345..f55b475 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -650,7 +650,7 @@ U_BOOT_DRIVER(i2c_fsl) = {
 	.of_match = fsl_i2c_ids,
 	.probe = fsl_i2c_probe,
 	.ofdata_to_platdata = fsl_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct fsl_i2c_dev),
+	.priv_auto	= sizeof(struct fsl_i2c_dev),
 	.ops = &fsl_i2c_ops,
 };
 
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 7144d39..2cf2233 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -504,6 +504,6 @@ U_BOOT_DRIVER(cdns_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = cdns_i2c_of_match,
 	.ofdata_to_platdata = cdns_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct i2c_cdns_bus),
+	.priv_auto	= sizeof(struct i2c_cdns_bus),
 	.ops = &cdns_i2c_ops,
 };
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 036fc42..420dfdb 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -341,7 +341,7 @@ U_BOOT_DRIVER(i2c_cortina) = {
 	.of_match = ca_i2c_ids,
 	.ofdata_to_platdata = ca_i2c_ofdata_to_platdata,
 	.probe	= ca_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct ca_i2c),
+	.priv_auto	= sizeof(struct ca_i2c),
 	.ops	= &ca_i2c_ops,
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c
index 84b6a21..956ebee 100644
--- a/drivers/i2c/i2c-emul-uclass.c
+++ b/drivers/i2c/i2c-emul-uclass.c
@@ -64,14 +64,14 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp)
 UCLASS_DRIVER(i2c_emul) = {
 	.id		= UCLASS_I2C_EMUL,
 	.name		= "i2c_emul",
-	.per_device_platdata_auto_alloc_size =
+	.per_device_platdata_auto	=
 		 sizeof(struct i2c_emul_uc_platdata),
 };
 
 /*
  * This uclass is a child of the i2c bus. Its platdata is not defined here so
  * is defined by its parent, UCLASS_I2C, which uses struct dm_i2c_chip. See
- * per_child_platdata_auto_alloc_size in UCLASS_DRIVER(i2c).
+ * per_child_platdata_auto	in UCLASS_DRIVER(i2c).
  */
 UCLASS_DRIVER(i2c_emul_parent) = {
 	.id		= UCLASS_I2C_EMUL_PARENT,
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 381938c..9b2f6f2 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -372,6 +372,6 @@ U_BOOT_DRIVER(i2c_gpio) = {
 	.of_match = i2c_gpio_ids,
 	.probe	= i2c_gpio_drv_probe,
 	.ofdata_to_platdata = i2c_gpio_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct i2c_gpio_bus),
+	.priv_auto	= sizeof(struct i2c_gpio_bus),
 	.ops	= &i2c_gpio_ops,
 };
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 5c4626b..2feb588 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -739,11 +739,11 @@ UCLASS_DRIVER(i2c) = {
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_bind	= i2c_post_bind,
 	.init		= i2c_uclass_init,
-	.priv_auto_alloc_size = sizeof(struct i2c_priv),
+	.priv_auto	= sizeof(struct i2c_priv),
 	.pre_probe      = i2c_pre_probe,
 	.post_probe	= i2c_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct dm_i2c_bus),
-	.per_child_platdata_auto_alloc_size = sizeof(struct dm_i2c_chip),
+	.per_device_auto	= sizeof(struct dm_i2c_bus),
+	.per_child_platdata_auto	= sizeof(struct dm_i2c_chip),
 	.child_post_bind = i2c_child_post_bind,
 };
 
@@ -766,7 +766,7 @@ U_BOOT_DRIVER(i2c_generic_chip_drv) = {
 	.of_match	= generic_chip_i2c_ids,
 #if CONFIG_IS_ENABLED(ACPIGEN)
 	.ofdata_to_platdata	= acpi_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct acpi_i2c_priv),
+	.priv_auto	= sizeof(struct acpi_i2c_priv),
 #endif
 	ACPI_OPS_PTR(&acpi_i2c_ops)
 };
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index a110fe9..9d6f168 100644
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -326,6 +326,6 @@ U_BOOT_DRIVER(uniphier_fi2c) = {
 	.id = UCLASS_I2C,
 	.of_match = uniphier_fi2c_of_match,
 	.probe = uniphier_fi2c_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_fi2c_priv),
+	.priv_auto	= sizeof(struct uniphier_fi2c_priv),
 	.ops = &uniphier_fi2c_ops,
 };
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index e7f44e1..6eafbee 100644
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -214,6 +214,6 @@ U_BOOT_DRIVER(uniphier_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = uniphier_i2c_of_match,
 	.probe = uniphier_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_i2c_priv),
+	.priv_auto	= sizeof(struct uniphier_i2c_priv),
 	.ops = &uniphier_i2c_ops,
 };
diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c
index 6283152..8183202 100644
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@@ -277,6 +277,6 @@ U_BOOT_DRIVER(versatile_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = versatile_i2c_of_match,
 	.probe = versatile_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct versatile_i2c_priv),
+	.priv_auto	= sizeof(struct versatile_i2c_priv),
 	.ops = &versatile_i2c_ops,
 };
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index cec3853..f91a96a 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -354,7 +354,7 @@ U_BOOT_DRIVER(i2c_ihs) = {
 	.id = UCLASS_I2C,
 	.of_match = ihs_i2c_ids,
 	.probe = ihs_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct ihs_i2c_priv),
+	.priv_auto	= sizeof(struct ihs_i2c_priv),
 	.ops = &ihs_i2c_ops,
 };
 
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index feeed1e..270a494 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -519,6 +519,6 @@ U_BOOT_DRIVER(imx_lpi2c) = {
 	.id = UCLASS_I2C,
 	.of_match = imx_lpi2c_ids,
 	.probe = imx_lpi2c_probe,
-	.priv_auto_alloc_size = sizeof(struct imx_lpi2c_bus),
+	.priv_auto	= sizeof(struct imx_lpi2c_bus),
 	.ops = &imx_lpi2c_ops,
 };
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 3b79cb4..c92074a 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -306,7 +306,7 @@ U_BOOT_DRIVER(intel_i2c) = {
 	.id	= UCLASS_I2C,
 	.of_match = intel_i2c_ids,
 	.ops	= &intel_i2c_ops,
-	.priv_auto_alloc_size = sizeof(struct intel_i2c),
+	.priv_auto	= sizeof(struct intel_i2c),
 	.bind	= intel_i2c_bind,
 	.probe	= intel_i2c_probe,
 };
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b7e9ced..20e2595 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -707,7 +707,7 @@ U_BOOT_DRIVER(iproc_i2c) = {
 	.of_match = iproc_i2c_ids,
 	.ofdata_to_platdata = iproc_i2c_ofdata_to_platdata,
 	.probe	= iproc_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct iproc_i2c),
+	.priv_auto	= sizeof(struct iproc_i2c),
 	.ops	= &iproc_i2c_ops,
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index e070caf..434e346 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -308,6 +308,6 @@ U_BOOT_DRIVER(i2c_meson) = {
 	.id   = UCLASS_I2C,
 	.of_match = meson_i2c_ids,
 	.probe = meson_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_i2c),
+	.priv_auto	= sizeof(struct meson_i2c),
 	.ops = &meson_i2c_ops,
 };
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 584d0a4..928e02b 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -145,5 +145,5 @@ U_BOOT_DRIVER(i2c_arbitrator) = {
 	.probe = i2c_arbitrator_probe,
 	.remove = i2c_arbitrator_remove,
 	.ops = &i2c_arbitrator_ops,
-	.priv_auto_alloc_size = sizeof(struct i2c_arbitrator_priv),
+	.priv_auto	= sizeof(struct i2c_arbitrator_priv),
 };
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 83dcb40..8d6e208 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -136,5 +136,5 @@ U_BOOT_DRIVER(i2c_mux_gpio) = {
 	.of_match = i2c_mux_gpio_ids,
 	.ops = &i2c_mux_gpio_ops,
 	.probe = i2c_mux_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct i2c_mux_gpio_priv),
+	.priv_auto	= sizeof(struct i2c_mux_gpio_priv),
 };
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 2689755..cefd9db 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -220,7 +220,7 @@ UCLASS_DRIVER(i2c_mux) = {
 	.name		= "i2c_mux",
 	.post_bind	= i2c_mux_post_bind,
 	.post_probe	= i2c_mux_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct i2c_mux),
-	.per_child_platdata_auto_alloc_size = sizeof(struct i2c_mux_bus),
+	.per_device_auto	= sizeof(struct i2c_mux),
+	.per_child_platdata_auto	= sizeof(struct i2c_mux_bus),
 	.child_post_bind = i2c_mux_child_post_bind,
 };
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 7360e16..06efe84 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -172,5 +172,5 @@ U_BOOT_DRIVER(pca954x) = {
 	.remove = pca954x_remove,
 	.ops = &pca954x_ops,
 	.ofdata_to_platdata = pca954x_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct pca954x_priv),
+	.priv_auto	= sizeof(struct pca954x_priv),
 };
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 82e8fda..ef1007d 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -600,7 +600,7 @@ U_BOOT_DRIVER(i2c_mv) = {
 	.id	= UCLASS_I2C,
 	.of_match = mv_i2c_ids,
 	.probe	= mv_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct mv_i2c_priv),
+	.priv_auto	= sizeof(struct mv_i2c_priv),
 	.ops	= &mv_i2c_ops,
 };
 #endif /* CONFIG_DM_I2C */
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 14c594d..dd9cfeb 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -889,7 +889,7 @@ U_BOOT_DRIVER(i2c_mvtwsi) = {
 	.bind = mvtwsi_i2c_bind,
 	.probe = mvtwsi_i2c_probe,
 	.ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct mvtwsi_i2c_dev),
+	.priv_auto	= sizeof(struct mvtwsi_i2c_dev),
 	.ops = &mvtwsi_i2c_ops,
 };
 #endif /* CONFIG_DM_I2C */
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 7609594..3d37858 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -1072,7 +1072,7 @@ U_BOOT_DRIVER(i2c_mxc) = {
 	.id = UCLASS_I2C,
 	.of_match = mxc_i2c_ids,
 	.probe = mxc_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct mxc_i2c_bus),
+	.priv_auto	= sizeof(struct mxc_i2c_bus),
 	.ops = &mxc_i2c_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index ca14a0e..a672c01 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -621,6 +621,6 @@ U_BOOT_DRIVER(i2c_nexell) = {
 	.id		= UCLASS_I2C,
 	.of_match	= nx_i2c_ids,
 	.probe		= nx_i2c_probe,
-	.priv_auto_alloc_size	= sizeof(struct nx_i2c_bus),
+	.priv_auto	= sizeof(struct nx_i2c_bus),
 	.ops		= &nx_i2c_ops,
 };
diff --git a/drivers/i2c/ocores_i2c.c b/drivers/i2c/ocores_i2c.c
index c4f2cc4..48ed1d5 100644
--- a/drivers/i2c/ocores_i2c.c
+++ b/drivers/i2c/ocores_i2c.c
@@ -632,6 +632,6 @@ U_BOOT_DRIVER(i2c_ocores) = {
 	.id	= UCLASS_I2C,
 	.of_match = ocores_i2c_ids,
 	.probe = ocores_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct ocores_i2c_bus),
+	.priv_auto = sizeof(struct ocores_i2c_bus),
 	.ops	= &ocores_i2c_ops,
 };
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index 23dcb15..b1a9cce 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -835,6 +835,6 @@ U_BOOT_DRIVER(octeon_pci_twsi) = {
 	.id	= UCLASS_I2C,
 	.of_match = octeon_i2c_ids,
 	.probe	= octeon_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct octeon_twsi),
+	.priv_auto	= sizeof(struct octeon_twsi),
 	.ops	= &octeon_i2c_ops,
 };
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 0af4e33..bdb4f07 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -1094,10 +1094,10 @@ U_BOOT_DRIVER(i2c_omap) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_i2c_ids,
 	.ofdata_to_platdata = omap_i2c_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct omap_i2c_platdata),
+	.platdata_auto	= sizeof(struct omap_i2c_platdata),
 #endif
 	.probe	= omap_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct omap_i2c),
+	.priv_auto	= sizeof(struct omap_i2c),
 	.ops	= &omap_i2c_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags  = DM_FLAG_PRE_RELOC,
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 663c342..14bb660 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -371,6 +371,6 @@ U_BOOT_DRIVER(i2c_rcar) = {
 	.id		= UCLASS_I2C,
 	.of_match	= rcar_i2c_ids,
 	.probe		= rcar_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct rcar_i2c_priv),
+	.priv_auto	= sizeof(struct rcar_i2c_priv),
 	.ops		= &rcar_i2c_ops,
 };
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index cad0a62..f0e5091 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -269,6 +269,6 @@ U_BOOT_DRIVER(iic_rcar) = {
 	.id		= UCLASS_I2C,
 	.of_match	= rcar_iic_ids,
 	.probe		= rcar_iic_probe,
-	.priv_auto_alloc_size = sizeof(struct rcar_iic_priv),
+	.priv_auto	= sizeof(struct rcar_iic_priv),
 	.ops		= &rcar_iic_ops,
 };
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 6594610..e9717e5 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -491,7 +491,7 @@ U_BOOT_DRIVER(rockchip_rk3066_i2c) = {
 	.of_match = rockchip_i2c_ids,
 	.ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata,
 	.probe	= rockchip_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct rk_i2c),
+	.priv_auto	= sizeof(struct rk_i2c),
 	.ops	= &rockchip_i2c_ops,
 };
 
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index cb45d3c..ca94d29 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -343,6 +343,6 @@ U_BOOT_DRIVER(i2c_s3c) = {
 	.id	= UCLASS_I2C,
 	.of_match = s3c_i2c_ids,
 	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
+	.priv_auto	= sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &s3c_i2c_ops,
 };
diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 2cbdaf9..3abd053 100644
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -98,5 +98,5 @@ U_BOOT_DRIVER(sandbox_i2c) = {
 	.id	= UCLASS_I2C,
 	.of_match = sandbox_i2c_ids,
 	.ops	= &sandbox_i2c_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_i2c_priv),
+	.priv_auto	= sizeof(struct sandbox_i2c_priv),
 };
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 2f60911..483d834 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -955,6 +955,6 @@ U_BOOT_DRIVER(stm32f7_i2c) = {
 	.of_match = stm32_i2c_of_match,
 	.ofdata_to_platdata = stm32_ofdata_to_platdata,
 	.probe = stm32_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_i2c_priv),
+	.priv_auto	= sizeof(struct stm32_i2c_priv),
 	.ops = &stm32_i2c_ops,
 };
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 3720471..88e4e9a 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -122,6 +122,6 @@ U_BOOT_DRIVER(i2c_gpio) = {
 	.id	= UCLASS_I2C,
 	.of_match = tegra186_bpmp_i2c_ids,
 	.probe	= tegra186_bpmp_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra186_bpmp_i2c),
+	.priv_auto	= sizeof(struct tegra186_bpmp_i2c),
 	.ops	= &tegra186_bpmp_i2c_ops,
 };
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 65b3734..7cb5e8b 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -523,6 +523,6 @@ U_BOOT_DRIVER(i2c_tegra) = {
 	.id	= UCLASS_I2C,
 	.of_match = tegra_i2c_ids,
 	.probe	= tegra_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct i2c_bus),
+	.priv_auto	= sizeof(struct i2c_bus),
 	.ops	= &tegra_i2c_ops,
 };
diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c
index 149bd32..72199a6 100644
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@@ -348,6 +348,6 @@ U_BOOT_DRIVER(xilinx_xiic) = {
 	.id		= UCLASS_I2C,
 	.of_match	= xilinx_xiic_ids,
 	.probe		= xilinx_xiic_probe,
-	.priv_auto_alloc_size = sizeof(struct xilinx_xiic_priv),
+	.priv_auto	= sizeof(struct xilinx_xiic_priv),
 	.ops		= &xilinx_xiic_ops,
 };