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>

commit: 8a2b47f199182334308296dfbf7a6261f072069e [log] [tgz]
author: Simon Glass <sjg@chromium.org> Thu Dec 03 16:55:17 2020 -0700
committer: Simon Glass <sjg@chromium.org> Sun Dec 13 08:00:25 2020 -0700
tree: c27d9450fb5e72372be8483fc15079467b588169
parent: 93daa0116943f7df5ed291eb560457fc46762158 [diff]
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 7b9d3ee..aadb290 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c

@@ -646,6 +646,6 @@
 	.of_match = sun4i_usb_phy_ids,
 	.ops = &sun4i_usb_phy_ops,
 	.probe = sun4i_usb_phy_probe,
-	.platdata_auto_alloc_size = sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]),
-	.priv_auto_alloc_size = sizeof(struct sun4i_usb_phy_data),
+	.platdata_auto	= sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]),
+	.priv_auto	= sizeof(struct sun4i_usb_phy_data),
 };

diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index d29344d..60608a5 100644
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-usbh-phy.c

@@ -138,6 +138,6 @@
 	.id = UCLASS_PHY,
 	.of_match = bcm6318_usbh_ids,
 	.ops = &bcm6318_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6318_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6318_usbh_priv),
 	.probe = bcm6318_usbh_probe,
 };

diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c
index 8d28292..1b6b5ad 100644
--- a/drivers/phy/bcm6348-usbh-phy.c
+++ b/drivers/phy/bcm6348-usbh-phy.c

@@ -87,6 +87,6 @@
 	.id = UCLASS_PHY,
 	.of_match = bcm6348_usbh_ids,
 	.ops = &bcm6348_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6348_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6348_usbh_priv),
 	.probe = bcm6348_usbh_probe,
 };

diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c
index 501b97f..bfdcfb0 100644
--- a/drivers/phy/bcm6358-usbh-phy.c
+++ b/drivers/phy/bcm6358-usbh-phy.c

@@ -87,6 +87,6 @@
 	.id = UCLASS_PHY,
 	.of_match = bcm6358_usbh_ids,
 	.ops = &bcm6358_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6358_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6358_usbh_priv),
 	.probe = bcm6358_usbh_probe,
 };

diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 99fdd33..4d3a63f 100644
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c

@@ -191,6 +191,6 @@
 	.id = UCLASS_PHY,
 	.of_match = bcm6368_usbh_ids,
 	.ops = &bcm6368_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6368_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6368_usbh_priv),
 	.probe = bcm6368_usbh_probe,
 };

diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 9faf501..12f8a26 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c

@@ -130,5 +130,5 @@
 	.of_match = keystone_usb_phy_ids,
 	.ops = &keystone_usb_phy_ops,
 	.probe = keystone_usb_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct keystone_usb_phy),
+	.priv_auto	= sizeof(struct keystone_usb_phy),
 };

diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 5e8ce74..b220327 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c

@@ -189,5 +189,5 @@
 	.id	= UCLASS_MISC,
 	.of_match = comphy_ids,
 	.probe	= comphy_probe,
-	.priv_auto_alloc_size = sizeof(struct chip_serdes_phy_config),
+	.priv_auto	= sizeof(struct chip_serdes_phy_config),
 };

diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c
index 447ce72..2fbba7f 100644
--- a/drivers/phy/meson-g12a-usb2.c
+++ b/drivers/phy/meson-g12a-usb2.c

@@ -215,5 +215,5 @@
 	.of_match = meson_g12a_usb2_phy_ids,
 	.probe = meson_g12a_usb2_phy_probe,
 	.ops = &meson_g12a_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_meson_g12a_usb2_priv),
+	.priv_auto	= sizeof(struct phy_meson_g12a_usb2_priv),
 };

diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index 4e9696f..0433d93 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c

@@ -343,5 +343,5 @@
 	.of_match = meson_g12a_usb3_pcie_phy_ids,
 	.probe = meson_g12a_usb3_pcie_phy_probe,
 	.ops = &meson_g12a_usb3_pcie_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_g12a_usb3_pcie_priv),
+	.priv_auto	= sizeof(struct phy_g12a_usb3_pcie_priv),
 };

diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index d1beebe..7a2e3d2 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c

@@ -232,5 +232,5 @@
 	.probe = meson_gxbb_usb2_phy_probe,
 	.remove = meson_gxbb_usb2_phy_remove,
 	.ops = &meson_gxbb_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
+	.priv_auto	= sizeof(struct phy_meson_gxbb_usb2_priv),
 };

diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index 2267bd0..9fb376c 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c

@@ -251,5 +251,5 @@
 	.of_match = meson_gxl_usb2_phy_ids,
 	.probe = meson_gxl_usb2_phy_probe,
 	.ops = &meson_gxl_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_meson_gxl_usb2_priv),
+	.priv_auto	= sizeof(struct phy_meson_gxl_usb2_priv),
 };

diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c
index 4efaddd..7c9d030 100644
--- a/drivers/phy/msm8916-usbh-phy.c
+++ b/drivers/phy/msm8916-usbh-phy.c

@@ -106,5 +106,5 @@
 	.of_match	= msm_phy_ids,
 	.ops		= &msm_phy_ops,
 	.probe		= msm_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct msm_phy_priv),
+	.priv_auto	= sizeof(struct msm_phy_priv),
 };

diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
index 4c0818f..4069208 100644
--- a/drivers/phy/mt76x8-usb-phy.c
+++ b/drivers/phy/mt76x8-usb-phy.c

@@ -248,5 +248,5 @@
 	.of_match	= mt76x8_usb_phy_ids,
 	.ops		= &mt76x8_usb_phy_ops,
 	.probe		= mt76x8_usb_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct mt76x8_usb_phy),
+	.priv_auto	= sizeof(struct mt76x8_usb_phy),
 };

diff --git a/drivers/phy/nop-phy.c b/drivers/phy/nop-phy.c
index ba71785..84aac80 100644
--- a/drivers/phy/nop-phy.c
+++ b/drivers/phy/nop-phy.c

@@ -56,5 +56,5 @@
 	.of_match = nop_phy_ids,
 	.ops = &nop_phy_ops,
 	.probe = nop_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct nop_phy_priv),
+	.priv_auto	= sizeof(struct nop_phy_priv),
 };

diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index a981cb2..cb99143 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c

@@ -261,5 +261,5 @@
 	.of_match = omap_usb2_id_table,
 	.probe = omap_usb2_phy_probe,
 	.ops = &omap_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct omap_usb2_phy),
+	.priv_auto	= sizeof(struct omap_usb2_phy),
 };

diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c
index 36c77c4..9f7c983 100644
--- a/drivers/phy/phy-bcm-sr-pcie.c
+++ b/drivers/phy/phy-bcm-sr-pcie.c

@@ -172,6 +172,6 @@
 	.probe = sr_pcie_phy_probe,
 	.of_match = sr_pcie_phy_match_table,
 	.ops = &sr_pcie_phy_ops,
-	.platdata_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
-	.priv_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
+	.platdata_auto	= sizeof(struct sr_pcie_phy_core),
+	.priv_auto	= sizeof(struct sr_pcie_phy_core),
 };

diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c
index 3d7b9cd..824244b 100644
--- a/drivers/phy/phy-mtk-tphy.c
+++ b/drivers/phy/phy-mtk-tphy.c

@@ -749,5 +749,5 @@
 	.of_match	= mtk_tphy_id_table,
 	.ops		= &mtk_tphy_ops,
 	.probe		= mtk_tphy_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_tphy),
+	.priv_auto	= sizeof(struct mtk_tphy),
 };

diff --git a/drivers/phy/phy-qcom-ipq4019-usb.c b/drivers/phy/phy-qcom-ipq4019-usb.c
index 465f0d3..5808489 100644
--- a/drivers/phy/phy-qcom-ipq4019-usb.c
+++ b/drivers/phy/phy-qcom-ipq4019-usb.c

@@ -75,7 +75,7 @@
 	.of_match	= ipq4019_usb_ss_phy_ids,
 	.ops		= &ipq4019_usb_ss_phy_ops,
 	.probe		= ipq4019_usb_ss_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct ipq4019_usb_phy),
+	.priv_auto	= sizeof(struct ipq4019_usb_phy),
 };
 
 static int ipq4019_hs_phy_power_off(struct phy *_phy)
@@ -141,5 +141,5 @@
 	.of_match	= ipq4019_usb_hs_phy_ids,
 	.ops		= &ipq4019_usb_hs_phy_ops,
 	.probe		= ipq4019_usb_hs_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct ipq4019_usb_phy),
+	.priv_auto	= sizeof(struct ipq4019_usb_phy),
 };

diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 18da86e..1794095 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c

@@ -189,5 +189,5 @@
 	.ops		= &rcar_gen2_phy_phy_ops,
 	.probe		= rcar_gen2_phy_probe,
 	.remove		= rcar_gen2_phy_remove,
