summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ag7xxx.c4
-rw-r--r--drivers/net/altera_tse.c4
-rw-r--r--drivers/net/bcm6348-eth.c4
-rw-r--r--drivers/net/bcm6368-eth.c4
-rw-r--r--drivers/net/bcmgenet.c4
-rw-r--r--drivers/net/dc2114x.c4
-rw-r--r--drivers/net/designware.c4
-rw-r--r--drivers/net/dwc_eth_qos.c4
-rw-r--r--drivers/net/dwmac_s700.c4
-rw-r--r--drivers/net/dwmac_socfpga.c4
-rw-r--r--drivers/net/e1000.c4
-rw-r--r--drivers/net/eepro100.c4
-rw-r--r--drivers/net/eth-phy-uclass.c2
-rw-r--r--drivers/net/ethoc.c4
-rw-r--r--drivers/net/fec_mxc.c4
-rw-r--r--drivers/net/fm/eth.c4
-rw-r--r--drivers/net/fm/fm.c2
-rw-r--r--drivers/net/fm/memac_phy.c4
-rw-r--r--drivers/net/fsl_enetc.c4
-rw-r--r--drivers/net/fsl_enetc_mdio.c2
-rw-r--r--drivers/net/fsl_ls_mdio.c2
-rw-r--r--drivers/net/fsl_mcdmafec.c4
-rw-r--r--drivers/net/fsl_mdio.c4
-rw-r--r--drivers/net/ftgmac100.c4
-rw-r--r--drivers/net/ftmac100.c4
-rw-r--r--drivers/net/gmac_rockchip.c4
-rw-r--r--drivers/net/higmacv300.c4
-rw-r--r--drivers/net/ks8851_mll.c4
-rw-r--r--drivers/net/ldpaa_eth/ldpaa_eth.c4
-rw-r--r--drivers/net/macb.c4
-rw-r--r--drivers/net/mcffec.c4
-rw-r--r--drivers/net/mdio-ipq4019.c2
-rw-r--r--drivers/net/mdio_mux_i2creg.c2
-rw-r--r--drivers/net/mdio_mux_sandbox.c2
-rw-r--r--drivers/net/mdio_sandbox.c2
-rw-r--r--drivers/net/mscc_eswitch/jr2_switch.c4
-rw-r--r--drivers/net/mscc_eswitch/luton_switch.c4
-rw-r--r--drivers/net/mscc_eswitch/ocelot_switch.c4
-rw-r--r--drivers/net/mscc_eswitch/serval_switch.c4
-rw-r--r--drivers/net/mscc_eswitch/servalt_switch.c4
-rw-r--r--drivers/net/mt7628-eth.c4
-rw-r--r--drivers/net/mtk_eth.c4
-rw-r--r--drivers/net/mvgbe.c4
-rw-r--r--drivers/net/mvmdio.c2
-rw-r--r--drivers/net/mvneta.c4
-rw-r--r--drivers/net/mvpp2.c6
-rw-r--r--drivers/net/octeontx/bgx.c2
-rw-r--r--drivers/net/octeontx/nic_main.c2
-rw-r--r--drivers/net/octeontx/nicvf_main.c4
-rw-r--r--drivers/net/octeontx2/cgx.c2
-rw-r--r--drivers/net/octeontx2/rvu_af.c2
-rw-r--r--drivers/net/octeontx2/rvu_pf.c4
-rw-r--r--drivers/net/pch_gbe.c4
-rw-r--r--drivers/net/pcnet.c4
-rw-r--r--drivers/net/pfe_eth/pfe_eth.c4
-rw-r--r--drivers/net/pic32_eth.c4
-rw-r--r--drivers/net/qe/dm_qe_uec.c4
-rw-r--r--drivers/net/qe/dm_qe_uec_phy.c2
-rw-r--r--drivers/net/ravb.c4
-rw-r--r--drivers/net/rtl8139.c4
-rw-r--r--drivers/net/rtl8169.c4
-rw-r--r--drivers/net/sandbox-raw.c4
-rw-r--r--drivers/net/sandbox.c4
-rw-r--r--drivers/net/sh_eth.c4
-rw-r--r--drivers/net/smc911x.c4
-rw-r--r--drivers/net/sni_ave.c4
-rw-r--r--drivers/net/sun8i_emac.c4
-rw-r--r--drivers/net/sunxi_emac.c4
-rw-r--r--drivers/net/ti/am65-cpsw-nuss.c4
-rw-r--r--drivers/net/ti/cpsw.c4
-rw-r--r--drivers/net/ti/davinci_emac.c2
-rw-r--r--drivers/net/ti/keystone_net.c8
-rw-r--r--drivers/net/tsec.c4
-rw-r--r--drivers/net/xilinx_axi_emac.c4
-rw-r--r--drivers/net/xilinx_emaclite.c4
-rw-r--r--drivers/net/zynq_gem.c4
76 files changed, 140 insertions, 140 deletions
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index ccba3947ac..02565aae7b 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -1291,7 +1291,7 @@ U_BOOT_DRIVER(eth_ag7xxx) = {
.probe = ag7xxx_eth_probe,
.remove = ag7xxx_eth_remove,
.ops = &ag7xxx_eth_ops,
- .priv_auto_alloc_size = sizeof(struct ar7xxx_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ar7xxx_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 93b26da392..7d0c58cd53 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -711,7 +711,7 @@ U_BOOT_DRIVER(altera_tse) = {
.of_match = altera_tse_ids,
.ops = &altera_tse_ops,
.ofdata_to_platdata = altera_tse_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
- .priv_auto_alloc_size = sizeof(struct altera_tse_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct altera_tse_priv),
.probe = altera_tse_probe,
};
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 9ddc0f938f..6d62246678 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -533,7 +533,7 @@ U_BOOT_DRIVER(bcm6348_eth) = {
.id = UCLASS_ETH,
.of_match = bcm6348_eth_ids,
.ops = &bcm6348_eth_ops,
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
- .priv_auto_alloc_size = sizeof(struct bcm6348_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct bcm6348_eth_priv),
.probe = bcm6348_eth_probe,
};
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 38a2a30fe6..b0bf0a939d 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -637,7 +637,7 @@ U_BOOT_DRIVER(bcm6368_eth) = {
.id = UCLASS_ETH,
.of_match = bcm6368_eth_ids,
.ops = &bcm6368_eth_ops,
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
- .priv_auto_alloc_size = sizeof(struct bcm6368_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct bcm6368_eth_priv),
.probe = bcm6368_eth_probe,
};
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index ace1331362..b6ebac220e 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -732,7 +732,7 @@ U_BOOT_DRIVER(eth_bcmgenet) = {
.ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata,
.probe = bcmgenet_eth_probe,
.ops = &bcmgenet_gmac_eth_ops,
- .priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct bcmgenet_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 9f8c6c58d9..26d2ec0970 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -751,8 +751,8 @@ U_BOOT_DRIVER(eth_dc2114x) = {
.bind = dc2114x_bind,
.probe = dc2114x_probe,
.ops = &dc2114x_ops,
- .priv_auto_alloc_size = sizeof(struct dc2114x_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct dc2114x_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
U_BOOT_PCI_DEVICE(eth_dc2114x, supported);
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 4c19abbaf0..32b3fc8230 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -873,8 +873,8 @@ U_BOOT_DRIVER(eth_designware) = {
.probe = designware_eth_probe,
.remove = designware_eth_remove,
.ops = &designware_eth_ops,
- .priv_auto_alloc_size = sizeof(struct dw_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct dw_eth_pdata),
+ .priv_auto = sizeof(struct dw_eth_dev),
+ .platdata_auto = sizeof(struct dw_eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index db1102562f..de3ece81bc 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -2193,6 +2193,6 @@ U_BOOT_DRIVER(eth_eqos) = {
.probe = eqos_probe,
.remove = eqos_remove,
.ops = &eqos_ops,
- .priv_auto_alloc_size = sizeof(struct eqos_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct eqos_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index 9d3f3ac5d9..2edd7a74df 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -61,7 +61,7 @@ U_BOOT_DRIVER(dwmac_s700) = {
.ofdata_to_platdata = dwmac_s700_ofdata_to_platdata,
.probe = dwmac_s700_probe,
.ops = &designware_eth_ops,
- .priv_auto_alloc_size = sizeof(struct dw_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct dw_eth_dev),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index e93561dffa..9ab2eeb2bc 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -118,7 +118,7 @@ U_BOOT_DRIVER(dwmac_socfpga) = {
.ofdata_to_platdata = dwmac_socfpga_ofdata_to_platdata,
.probe = dwmac_socfpga_probe,
.ops = &designware_eth_ops,
- .priv_auto_alloc_size = sizeof(struct dw_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct dwmac_socfpga_platdata),
+ .priv_auto = sizeof(struct dw_eth_dev),
+ .platdata_auto = sizeof(struct dwmac_socfpga_platdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 8e6c755f64..87acfa5daa 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5940,8 +5940,8 @@ U_BOOT_DRIVER(eth_e1000) = {
.bind = e1000_eth_bind,
.probe = e1000_eth_probe,
.ops = &e1000_eth_ops,
- .priv_auto_alloc_size = sizeof(struct e1000_hw),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct e1000_hw),
+ .platdata_auto = sizeof(struct eth_pdata),
};
U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index feba5327da..59582b9121 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -1009,8 +1009,8 @@ U_BOOT_DRIVER(eth_eepro100) = {
.bind = eepro100_bind,
.probe = eepro100_probe,
.ops = &eepro100_ops,
- .priv_auto_alloc_size = sizeof(struct eepro100_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct eepro100_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
U_BOOT_PCI_DEVICE(eth_eepro100, supported);
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index b383f45527..65615f1310 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -113,7 +113,7 @@ int eth_phy_get_addr(struct udevice *dev)
UCLASS_DRIVER(eth_phy_generic) = {
.id = UCLASS_ETH_PHY,
.name = "eth_phy_generic",
- .per_device_auto_alloc_size = sizeof(struct eth_phy_device_priv),
+ .per_device_auto = sizeof(struct eth_phy_device_priv),
};
U_BOOT_DRIVER(eth_phy_generic_drv) = {
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b9d80a5b08..cb232f68bc 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -750,8 +750,8 @@ U_BOOT_DRIVER(ethoc) = {
.probe = ethoc_probe,
.remove = ethoc_remove,
.ops = &ethoc_ops,
- .priv_auto_alloc_size = sizeof(struct ethoc),
- .platdata_auto_alloc_size = sizeof(struct ethoc_eth_pdata),
+ .priv_auto = sizeof(struct ethoc),
+ .platdata_auto = sizeof(struct ethoc_eth_pdata),
};
#else
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bb55be9a26..9740bace99 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1597,7 +1597,7 @@ U_BOOT_DRIVER(fecmxc_gem) = {
.probe = fecmxc_probe,
.remove = fecmxc_remove,
.ops = &fecmxc_ops,
- .priv_auto_alloc_size = sizeof(struct fec_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct fec_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
#endif
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 2f433cedd0..3a827a97a8 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -1130,8 +1130,8 @@ U_BOOT_DRIVER(eth_fman) = {
.probe = fm_eth_probe,
.remove = fm_eth_remove,
.ops = &fm_eth_ops,
- .priv_auto_alloc_size = sizeof(struct fm_eth),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct fm_eth),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index bbb1738c4b..7d51be1f72 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -605,7 +605,7 @@ U_BOOT_DRIVER(fman) = {
.of_match = fman_ids,
.probe = fman_probe,
.remove = fman_remove,
- .priv_auto_alloc_size = sizeof(struct fman_priv),
+ .priv_auto = sizeof(struct fman_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index e15c28d500..2e97f51c4c 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -297,8 +297,8 @@ U_BOOT_DRIVER(fman_mdio) = {
.probe = fm_mdio_probe,
.remove = fm_mdio_remove,
.ops = &fm_mdio_ops,
- .priv_auto_alloc_size = sizeof(struct fm_mdio_priv),
- .platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv),
+ .priv_auto = sizeof(struct fm_mdio_priv),
+ .platdata_auto = sizeof(struct mdio_perdev_priv),
};
#endif /* CONFIG_PHYLIB && CONFIG_DM_MDIO */
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 2929ae7209..07ad44de47 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -677,8 +677,8 @@ U_BOOT_DRIVER(eth_enetc) = {
.probe = enetc_probe,
.remove = enetc_remove,
.ops = &enetc_ops,
- .priv_auto_alloc_size = sizeof(struct enetc_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct enetc_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
static struct pci_device_id enetc_ids[] = {
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 47257a6cf6..4da97b61d1 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -144,7 +144,7 @@ U_BOOT_DRIVER(enetc_mdio) = {
.bind = enetc_mdio_bind,
.probe = enetc_mdio_probe,
.ops = &enetc_mdio_ops,
- .priv_auto_alloc_size = sizeof(struct enetc_mdio_priv),
+ .priv_auto = sizeof(struct enetc_mdio_priv),
};
static struct pci_device_id enetc_mdio_ids[] = {
diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c
index 6d8332d19a..6d4e682fdf 100644
--- a/drivers/net/fsl_ls_mdio.c
+++ b/drivers/net/fsl_ls_mdio.c
@@ -142,5 +142,5 @@ U_BOOT_DRIVER(fsl_ls_mdio) = {
.of_match = fsl_ls_mdio_of_ids,
.probe = fsl_ls_mdio_probe,
.ops = &fsl_ls_mdio_ops,
- .priv_auto_alloc_size = sizeof(struct fsl_ls_mdio_priv),
+ .priv_auto = sizeof(struct fsl_ls_mdio_priv),
};
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index e27f7e5321..1023e1b1d9 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -594,6 +594,6 @@ U_BOOT_DRIVER(mcffec) = {
.probe = mcdmafec_probe,
.remove = mcdmafec_remove,
.ops = &mcdmafec_ops,
- .priv_auto_alloc_size = sizeof(struct fec_info_dma),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct fec_info_dma),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 77f1a96a2e..faeb292e55 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -248,8 +248,8 @@ U_BOOT_DRIVER(tsec_mdio) = {
.probe = tsec_mdio_probe,
.remove = tsec_mdio_remove,
.ops = &tsec_mdio_ops,
- .priv_auto_alloc_size = sizeof(struct tsec_mdio_priv),
- .platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv),
+ .priv_auto = sizeof(struct tsec_mdio_priv),
+ .platdata_auto = sizeof(struct mdio_perdev_priv),
};
#endif /* CONFIG_PHYLIB */
#endif /* CONFIG_DM_MDIO */
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 00bda24f1f..aec9ca06b7 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -613,7 +613,7 @@ U_BOOT_DRIVER(ftgmac100) = {
.probe = ftgmac100_probe,
.remove = ftgmac100_remove,
.ops = &ftgmac100_ops,
- .priv_auto_alloc_size = sizeof(struct ftgmac100_data),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ftgmac100_data),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 292690de96..20b8e35516 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -440,8 +440,8 @@ U_BOOT_DRIVER(ftmac100) = {
.ofdata_to_platdata = ftmac100_ofdata_to_platdata,
.probe = ftmac100_probe,
.ops = &ftmac100_ops,
- .priv_auto_alloc_size = sizeof(struct ftmac100_data),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ftmac100_data),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 8d95ee15ff..1b1e7a8f69 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -759,7 +759,7 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = {
.ofdata_to_platdata = gmac_rockchip_ofdata_to_platdata,
.probe = gmac_rockchip_probe,
.ops = &gmac_rockchip_eth_ops,
- .priv_auto_alloc_size = sizeof(struct dw_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct gmac_rockchip_platdata),
+ .priv_auto = sizeof(struct dw_eth_dev),
+ .platdata_auto = sizeof(struct gmac_rockchip_platdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 2aae7f4863..93c2523ac2 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -598,6 +598,6 @@ U_BOOT_DRIVER(eth_higmac) = {
.probe = higmac_probe,
.remove = higmac_remove,
.ops = &higmac_ops,
- .priv_auto_alloc_size = sizeof(struct higmac_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct higmac_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 58e065cdcc..6340d6317d 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -698,8 +698,8 @@ U_BOOT_DRIVER(ks8851) = {
.ofdata_to_platdata = ks8851_ofdata_to_platdata,
.probe = ks8851_probe,
.ops = &ks8851_ops,
- .priv_auto_alloc_size = sizeof(struct ks_net),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ks_net),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 42eaf49d71..5932b45774 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -1191,8 +1191,8 @@ U_BOOT_DRIVER(ldpaa_eth) = {
.bind = ldpaa_eth_bind,
.probe = ldpaa_eth_probe,
.ops = &ldpaa_eth_ops,
- .priv_auto_alloc_size = sizeof(struct ldpaa_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ldpaa_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
#else
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index b80a259ff7..2ec3039cf8 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1335,8 +1335,8 @@ U_BOOT_DRIVER(eth_macb) = {
.probe = macb_eth_probe,
.remove = macb_eth_remove,
.ops = &macb_eth_ops,
- .priv_auto_alloc_size = sizeof(struct macb_device),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct macb_device),
+ .platdata_auto = sizeof(struct eth_pdata),
};
#endif
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index f94a2d8123..7f7a865b82 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -614,6 +614,6 @@ U_BOOT_DRIVER(mcffec) = {
.probe = mcffec_probe,
.remove = mcffec_remove,
.ops = &mcffec_ops,
- .priv_auto_alloc_size = sizeof(struct fec_info_s),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct fec_info_s),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mdio-ipq4019.c b/drivers/net/mdio-ipq4019.c
index bc68e1d506..13a8856286 100644
--- a/drivers/net/mdio-ipq4019.c
+++ b/drivers/net/mdio-ipq4019.c
@@ -142,5 +142,5 @@ U_BOOT_DRIVER(ipq4019_mdio) = {
.bind = ipq4019_mdio_bind,
.probe = ipq4019_mdio_probe,
.ops = &ipq4019_mdio_ops,
- .priv_auto_alloc_size = sizeof(struct ipq4019_mdio_priv),
+ .priv_auto = sizeof(struct ipq4019_mdio_priv),
};
diff --git a/drivers/net/mdio_mux_i2creg.c b/drivers/net/mdio_mux_i2creg.c
index cc02b5ffd4..f8557dd2c4 100644
--- a/drivers/net/mdio_mux_i2creg.c
+++ b/drivers/net/mdio_mux_i2creg.c
@@ -105,5 +105,5 @@ U_BOOT_DRIVER(mdio_mux_i2creg) = {
.of_match = mdio_mux_i2creg_ids,
.probe = mdio_mux_i2creg_probe,
.ops = &mdio_mux_i2creg_ops,
- .priv_auto_alloc_size = sizeof(struct mdio_mux_i2creg_priv),
+ .priv_auto = sizeof(struct mdio_mux_i2creg_priv),
};
diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c
index 3dba4d18a1..fff6ddb2f1 100644
--- a/drivers/net/mdio_mux_sandbox.c
+++ b/drivers/net/mdio_mux_sandbox.c
@@ -93,5 +93,5 @@ U_BOOT_DRIVER(mdio_mux_sandbox) = {
.of_match = mdio_mux_sandbox_ids,
.probe = mdio_mux_sandbox_probe,
.ops = &mdio_mux_sandbox_ops,
- .priv_auto_alloc_size = sizeof(struct mdio_mux_sandbox_priv),
+ .priv_auto = sizeof(struct mdio_mux_sandbox_priv),
};
diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c
index b731f60a98..2b50ffc3ac 100644
--- a/drivers/net/mdio_sandbox.c
+++ b/drivers/net/mdio_sandbox.c
@@ -90,5 +90,5 @@ U_BOOT_DRIVER(mdio_sandbox) = {
.of_match = mdio_sandbox_ids,
.probe = mdio_sandbox_probe,
.ops = &mdio_sandbox_ops,
- .priv_auto_alloc_size = sizeof(struct mdio_sandbox_priv),
+ .priv_auto = sizeof(struct mdio_sandbox_priv),
};
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 1c9a401de8..779377b0db 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -964,6 +964,6 @@ U_BOOT_DRIVER(jr2) = {
.probe = jr2_probe,
.remove = jr2_remove,
.ops = &jr2_ops,
- .priv_auto_alloc_size = sizeof(struct jr2_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct jr2_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 1d46d0e5e1..8095f4fabd 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -737,6 +737,6 @@ U_BOOT_DRIVER(luton) = {
.probe = luton_probe,
.remove = luton_remove,
.ops = &luton_ops,
- .priv_auto_alloc_size = sizeof(struct luton_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct luton_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 2a48dc6a19..5179b82a63 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -651,6 +651,6 @@ U_BOOT_DRIVER(ocelot) = {
.probe = ocelot_probe,
.remove = ocelot_remove,
.ops = &ocelot_ops,
- .priv_auto_alloc_size = sizeof(struct ocelot_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ocelot_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index d8ee1a7698..e70f44cc10 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -604,6 +604,6 @@ U_BOOT_DRIVER(serval) = {
.probe = serval_probe,
.remove = serval_remove,
.ops = &serval_ops,
- .priv_auto_alloc_size = sizeof(struct serval_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct serval_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index 1cf2273142..8855640938 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -523,6 +523,6 @@ U_BOOT_DRIVER(servalt) = {
.probe = servalt_probe,
.remove = servalt_remove,
.ops = &servalt_ops,
- .priv_auto_alloc_size = sizeof(struct servalt_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct servalt_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 64f1c8c828..60532111ab 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -651,6 +651,6 @@ U_BOOT_DRIVER(mt7628_eth) = {
.of_match = mt7628_eth_ids,
.probe = mt7628_eth_probe,
.ops = &mt7628_eth_ops,
- .priv_auto_alloc_size = sizeof(struct mt7628_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct mt7628_eth_dev),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 5183c08e14..05fdb44380 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -1559,10 +1559,10 @@ U_BOOT_DRIVER(mtk_eth) = {
.id = UCLASS_ETH,
.of_match = mtk_eth_ids,
.ofdata_to_platdata = mtk_eth_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .platdata_auto = sizeof(struct eth_pdata),
.probe = mtk_eth_probe,
.remove = mtk_eth_remove,
.ops = &mtk_eth_ops,
- .priv_auto_alloc_size = sizeof(struct mtk_eth_priv),
+ .priv_auto = sizeof(struct mtk_eth_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 2f9464b961..0be67152ca 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -1041,7 +1041,7 @@ U_BOOT_DRIVER(mvgbe) = {
.ofdata_to_platdata = mvgbe_ofdata_to_platdata,
.probe = mvgbe_probe,
.ops = &mvgbe_ops,
- .priv_auto_alloc_size = sizeof(struct mvgbe_device),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct mvgbe_device),
+ .platdata_auto = sizeof(struct eth_pdata),
};
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index a8e93e80fc..005f28f1b2 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -232,6 +232,6 @@ U_BOOT_DRIVER(mvmdio) = {
.bind = mvmdio_bind,
.probe = mvmdio_probe,
.ops = &mvmdio_ops,
- .priv_auto_alloc_size = sizeof(struct mvmdio_priv),
+ .priv_auto = sizeof(struct mvmdio_priv),
};
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 83f99e5d8a..a90a631757 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -1830,6 +1830,6 @@ U_BOOT_DRIVER(mvneta) = {
.ofdata_to_platdata = mvneta_ofdata_to_platdata,
.probe = mvneta_probe,
.ops = &mvneta_ops,
- .priv_auto_alloc_size = sizeof(struct mvneta_port),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct mvneta_port),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index c1a78a2918..c353aa677d 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -5424,8 +5424,8 @@ static struct driver mvpp2_driver = {
.probe = mvpp2_probe,
.remove = mvpp2_remove,
.ops = &mvpp2_ops,
- .priv_auto_alloc_size = sizeof(struct mvpp2_port),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct mvpp2_port),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ACTIVE_DMA,
};
@@ -5501,5 +5501,5 @@ U_BOOT_DRIVER(mvpp2_base) = {
.id = UCLASS_MISC,
.of_match = mvpp2_ids,
.bind = mvpp2_base_bind,
- .priv_auto_alloc_size = sizeof(struct mvpp2),
+ .priv_auto = sizeof(struct mvpp2),
};
diff --git a/drivers/net/octeontx/bgx.c b/drivers/net/octeontx/bgx.c
index fbe2e2c073..2ea54be84d 100644
--- a/drivers/net/octeontx/bgx.c
+++ b/drivers/net/octeontx/bgx.c
@@ -1552,7 +1552,7 @@ U_BOOT_DRIVER(octeontx_bgx) = {
.id = UCLASS_MISC,
.probe = octeontx_bgx_probe,
.remove = octeontx_bgx_remove,
- .priv_auto_alloc_size = sizeof(struct bgx),
+ .priv_auto = sizeof(struct bgx),
.flags = DM_FLAG_OS_PREPARE,
};
diff --git a/drivers/net/octeontx/nic_main.c b/drivers/net/octeontx/nic_main.c
index 1a805f7a46..8f05d4e720 100644
--- a/drivers/net/octeontx/nic_main.c
+++ b/drivers/net/octeontx/nic_main.c
@@ -766,7 +766,7 @@ U_BOOT_DRIVER(octeontx_nic) = {
.name = "octeontx_nic",
.id = UCLASS_MISC,
.probe = octeontx_nic_probe,
- .priv_auto_alloc_size = sizeof(struct nicpf),
+ .priv_auto = sizeof(struct nicpf),
};
static struct pci_device_id octeontx_nic_supported[] = {
diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c
index e13c8b9556..8db46f84a6 100644
--- a/drivers/net/octeontx/nicvf_main.c
+++ b/drivers/net/octeontx/nicvf_main.c
@@ -568,8 +568,8 @@ U_BOOT_DRIVER(octeontx_vnic) = {
.id = UCLASS_ETH,
.probe = octeontx_vnic_probe,
.ops = &octeontx_vnic_ops,
- .priv_auto_alloc_size = sizeof(struct nicvf),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct nicvf),
+ .platdata_auto = sizeof(struct eth_pdata),
};
static struct pci_device_id octeontx_vnic_supported[] = {
diff --git a/drivers/net/octeontx2/cgx.c b/drivers/net/octeontx2/cgx.c
index ff2ebc25ce..189fe7c631 100644
--- a/drivers/net/octeontx2/cgx.c
+++ b/drivers/net/octeontx2/cgx.c
@@ -285,7 +285,7 @@ U_BOOT_DRIVER(cgx) = {
.id = UCLASS_MISC,
.probe = cgx_probe,
.remove = cgx_remove,
- .priv_auto_alloc_size = sizeof(struct cgx),
+ .priv_auto = sizeof(struct cgx),
};
static struct pci_device_id cgx_supported[] = {
diff --git a/drivers/net/octeontx2/rvu_af.c b/drivers/net/octeontx2/rvu_af.c
index 7750089a20..d2f9654861 100644
--- a/drivers/net/octeontx2/rvu_af.c
+++ b/drivers/net/octeontx2/rvu_af.c
@@ -160,7 +160,7 @@ U_BOOT_DRIVER(rvu_af) = {
.id = UCLASS_MISC,
.probe = rvu_af_probe,
.remove = rvu_af_remove,
- .priv_auto_alloc_size = sizeof(struct rvu_af),
+ .priv_auto = sizeof(struct rvu_af),
};
static struct pci_device_id rvu_af_supported[] = {
diff --git a/drivers/net/octeontx2/rvu_pf.c b/drivers/net/octeontx2/rvu_pf.c
index 201ecf2c16..b000b91374 100644
--- a/drivers/net/octeontx2/rvu_pf.c
+++ b/drivers/net/octeontx2/rvu_pf.c
@@ -104,8 +104,8 @@ U_BOOT_DRIVER(rvu_pf) = {
.probe = rvu_pf_probe,
.remove = rvu_pf_remove,
.ops = &nix_eth_ops,
- .priv_auto_alloc_size = sizeof(struct rvu_pf),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct rvu_pf),
+ .platdata_auto = sizeof(struct eth_pdata),
};
static struct pci_device_id rvu_pf_supported[] = {
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 1daafbe2b9..b413a4f249 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -499,8 +499,8 @@ U_BOOT_DRIVER(eth_pch_gbe) = {
.probe = pch_gbe_probe,
.remove = pch_gbe_remove,
.ops = &pch_gbe_ops,
- .priv_auto_alloc_size = sizeof(struct pch_gbe_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct pch_gbe_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index ad5ac6618f..9b27033e79 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -689,8 +689,8 @@ U_BOOT_DRIVER(eth_pcnet) = {
.bind = pcnet_bind,
.probe = pcnet_probe,
.ops = &pcnet_ops,
- .priv_auto_alloc_size = sizeof(struct pcnet_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct pcnet_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_UC_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index 3b4ca0393c..c571324850 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -290,6 +290,6 @@ U_BOOT_DRIVER(pfe_eth) = {
.probe = pfe_eth_probe,
.remove = pfe_eth_remove,
.ops = &pfe_eth_ops,
- .priv_auto_alloc_size = sizeof(struct pfe_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct pfe_eth_pdata)
+ .priv_auto = sizeof(struct pfe_eth_dev),
+ .platdata_auto = sizeof(struct pfe_eth_pdata)
};
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 6a2084947b..ec491256ba 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -606,6 +606,6 @@ U_BOOT_DRIVER(pic32_ethernet) = {
.probe = pic32_eth_probe,
.remove = pic32_eth_remove,
.ops = &pic32_eth_ops,
- .priv_auto_alloc_size = sizeof(struct pic32eth_dev),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct pic32eth_dev),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c
index 3482b3ff17..00e01a41ab 100644
--- a/drivers/net/qe/dm_qe_uec.c
+++ b/drivers/net/qe/dm_qe_uec.c
@@ -1162,6 +1162,6 @@ U_BOOT_DRIVER(eth_qe_uec) = {
.probe = qe_uec_probe,
.remove = qe_uec_remove,
.ops = &qe_uec_eth_ops,
- .priv_auto_alloc_size = sizeof(struct qe_uec_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct qe_uec_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c
index 02ce08edad..038b810460 100644
--- a/drivers/net/qe/dm_qe_uec_phy.c
+++ b/drivers/net/qe/dm_qe_uec_phy.c
@@ -159,5 +159,5 @@ U_BOOT_DRIVER(mvmdio) = {
.of_match = qe_uec_mdio_ids,
.probe = qe_uec_mdio_probe,
.ops = &qe_uec_mdio_ops,
- .priv_auto_alloc_size = sizeof(struct qe_uec_mdio_priv),
+ .priv_auto = sizeof(struct qe_uec_mdio_priv),
};
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 98883cd15b..d1a45ceedc 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -689,7 +689,7 @@ U_BOOT_DRIVER(eth_ravb) = {
.probe = ravb_probe,
.remove = ravb_remove,
.ops = &ravb_ops,
- .priv_auto_alloc_size = sizeof(struct ravb_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ravb_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 71f2aba4c7..934e0c25d4 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -771,8 +771,8 @@ U_BOOT_DRIVER(eth_rtl8139) = {
.bind = rtl8139_bind,
.probe = rtl8139_probe,
.ops = &rtl8139_ops,
- .priv_auto_alloc_size = sizeof(struct rtl8139_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct rtl8139_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
U_BOOT_PCI_DEVICE(eth_rtl8139, supported);
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 2e1304e44d..7512f640c2 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -1248,8 +1248,8 @@ U_BOOT_DRIVER(eth_rtl8169) = {
.of_match = rtl8169_eth_ids,
.probe = rtl8169_eth_probe,
.ops = &rtl8169_eth_ops,
- .priv_auto_alloc_size = sizeof(struct rtl8169_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct rtl8169_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
U_BOOT_PCI_DEVICE(eth_rtl8169, supported);
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 4bd94c3103..32f63416b9 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -193,6 +193,6 @@ U_BOOT_DRIVER(eth_sandbox_raw) = {
.of_match = sb_eth_raw_ids,
.ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata,
.ops = &sb_eth_raw_ops,
- .priv_auto_alloc_size = sizeof(struct eth_sandbox_raw_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct eth_sandbox_raw_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 4f7e3d4243..4d007ae022 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -446,6 +446,6 @@ U_BOOT_DRIVER(eth_sandbox) = {
.ofdata_to_platdata = sb_eth_ofdata_to_platdata,
.remove = sb_eth_remove,
.ops = &sb_eth_ops,
- .priv_auto_alloc_size = sizeof(struct eth_sandbox_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct eth_sandbox_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 4cbffb14c5..a5bd4596fd 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -957,8 +957,8 @@ U_BOOT_DRIVER(eth_sh_ether) = {
.probe = sh_ether_probe,
.remove = sh_ether_remove,
.ops = &sh_ether_ops,
- .priv_auto_alloc_size = sizeof(struct sh_ether_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct sh_ether_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 09372d7f6b..e0083ce8a3 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -639,8 +639,8 @@ U_BOOT_DRIVER(smc911x) = {
.ofdata_to_platdata = smc911x_ofdata_to_platdata,
.probe = smc911x_probe,
.ops = &smc911x_ops,
- .priv_auto_alloc_size = sizeof(struct smc911x_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct smc911x_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 0f7ada8c3e..301462009b 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -998,6 +998,6 @@ U_BOOT_DRIVER(ave) = {
.remove = ave_remove,
.ofdata_to_platdata = ave_ofdata_to_platdata,
.ops = &ave_ops,
- .priv_auto_alloc_size = sizeof(struct ave_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ave_private),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 4524604126..0fa8ba97b0 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -1004,7 +1004,7 @@ U_BOOT_DRIVER(eth_sun8i_emac) = {
.ofdata_to_platdata = sun8i_emac_eth_ofdata_to_platdata,
.probe = sun8i_emac_eth_probe,
.ops = &sun8i_emac_eth_ops,
- .priv_auto_alloc_size = sizeof(struct emac_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct sun8i_eth_pdata),
+ .priv_auto = sizeof(struct emac_eth_dev),
+ .platdata_auto = sizeof(struct sun8i_eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 8e66ce2461..dfdf3c1f7d 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -612,6 +612,6 @@ U_BOOT_DRIVER(eth_sunxi_emac) = {
.ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata,
.probe = sunxi_emac_eth_probe,
.ops = &sunxi_emac_eth_ops,
- .priv_auto_alloc_size = sizeof(struct emac_eth_dev),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct emac_eth_dev),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 971bdcdfda..c8dcefe5e3 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -791,7 +791,7 @@ U_BOOT_DRIVER(am65_cpsw_nuss_slave) = {
.of_match = am65_cpsw_nuss_ids,
.probe = am65_cpsw_probe_cpsw,
.ops = &am65_cpsw_ops,
- .priv_auto_alloc_size = sizeof(struct am65_cpsw_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct am65_cpsw_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 1c11257839..94c10a8234 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -1378,11 +1378,11 @@ U_BOOT_DRIVER(eth_cpsw) = {
#if CONFIG_IS_ENABLED(OF_CONTROL)
.of_match = cpsw_eth_ids,
.ofdata_to_platdata = cpsw_eth_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .platdata_auto = sizeof(struct eth_pdata),
#endif
.probe = cpsw_eth_probe,
.ops = &cpsw_eth_ops,
- .priv_auto_alloc_size = sizeof(struct cpsw_priv),
+ .priv_auto = sizeof(struct cpsw_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_PRE_RELOC,
};
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 56ea1fec0a..2f025018aa 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -865,5 +865,5 @@ U_BOOT_DRIVER(davinci_emac) = {
.of_match = davinci_emac_ids,
.probe = davinci_emac_probe,
.ops = &davinci_emac_ops,
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 50f0d33a83..62658bc212 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -804,8 +804,8 @@ U_BOOT_DRIVER(eth_ks2_slave) = {
.probe = ks2_eth_probe,
.remove = ks2_eth_remove,
.ops = &ks2_eth_ops,
- .priv_auto_alloc_size = sizeof(struct ks2_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ks2_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
@@ -817,7 +817,7 @@ U_BOOT_DRIVER(eth_ks2) = {
.probe = ks2_eth_probe,
.remove = ks2_eth_remove,
.ops = &ks2_eth_ops,
- .priv_auto_alloc_size = sizeof(struct ks2_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct ks2_eth_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index c436b8317d..228820484a 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -904,8 +904,8 @@ U_BOOT_DRIVER(eth_tsec) = {
.probe = tsec_probe,
.remove = tsec_remove,
.ops = &tsec_ops,
- .priv_auto_alloc_size = sizeof(struct tsec_private),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct tsec_private),
+ .platdata_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 8af3711204..194985b157 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -791,6 +791,6 @@ U_BOOT_DRIVER(axi_emac) = {
.probe = axi_emac_probe,
.remove = axi_emac_remove,
.ops = &axi_emac_ops,
- .priv_auto_alloc_size = sizeof(struct axidma_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct axidma_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 64c18bae74..03cd4cc9d9 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -635,6 +635,6 @@ U_BOOT_DRIVER(emaclite) = {
.probe = emaclite_probe,
.remove = emaclite_remove,
.ops = &emaclite_ops,
- .priv_auto_alloc_size = sizeof(struct xemaclite),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct xemaclite),
+ .platdata_auto = sizeof(struct eth_pdata),
};
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 8afec8bbfc..2df4bc2fc5 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -811,6 +811,6 @@ U_BOOT_DRIVER(zynq_gem) = {
.probe = zynq_gem_probe,
.remove = zynq_gem_remove,
.ops = &zynq_gem_ops,
- .priv_auto_alloc_size = sizeof(struct zynq_gem_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+ .priv_auto = sizeof(struct zynq_gem_priv),
+ .platdata_auto = sizeof(struct eth_pdata),
};