dm: treewide: Rename 'platdata' variables to just 'plat'

[platform/kernel/u-boot.git] / net / eth-uclass.c

diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 0d9b75a..ca083b4 100644 (file)
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -75,6 +75,9 @@ struct udevice *eth_get_dev(void)
        struct eth_uclass_priv *uc_priv;
 
        uc_priv = eth_get_uclass_priv();
+       if (!uc_priv)
+               return NULL;
+
        if (!uc_priv->current)
                eth_errno = uclass_first_device(UCLASS_ETH,
                                    &uc_priv->current);
@@ -146,7 +149,7 @@ unsigned char *eth_get_ethaddr(void)
        struct eth_pdata *pdata;
 
        if (eth_get_dev()) {
-               pdata = eth_get_dev()->platdata;
+               pdata = eth_get_dev()->plat;
                return pdata->enetaddr;
        }
 
@@ -200,7 +203,7 @@ static int eth_write_hwaddr(struct udevice *dev)
 
        /* seq is valid since the device is active */
        if (eth_get_ops(dev)->write_hwaddr && !eth_mac_skip(dev->seq)) {
-               pdata = dev->platdata;
+               pdata = dev->plat;
                if (!is_valid_ethaddr(pdata->enetaddr)) {
                        printf("\nError: %s address %pM illegal value\n",
                               dev->name, pdata->enetaddr);
@@ -234,7 +237,7 @@ static int on_ethaddr(const char *name, const char *value, enum env_op op,
 
        retval = uclass_find_device_by_seq(UCLASS_ETH, index, false, &dev);
        if (!retval) {
-               struct eth_pdata *pdata = dev->platdata;
+               struct eth_pdata *pdata = dev->plat;
                switch (op) {
                case env_op_create:
                case env_op_overwrite:
@@ -273,7 +276,7 @@ int eth_init(void)
        if (!current) {
                current = eth_get_dev();
                if (!current) {
-                       printf("No ethernet found.\n");
+                       log_err("No ethernet found.\n");
                        return -ENODEV;
                }
        }
@@ -380,7 +383,7 @@ int eth_rx(void)
 
        /* Process up to 32 packets at one time */
        flags = ETH_RECV_CHECK_DEVICE;
-       for (i = 0; i < 32; i++) {
+       for (i = 0; i < ETH_PACKETS_BATCH_RECV; i++) {
                ret = eth_get_ops(current)->recv(current, flags, &packet);
                flags = 0;
                if (ret > 0)
@@ -414,7 +417,7 @@ int eth_initialize(void)
         */
        uclass_first_device_check(UCLASS_ETH, &dev);
        if (!dev) {
-               printf("No ethernet found.\n");
+               log_err("No ethernet found.\n");
                bootstage_error(BOOTSTAGE_ID_NET_ETH_START);
        } else {
                char *ethprime = env_get("ethprime");
@@ -449,7 +452,7 @@ int eth_initialize(void)
                } while (dev);
 
                if (!num_devices)
-                       printf("No ethernet found.\n");
+                       log_err("No ethernet found.\n");
                putc('\n');
        }
 
@@ -503,7 +506,7 @@ static bool eth_dev_get_mac_address(struct udevice *dev, u8 mac[ARP_HLEN])
 static int eth_post_probe(struct udevice *dev)
 {
        struct eth_device_priv *priv = dev->uclass_priv;
-       struct eth_pdata *pdata = dev->platdata;
+       struct eth_pdata *pdata = dev->plat;
        unsigned char env_enetaddr[ARP_HLEN];
        char *source = "DT";
 
@@ -580,7 +583,7 @@ static int eth_post_probe(struct udevice *dev)
 
 static int eth_pre_remove(struct udevice *dev)
 {
-       struct eth_pdata *pdata = dev->platdata;
+       struct eth_pdata *pdata = dev->plat;
 
        eth_get_ops(dev)->stop(dev);
 
@@ -597,7 +600,7 @@ UCLASS_DRIVER(eth) = {
        .pre_unbind     = eth_pre_unbind,
        .post_probe     = eth_post_probe,
        .pre_remove     = eth_pre_remove,
-       .priv_auto_alloc_size = sizeof(struct eth_uclass_priv),
-       .per_device_auto_alloc_size = sizeof(struct eth_device_priv),
+       .priv_auto      = sizeof(struct eth_uclass_priv),
+       .per_device_auto        = sizeof(struct eth_device_priv),
        .flags          = DM_UC_FLAG_SEQ_ALIAS,
 };