Patchwork [U-Boot] 4xx_pci.c: add error checking, fix GCC 4.6 build warning

login
register
mail settings
Submitter Wolfgang Denk
Date Oct. 29, 2011, 7:38 p.m.
Message ID <1319917111-14323-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/122566/
State Accepted
Commit e5d5ed4b20821cbab128802daad16c386400d6de
Headers show

Comments

Wolfgang Denk - Oct. 29, 2011, 7:38 p.m.
Fix:
4xx_pci.c: In function 'pci_init_board':
4xx_pci.c:855:6: warning: variable 'busno' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
---
 arch/powerpc/cpu/ppc4xx/4xx_pci.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Stefan Roese - Oct. 31, 2011, 9:32 a.m.
Hi Wolfgang,

On Saturday 29 October 2011 21:38:31 Wolfgang Denk wrote:
> Fix:
> 4xx_pci.c: In function 'pci_init_board':
> 4xx_pci.c:855:6: warning: variable 'busno' set but not used
> [-Wunused-but-set-variable]

Thanks.

Acked-by: Stefan Roese <sr@denx.de>

Best regards,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
Wolfgang Denk - Nov. 3, 2011, 7:40 p.m.
Dear Wolfgang Denk,

In message <1319917111-14323-1-git-send-email-wd@denx.de> you wrote:
> Fix:
> 4xx_pci.c: In function 'pci_init_board':
> 4xx_pci.c:855:6: warning: variable 'busno' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  arch/powerpc/cpu/ppc4xx/4xx_pci.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/powerpc/cpu/ppc4xx/4xx_pci.c b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
index 80b0c1c..2ca355b 100644
--- a/arch/powerpc/cpu/ppc4xx/4xx_pci.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
@@ -707,7 +707,7 @@  void pci_master_init(struct pci_controller *hose)
 #endif /* CONFIG_SYS_PCI_MASTER_INIT */
 
 #if defined(CONFIG_SYS_PCI_MASTER_INIT) || defined(CONFIG_SYS_PCI_TARGET_INIT)
-int pci_440_init (struct pci_controller *hose)
+static int pci_440_init (struct pci_controller *hose)
 {
 	int reg_num = 0;
 
@@ -859,7 +859,9 @@  void pci_init_board(void)
 	 * is selected.
 	 */
 #if defined(CONFIG_SYS_PCI_MASTER_INIT) || defined(CONFIG_SYS_PCI_TARGET_INIT)
-	busno = pci_440_init (&ppc440_hose);
+	busno = pci_440_init(&ppc440_hose);
+	if (busno < 0)
+		return;
 #endif
 #if (defined(CONFIG_440SPE) || \
     defined(CONFIG_460EX) || defined(CONFIG_460GT)) && \