Skip to contentSkip to conversation

4xx_pci.c: add error checking, fix GCC 4.6 build warning

PATCH New Wolfgang Denk 2 participants 3 messages Oct 29, 2011 – Nov 3, 2011 PowerPC

lore
Share & tools
lore

Wolfgang Denk

author
#0 lore raw

PATCH 1/1 4xx_pci.c: add error checking, fix GCC 4.6 build warning

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 <[email protected]>
Cc Stefan Roese <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/4xx_pci.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/cpu/ppc4xx/4xx_pci.c +4 -2
index 80b0c1c..2ca355b 100644
@@ -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)) && \
Signature · 1 line
1.7.6.4
#1 lore raw

PATCH 1/1 4xx_pci.c: add error checking, fix GCC 4.6 build warning

Hi Wolfgang,

Quoted 4 lines · 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 <[email protected]>

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 at denx.de

author Applied
#2 lore raw

PATCH 1/1 4xx_pci.c: add error checking, fix GCC 4.6 build warning

In reply to Wolfgang Denk

Dear Wolfgang Denk,

Quoted 10 lines · In message <[email protected]> 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 <[email protected]>
Cc Stefan Roese <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/4xx_pci.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The computer can't tell you the emotional story. It can give you  the
exact mathematical design, but what's missing is the eyebrows.
- Frank Zappa