Merge tag 'dm-pull-21sep22' of https://source.denx.de/u-boot/custodians/u-boot-dm

[J-u-boot.git] / cmd / w1.c

diff --git a/cmd/w1.c b/cmd/w1.c
index 9c95fcf9cd140d6798559e85be908365a8c699f9..3209e65f377fb403394b72641e170004ebe36348 100644 (file)
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
@@ -20,7 +21,7 @@ static int w1_bus(void)
                printf("one wire interface not found\n");
                return CMD_RET_FAILURE;
        }
-       printf("Bus %d:\t%s", bus->seq, bus->name);
+       printf("Bus %d:\t%s", dev_seq(bus), bus->name);
        if (device_active(bus))
                printf("  (active)");
        printf("\n");
@@ -30,7 +31,7 @@ static int w1_bus(void)
             device_find_next_child(&dev)) {
                ret = device_probe(dev);
 
-               printf("\t%s (%d) uclass %s : ", dev->name, dev->seq,
+               printf("\t%s (%d) uclass %s : ", dev->name, dev_seq(dev),
                       dev->uclass->uc_drv->name);
 
                if (ret)
@@ -50,16 +51,16 @@ static int w1_read(int argc, char *const argv[])
        u8 buf[512];
 
        if (argc > 2)
-               bus_n = simple_strtoul(argv[2], NULL, 10);
+               bus_n = dectoul(argv[2], NULL);
 
        if (argc > 3)
-               dev_n = simple_strtoul(argv[3], NULL, 10);
+               dev_n = dectoul(argv[3], NULL);
 
        if (argc > 4)
-               offset = simple_strtoul(argv[4], NULL, 10);
+               offset = dectoul(argv[4], NULL);
 
        if (argc > 5)
-               len = simple_strtoul(argv[5], NULL, 10);
+               len = dectoul(argv[5], NULL);
 
        if (len > 512) {
                printf("len needs to be <= 512\n");
@@ -103,7 +104,7 @@ static int w1_read(int argc, char *const argv[])
        return CMD_RET_SUCCESS;
 }
 
-int do_w1(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+int do_w1(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        if (argc < 2)
                return CMD_RET_USAGE;