-	.priv_auto_alloc_size = sizeof(struct rcar_gen2_phy),
+	.priv_auto	= sizeof(struct rcar_gen2_phy),
 };

diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
index ce39cd8..8c59631 100644
--- a/drivers/phy/phy-rcar-gen3.c
+++ b/drivers/phy/phy-rcar-gen3.c

@@ -158,5 +158,5 @@
 	.ops		= &rcar_gen3_phy_phy_ops,
 	.probe		= rcar_gen3_phy_probe,
 	.remove		= rcar_gen3_phy_remove,
-	.priv_auto_alloc_size = sizeof(struct rcar_gen3_phy),
+	.priv_auto	= sizeof(struct rcar_gen3_phy),
 };

diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index ab4a913..f23aef4 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c

@@ -419,5 +419,5 @@
 	.of_match = stm32_usbphyc_of_match,
 	.ops = &stm32_usbphyc_phy_ops,
 	.probe = stm32_usbphyc_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_usbphyc),
+	.priv_auto	= sizeof(struct stm32_usbphyc),
 };

diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
index cc73760..8e35ea1 100644
--- a/drivers/phy/phy-ti-am654.c
+++ b/drivers/phy/phy-ti-am654.c

@@ -187,7 +187,7 @@
 	.name = "ti-serdes-am654-mux-clk",
 	.id = UCLASS_CLK,
 	.probe = serdes_am654_mux_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct serdes_am654_mux_clk_data),
+	.priv_auto	= sizeof(struct serdes_am654_mux_clk_data),
 	.ops = &serdes_am654_mux_clk_ops,
 };
 
@@ -412,5 +412,5 @@
 	.bind = serdes_am654_bind,
 	.ops = &serdes_am654_phy_ops,
 	.probe = serdes_am654_probe,
-	.priv_auto_alloc_size = sizeof(struct serdes_am654),
+	.priv_auto	= sizeof(struct serdes_am654),
 };

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index c5ea6ca..6744b8b 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c

@@ -308,5 +308,5 @@
 	.of_match = rockchip_usb2phy_ids,
 	.probe = rockchip_usb2phy_probe,
 	.bind = rockchip_usb2phy_bind,
-	.priv_auto_alloc_size = sizeof(struct rockchip_usb2phy),
+	.priv_auto	= sizeof(struct rockchip_usb2phy),
 };

diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 617943f..bc6c0fe 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c

@@ -267,5 +267,5 @@
 	.of_match = rockchip_pcie_phy_ids,
 	.ops = &rockchip_pcie_phy_ops,
 	.probe = rockchip_pcie_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pcie_phy),
+	.priv_auto	= sizeof(struct rockchip_pcie_phy),
 };

diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index da00daa..a45a318 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c

@@ -792,5 +792,5 @@
 	.of_match = rockchip_typec_phy_ids,
 	.probe = rockchip_tcphy_probe,
 	.bind = rockchip_tcphy_bind,
-	.priv_auto_alloc_size = sizeof(struct rockchip_tcphy),
+	.priv_auto	= sizeof(struct rockchip_tcphy),
 };

diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c
index 5f36da7..7b3d988 100644
--- a/drivers/phy/sandbox-phy.c
+++ b/drivers/phy/sandbox-phy.c

@@ -116,5 +116,5 @@
 	.of_match	= sandbox_phy_ids,
 	.ops		= &sandbox_phy_ops,
 	.probe		= sandbox_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_phy_priv),
+	.priv_auto	= sizeof(struct sandbox_phy_priv),
 };

diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 2a20f76..6a7c356 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c

@@ -177,5 +177,5 @@
 	.of_match = sti_usb_phy_ids,
 	.probe = sti_usb_phy_probe,
 	.ops = &sti_usb_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct sti_usb_phy),
+	.priv_auto	= sizeof(struct sti_usb_phy),
 };

diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 3f49851..98fe6c6f 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c

@@ -604,5 +604,5 @@
 	.of_match = pipe3_phy_ids,
 	.ops = &pipe3_phy_ops,
 	.probe = pipe3_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct omap_pipe3),
+	.priv_auto	= sizeof(struct omap_pipe3),
 };
commit	8a2b47f199182334308296dfbf7a6261f072069e	[log] [tgz]
author	Simon Glass <sjg@chromium.org>	Thu Dec 03 16:55:17 2020 -0700
committer	Simon Glass <sjg@chromium.org>	Sun Dec 13 08:00:25 2020 -0700
tree	c27d9450fb5e72372be8483fc15079467b588169
parent	93daa0116943f7df5ed291eb560457fc46762158 [diff]