w1: Fix bus counting in w1_get_bus

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

diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index eb5053d6424ebf110ed6811f5e9d8358e4d31fea..90921cecf602f93637e02ba2eb75c0c0b3f9d573 100644 (file)
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -10,7 +10,6 @@
 #include <command.h>
 #include <cros_ec.h>
 #include <dm.h>
-#include <flash.h>
 #include <log.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
@@ -23,7 +22,7 @@ static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
  *
  * @param argc Number of params remaining
  * @param argv List of remaining parameters
- * @return flash region (EC_FLASH_REGION_...) or -1 on error
+ * Return: flash region (EC_FLASH_REGION_...) or -1 on error
  */
 static int cros_ec_decode_region(int argc, char *const argv[])
 {
@@ -48,7 +47,7 @@ static int cros_ec_decode_region(int argc, char *const argv[])
  * @param is_write     1 do to a write, 0 to do a read
  * @param argc         Number of arguments
  * @param argv         Arguments (2 is region, 3 is address)
- * @return 0 for ok, 1 for a usage error or -ve for ec command error
+ * Return: 0 for ok, 1 for a usage error or -ve for ec command error
  *     (negative EC_RES_...)
  */
 static int do_read_write(struct udevice *dev, int is_write, int argc,
@@ -65,11 +64,11 @@ static int do_read_write(struct udevice *dev, int is_write, int argc,
                return 1;
        if (argc < 4)
                return 1;
-       addr = simple_strtoul(argv[3], &endp, 16);
+       addr = hextoul(argv[3], &endp);
        if (*argv[3] == 0 || *endp != 0)
                return 1;
        if (argc > 4) {
-               size = simple_strtoul(argv[4], &endp, 16);
+               size = hextoul(argv[4], &endp);
                if (*argv[4] == 0 || *endp != 0)
                        return 1;
        }
@@ -501,11 +500,11 @@ static int do_cros_ec(struct cmd_tbl *cmdtp, int flag, int argc,
 
                if (argc < 3)
                        return CMD_RET_USAGE;
-               index = simple_strtoul(argv[2], &endp, 10);
+               index = dectoul(argv[2], &endp);
                if (*argv[2] == 0 || *endp != 0)
                        return CMD_RET_USAGE;
                if (argc > 3) {
-                       state = simple_strtoul(argv[3], &endp, 10);
+                       state = dectoul(argv[3], &endp);
                        if (*argv[3] == 0 || *endp != 0)
                                return CMD_RET_USAGE;
                        ret = cros_ec_set_ldo(dev, index, state);