power: Rearrange code to guard power command with CONFIG_SPL_BUILD guard

[u-boot] / drivers / power / power_core.c

diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index d79971ba884154a469d602d806420e866509b08e..46840a33e02fd4c099abd4819273f24207ff6c52 100644 (file)
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -23,7 +23,7 @@ int check_reg(struct pmic *p, u32 reg)
        if (reg >= p->number_of_regs) {
                printf("<reg num> = %d is invalid. Should be less than %d\n",
                       reg, p->number_of_regs);
-               return -1;
+               return -EINVAL;
        }
 
        return 0;
@@ -34,7 +34,7 @@ int pmic_set_output(struct pmic *p, u32 reg, int out, int on)
        u32 val;
 
        if (pmic_reg_read(p, reg, &val))
-               return -1;
+               return -ENOTSUPP;
 
        if (on)
                val |= out;
@@ -42,41 +42,11 @@ int pmic_set_output(struct pmic *p, u32 reg, int out, int on)
                val &= ~out;
 
        if (pmic_reg_write(p, reg, val))
-               return -1;
+               return -ENOTSUPP;
 
        return 0;
 }
 
-static void pmic_show_info(struct pmic *p)
-{
-       printf("PMIC: %s\n", p->name);
-}
-
-static int pmic_dump(struct pmic *p)
-{
-       int i, ret;
-       u32 val;
-
-       if (!p) {
-               puts("Wrong PMIC name!\n");
-               return -1;
-       }
-
-       pmic_show_info(p);
-       for (i = 0; i < p->number_of_regs; i++) {
-               ret = pmic_reg_read(p, i, &val);
-               if (ret)
-                       puts("PMIC: Registers dump failed\n");
-
-               if (!(i % 8))
-                       printf("\n0x%02x: ", i);
-
-               printf("%08x ", val);
-       }
-       puts("\n");
-       return 0;
-}
-
 struct pmic *pmic_alloc(void)
 {
        struct pmic *p;
@@ -108,7 +78,33 @@ struct pmic *pmic_get(const char *s)
        return NULL;
 }
 
-const char *power_get_interface(int interface)
+#ifndef CONFIG_SPL_BUILD
+static int pmic_dump(struct pmic *p)
+{
+       int i, ret;
+       u32 val;
+
+       if (!p) {
+               puts("Wrong PMIC name!\n");
+               return -ENODEV;
+       }
+
+       printf("PMIC: %s\n", p->name);
+       for (i = 0; i < p->number_of_regs; i++) {
+               ret = pmic_reg_read(p, i, &val);
+               if (ret)
+                       puts("PMIC: Registers dump failed\n");
+
+               if (!(i % 8))
+                       printf("\n0x%02x: ", i);
+
+               printf("%08x ", val);
+       }
+       puts("\n");
+       return 0;
+}
+
+static const char *power_get_interface(int interface)
 {
        const char *power_interface[] = {"I2C", "SPI", "|+|-|"};
        return power_interface[interface];
@@ -125,7 +121,7 @@ static void pmic_list_names(void)
        }
 }
 
-int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        u32 ret, reg, val;
        char *cmd, *name;
@@ -140,6 +136,9 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return CMD_RET_SUCCESS;
        }
 
+       if (argc < 3)
+               return CMD_RET_USAGE;
+
        name = argv[1];
        cmd = argv[2];
 
@@ -184,18 +183,21 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                if (argc < 4)
                        return CMD_RET_USAGE;
 
+               if (!p->pbat) {
+                       printf("%s is not a battery\n", p->name);
+                       return CMD_RET_FAILURE;
+               }
+
                if (strcmp(argv[3], "state") == 0)
                        p->fg->fg_battery_check(p->pbat->fg, p);
 
                if (strcmp(argv[3], "charge") == 0) {
-                       if (p->pbat) {
-                               printf("BAT: %s charging (ctrl+c to break)\n",
-                                      p->name);
-                               if (p->low_power_mode)
-                                       p->low_power_mode();
-                               if (p->pbat->battery_charge)
-                                       p->pbat->battery_charge(p);
-                       }
+                       printf("BAT: %s charging (ctrl+c to break)\n",
+                              p->name);
+                       if (p->low_power_mode)
+                               p->low_power_mode();
+                       if (p->pbat->battery_charge)
+                               p->pbat->battery_charge(p);
                }
 
                return CMD_RET_SUCCESS;
@@ -215,3 +217,4 @@ U_BOOT_CMD(
        "pmic name bat state - write register\n"
        "pmic name bat charge - write register\n"
 );
+#endif