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>

17 files changed, 18 insertions, 18 deletions

diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 0615e50378..d4e8f8df87 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -1310,7 +1310,7 @@ U_BOOT_DRIVER(arasan_nand) = {
 	.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 6313403cd6..71682cb6e7 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -109,7 +109,7 @@ U_BOOT_DRIVER(bcm63158_nand) = {
 	.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 cd4b24a51a..f424194ecc 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -102,7 +102,7 @@ U_BOOT_DRIVER(bcm6368_nand) = {
 	.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 aa042bef15..47ddde4f9b 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -108,7 +108,7 @@ U_BOOT_DRIVER(bcm68360_nand) = {
 	.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 0788455090..646495096c 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -108,7 +108,7 @@ U_BOOT_DRIVER(bcm6838_nand) = {
 	.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 818eae8a7c..7573cd944f 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -109,7 +109,7 @@ U_BOOT_DRIVER(bcm6858_nand) = {
 	.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 4416b8fa1e..4645cc1699 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -816,7 +816,7 @@ U_BOOT_DRIVER(davinci_nand) = {
 	.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 8318ff507f..140ef7f725 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(denali_nand_dt) = {
 	.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 43dbe9e66e..78a423dbbf 100644
--- a/drivers/mtd/nand/raw/mxs_nand_dt.c
+++ b/drivers/mtd/nand/raw/mxs_nand_dt.c
@@ -168,7 +168,7 @@ U_BOOT_DRIVER(mxs_nand_dt) = {
 	.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 693706257c..a41772880f 100644
--- a/drivers/mtd/nand/raw/octeontx_bch.c
+++ b/drivers/mtd/nand/raw/octeontx_bch.c
@@ -410,7 +410,7 @@ U_BOOT_DRIVER(octeontx_pci_bchpf) = {
 	.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 @@ U_BOOT_DRIVER(octeontx_pci_bchvf) = {
 	.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 ad219171e9..cfeca1e688 100644
--- a/drivers/mtd/nand/raw/octeontx_nand.c
+++ b/drivers/mtd/nand/raw/octeontx_nand.c
@@ -2219,7 +2219,7 @@ U_BOOT_DRIVER(octeontx_pci_nand) = {
 	.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 361a9e3293..e923ce363a 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -1937,7 +1937,7 @@ U_BOOT_DRIVER(pxa3xx_nand) = {
 	.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 47fe61090d..8fe7ec1343 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -1033,7 +1033,7 @@ U_BOOT_DRIVER(stm32_fmc2_nfc) = {
 	.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 b9f5bdd953..797fc23050 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -990,7 +990,7 @@ U_BOOT_DRIVER(tegra_nand) = {
 	.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 4e6fdc607f..422b9c57a8 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -784,7 +784,7 @@ U_BOOT_DRIVER(vf610_nfc_dt) = {
 	.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 92db2aa19c..7cf0ccb656 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1286,7 +1286,7 @@ U_BOOT_DRIVER(zynq_nand) = {
 	.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 8c7e07d463..fc9d4edbe0 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -1255,6 +1255,6 @@ U_BOOT_DRIVER(spinand) = {
 	.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,
 };