]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
net: Update to use new sequence numbers
authorSimon Glass <sjg@chromium.org>
Thu, 17 Dec 2020 04:20:16 +0000 (21:20 -0700)
committerSimon Glass <sjg@chromium.org>
Sat, 19 Dec 2020 03:32:21 +0000 (20:32 -0700)
Checking for seq == -1 is effectively checking that the device is
activated. The new sequence numbers are never -1 for a bound device, so
update the check.

Also drop the note about valid sequence numbers so it is accurate with the
new approach.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/net/dwc_eth_qos.c
net/eth-uclass.c

index 1569c5b4ea3e55c5ca2e05439785a014336a3d5b..45a1648ad507faf9444b09423ad26bd6df7991b6 100644 (file)
@@ -1155,7 +1155,7 @@ static int eqos_read_rom_hwaddr(struct udevice *dev)
        struct eth_pdata *pdata = dev_get_plat(dev);
 
 #ifdef CONFIG_ARCH_IMX8M
-       imx_get_mac_from_fuse(dev->req_seq, pdata->enetaddr);
+       imx_get_mac_from_fuse(dev_seq(dev), pdata->enetaddr);
 #endif
        return !is_valid_ethaddr(pdata->enetaddr);
 }
index fad9770e74fb5b73835894dca9cd7f1a84832133..4eee0113eb158cd01f13174eb564da28420a8a81 100644 (file)
@@ -126,9 +126,6 @@ struct udevice *eth_get_dev_by_name(const char *devname)
 
        uclass_foreach_dev(it, uc) {
                /*
-                * We need the seq to be valid, so try to probe it.
-                * If the probe fails, the seq will not match since it will be
-                * -1 instead of what we are looking for.
                 * We don't care about errors from probe here. Either they won't
                 * match an alias or it will match a literal name and we'll pick
                 * up the error when we try to probe again in eth_set_dev().
@@ -434,7 +431,7 @@ int eth_initialize(void)
 
                bootstage_mark(BOOTSTAGE_ID_NET_ETH_INIT);
                do {
-                       if (dev_seq(dev) != -1) {
+                       if (device_active(dev)) {
                                if (num_devices)
                                        printf(", ");
 
@@ -446,7 +443,7 @@ int eth_initialize(void)
 
                        eth_write_hwaddr(dev);
 
-                       if (dev_seq(dev) != -1)
+                       if (device_active(dev))
                                num_devices++;
                        uclass_next_device_check(&dev);
                } while (dev);