power: Rearrange code to guard power command with CONFIG_SPL_BUILD guard

In order to discard this code when unused in SPL we need to guard the
command with a check for CONFIG_SPL_BUILD and we rearrange the code
slightly to make this cleaner.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index b72286d42961264bb12171e30bc6593eb446b466..46840a33e02fd4c099abd4819273f24207ff6c52 100644 (file)
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -47,36 +47,6 @@ int pmic_set_output(struct pmic *p, u32 reg, int out, int on)
        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 -ENODEV;
-       }
-
-       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;
@@ -221,3 +217,4 @@ U_BOOT_CMD(
        "pmic name bat state - write register\n"
        "pmic name bat charge - write register\n"
 );
+#endif