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>

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>
Tom Rini · Jaehoon Chung
1 parent b7a6e2c9c3
Showing 1 changed file with 29 additions and 32 deletions Side-by-side Diff
drivers/power/power_core.c
@@ -47,36 +47,6 @@
 	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,8 +78,34 @@
 	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 @@
 	}
 }
  
-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,4 +217,5 @@
 	"pmic name bat state - write register\n"
 	"pmic name bat charge - write register\n"
 );
+#endif
...	...	@@ -47,36 +47,6 @@
47	47	return 0;
48	48	}
49	49
50		-static void pmic_show_info(struct pmic *p)
51		-{
52		- printf("PMIC: %s\n", p->name);
53		-}
54		-
55		-static int pmic_dump(struct pmic *p)
56		-{
57		- int i, ret;
58		- u32 val;
59		-
60		- if (!p) {
61		- puts("Wrong PMIC name!\n");
62		- return -ENODEV;
63		- }
64		-
65		- pmic_show_info(p);
66		- for (i = 0; i < p->number_of_regs; i++) {
67		- ret = pmic_reg_read(p, i, &val);
68		- if (ret)
69		- puts("PMIC: Registers dump failed\n");
70		-
71		- if (!(i % 8))
72		- printf("\n0x%02x: ", i);
73		-
74		- printf("%08x ", val);
75		- }
76		- puts("\n");
77		- return 0;
78		-}
79		-
80	50	struct pmic *pmic_alloc(void)
81	51	{
82	52	struct pmic *p;
83	53
...	...	@@ -108,8 +78,34 @@
108	78	return NULL;
109	79	}
110	80
111		-const char *power_get_interface(int interface)
	81	+#ifndef CONFIG_SPL_BUILD
	82	+static int pmic_dump(struct pmic *p)
112	83	{
	84	+ int i, ret;
	85	+ u32 val;
	86	+
	87	+ if (!p) {
	88	+ puts("Wrong PMIC name!\n");
	89	+ return -ENODEV;
	90	+ }
	91	+
	92	+ printf("PMIC: %s\n", p->name);
	93	+ for (i = 0; i < p->number_of_regs; i++) {
	94	+ ret = pmic_reg_read(p, i, &val);
	95	+ if (ret)
	96	+ puts("PMIC: Registers dump failed\n");
	97	+
	98	+ if (!(i % 8))
	99	+ printf("\n0x%02x: ", i);
	100	+
	101	+ printf("%08x ", val);
	102	+ }
	103	+ puts("\n");
	104	+ return 0;
	105	+}
	106	+
	107	+static const char *power_get_interface(int interface)
	108	+{
113	109	const char *power_interface[] = {"I2C", "SPI", "\|+\|-\|"};
114	110	return power_interface[interface];
115	111	}
...	...	@@ -125,7 +121,7 @@
125	121	}
126	122	}
127	123
128		-int do_pmic(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
	124	+static int do_pmic(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
129	125	{
130	126	u32 ret, reg, val;
131	127	char cmd, name;
...	...	@@ -221,4 +217,5 @@
221	217	"pmic name bat state - write register\n"
222	218	"pmic name bat charge - write register\n"
223	219	);
	220	+#endif