dm: treewide: Rename auto_alloc_size members to be shorter

[platform/kernel/u-boot.git] / drivers / net / designware.c

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index baac277..32b3fc8 100644 (file)
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -13,13 +13,17 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
+#include <log.h>
 #include <miiphy.h>
 #include <malloc.h>
+#include <net.h>
 #include <pci.h>
 #include <reset.h>
+#include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/compiler.h>
+#include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
@@ -508,7 +512,7 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev)
 }
 
 #ifndef CONFIG_DM_ETH
-static int dw_eth_init(struct eth_device *dev, bd_t *bis)
+static int dw_eth_init(struct eth_device *dev, struct bd_info *bis)
 {
        int ret;
 
@@ -684,7 +688,8 @@ int designware_eth_probe(struct udevice *dev)
        int i, clock_nb;
 
        priv->clock_count = 0;
-       clock_nb = dev_count_phandle_with_args(dev, "clocks", "#clock-cells");
+       clock_nb = dev_count_phandle_with_args(dev, "clocks", "#clock-cells",
+                                              0);
        if (clock_nb > 0) {
                priv->clocks = devm_kcalloc(dev, clock_nb, sizeof(struct clk),
                                            GFP_KERNEL);
@@ -868,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,
 };