[PATCH v2 24/26] cmd: Drop use of old sequence numbers in commands

Simon Glass sjg at chromium.org
Fri Dec 11 02:31:49 CET 2020


Several commands use sequence numbers. Update them to use the new ones.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 cmd/axi.c           | 4 ++--
 cmd/i2c.c           | 2 +-
 cmd/osd.c           | 4 ++--
 drivers/core/dump.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/axi.c b/cmd/axi.c
index f7e206c04a7..c72197ee82b 100644
--- 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;
diff --git a/cmd/i2c.c b/cmd/i2c.c
index f97d437af47..c5cace6a9c6 100644
--- 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");
diff --git a/cmd/osd.c b/cmd/osd.c
index 9b8fd5c921e..703d640b04e 100644
--- 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");
 }
 
diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index 9f440366734..83456d7e6e8 100644
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -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");
 }
 
-- 
2.29.2.576.ga3fc446d84-goog



More information about the U-Boot mailing list