diff mbox

[U-Boot,3/8] microblaze: Fix no return statement from microblaze-generic board

Message ID 1314788276-26107-4-git-send-email-monstr@monstr.eu
State Superseded
Delegated to: Michal Simek
Headers show

Commit Message

Michal Simek Aug. 31, 2011, 10:57 a.m. UTC 
Remove compilation warning for systems without network support.

Warning log:
microblaze-generic.c: In function 'board_eth_init':
microblaze-generic.c:82: warning: no return statement in function returning non-void

Signed-off-by: Michal Simek <monstr@monstr.eu>
---
 .../xilinx/microblaze-generic/microblaze-generic.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 1a6e568..9b2952f 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -71,11 +71,7 @@  int fsl_init2 (void) {
 
 int board_eth_init(bd_t *bis)
 {
-	/*
-	 * This board either has PCI NICs or uses the CPU's TSECs
-	 * pci_eth_init() will return 0 if no NICs found, so in that case
-	 * returning -1 will force cpu_eth_init() to be called.
-	 */
+	int ret = 0;
 #ifdef CONFIG_XILINX_EMACLITE
 	u32 txpp = 0;
 	u32 rxpp = 0;
@@ -85,7 +81,8 @@  int board_eth_init(bd_t *bis)
 # ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
 	rxpp = 1;
 # endif
-	return xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR,
+	ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR,
 			txpp, rxpp);
 #endif
+	return ret;
 }