From patchwork Wed Aug 31 10:57:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 112530 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9E1E6B6F7B for ; Wed, 31 Aug 2011 20:58:37 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 900AF280E8; Wed, 31 Aug 2011 12:58:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IkRwLXCrNUzs; Wed, 31 Aug 2011 12:58:31 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B91D280B8; Wed, 31 Aug 2011 12:58:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8F58C280AE for ; Wed, 31 Aug 2011 12:58:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z7COnwsxJVMN for ; Wed, 31 Aug 2011 12:58:05 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id C202528096 for ; Wed, 31 Aug 2011 12:58:03 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id r4so611525bka.3 for ; Wed, 31 Aug 2011 03:58:03 -0700 (PDT) Received: by 10.204.143.68 with SMTP id t4mr171030bku.129.1314788283532; Wed, 31 Aug 2011 03:58:03 -0700 (PDT) Received: from localhost ([178.23.216.97]) by mx.google.com with ESMTPS id a3sm327727bkd.2.2011.08.31.03.58.02 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Aug 2011 03:58:02 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Wed, 31 Aug 2011 12:57:51 +0200 Message-Id: <1314788276-26107-4-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <1314788276-26107-3-git-send-email-monstr@monstr.eu> References: <1314788276-26107-1-git-send-email-monstr@monstr.eu> <1314788276-26107-2-git-send-email-monstr@monstr.eu> <1314788276-26107-3-git-send-email-monstr@monstr.eu> Subject: [U-Boot] [PATCH 3/8] microblaze: Fix no return statement from microblaze-generic board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- .../xilinx/microblaze-generic/microblaze-generic.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) 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; }