cmd: Drop use of old sequence numbers in commands
authorSimon Glass <sjg@chromium.org>
Thu, 17 Dec 2020 04:20:31 +0000 (21:20 -0700)
committerSimon Glass <sjg@chromium.org>
Sat, 19 Dec 2020 03:32:21 +0000 (20:32 -0700)
Several commands use sequence numbers. Update them to use the new ones.

Signed-off-by: Simon Glass <sjg@chromium.org>
cmd/axi.c
cmd/i2c.c
cmd/osd.c
drivers/core/dump.c

index f7e206c..c72197e 100644 (file)
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -33,9 +33,9 @@ static void show_bus(struct udevice *bus)
 {
        struct udevice *dev;
 
-       printf("Bus %d:\t%s", bus->req_seq, bus->name);
+       printf("Bus %d:\t%s", dev_seq(bus), bus->name);
        if (device_active(bus))
-               printf("  (active %d)", dev_seq(bus));
+               printf("  (active)");
        printf("\n");
        for (device_find_first_child(bus, &dev);
             dev;
index ac38455..aae2dd4 100644 (file)
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1700,7 +1700,7 @@ static void show_bus(struct udevice *bus)
 {
        struct udevice *dev;
 
-       printf("Bus %d:\t%s", bus->req_seq, bus->name);
+       printf("Bus %d:\t%s", dev_seq(bus), bus->name);
        if (device_active(bus))
                printf("  (active %d)", dev_seq(bus));
        printf("\n");
index 9b8fd5c..703d640 100644 (file)
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -75,9 +75,9 @@ static int osd_get_osd_cur(struct udevice **osdp)
  */
 static void show_osd(struct udevice *osd)
 {
-       printf("OSD %d:\t%s", osd->req_seq, osd->name);
+       printf("OSD %d:\t%s", dev_seq(osd), osd->name);
        if (device_active(osd))
-               printf("  (active %d)", dev_seq(osd));
+               printf("  (active)");
        printf("\n");
 }
 
index 33cfee6..2012547 100644 (file)
@@ -67,8 +67,8 @@ static void dm_display_line(struct udevice *dev, int index)
        printf("%-3i %c %s @ %08lx", index,
               dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
               dev->name, (ulong)map_to_sysmem(dev));
-       if (dev_seq(dev) != -1 || dev->req_seq != -1)
-               printf(", seq %d, (req %d)", dev_seq(dev), dev->req_seq);
+       if (dev->sqq != -1)
+               printf(", seq %d", dev_seq(dev));
        puts("\n");
 }