From: Tom Rini <trini@konsulko.com>
Date: Fri, 15 Jul 2016 19:51:40 +0000 (-0400)
Subject: gdsys: Drop print_fpga_state function
X-Git-Tag: v2016.09-rc1~38
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=473c0abe6290aaf1471ce8129a67e3c2fbfc2597;p=u-boot

gdsys: Drop print_fpga_state function

On most platforms the print_fpga_state function is never called.  Only
on dlvision-10g do we, so in that case inline it.  Drop it from
everywhere else to avoid extra strings.

Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Reinhard Pfau <reinhard.pfau@gdsys.cc>
Acked-by: Dirk Eibach <dirk.eibach@gdsys.cc>
---

diff --git a/board/gdsys/405ep/405ep.c b/board/gdsys/405ep/405ep.c
index 426dc05c7d..35fa06a2ee 100644
--- a/board/gdsys/405ep/405ep.c
+++ b/board/gdsys/405ep/405ep.c
@@ -31,14 +31,6 @@ int get_fpga_state(unsigned dev)
 	return gd->arch.fpga_state[dev];
 }
 
-void print_fpga_state(unsigned dev)
-{
-	if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED)
-		puts("       Waiting for FPGA-DONE timed out.\n");
-	if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED)
-		puts("       FPGA reflection test failed.\n");
-}
-
 int board_early_init_f(void)
 {
 	unsigned k;
diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c
index 54c7eb3a12..e400d1945a 100644
--- a/board/gdsys/405ep/dlvision-10g.c
+++ b/board/gdsys/405ep/dlvision-10g.c
@@ -109,7 +109,10 @@ static void print_fpga_info(unsigned dev)
 	    && !((hardware_version == HWVER_101)
 		 && (fpga_state == FPGA_STATE_DONE_FAILED))) {
 		puts("not available\n");
-		print_fpga_state(dev);
+		if (fpga_state & FPGA_STATE_DONE_FAILED)
+			puts("       Waiting for FPGA-DONE timed out.\n");
+		if (fpga_state & FPGA_STATE_REFLECTION_FAILED)
+			puts("       FPGA reflection test failed.\n");
 		return;
 	}
 
diff --git a/board/gdsys/405ex/405ex.c b/board/gdsys/405ex/405ex.c
index c1a583ffbe..9e1c57f808 100644
--- a/board/gdsys/405ex/405ex.c
+++ b/board/gdsys/405ex/405ex.c
@@ -24,14 +24,6 @@ int get_fpga_state(unsigned dev)
 	return gd->arch.fpga_state[dev];
 }
 
-void print_fpga_state(unsigned dev)
-{
-	if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED)
-		puts("       Waiting for FPGA-DONE timed out.\n");
-	if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED)
-		puts("       FPGA reflection test failed.\n");
-}
-
 int board_early_init_f(void)
 {
 	u32 val;
diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c
index 4338a33126..1b8e035b4b 100644
--- a/board/gdsys/mpc8308/mpc8308.c
+++ b/board/gdsys/mpc8308/mpc8308.c
@@ -31,14 +31,6 @@ int get_fpga_state(unsigned dev)
 	return gd->arch.fpga_state[dev];
 }
 
-void print_fpga_state(unsigned dev)
-{
-	if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED)
-		puts("       Waiting for FPGA-DONE timed out.\n");
-	if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED)
-		puts("       FPGA reflection test failed.\n");
-}
-
 int board_early_init_f(void)
 {
 	unsigned k;
diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index e1b9c64626..bb8e144e04 100644
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -17,7 +17,6 @@ enum {
 };
 
 int get_fpga_state(unsigned dev);
-void print_fpga_state(unsigned dev);
 
 int fpga_set_reg(u32 fpga, u16 *reg, off_t regoff, u16 data);
 int fpga_get_reg(u32 fpga, u16 *reg, off_t regoff, u16 *data);