Skip to contentSkip to conversation

arm/integrator: Remove unneccessary CONFIG_PCI check.

PATCH New Detlev Zundel 2 participants 2 messages Mar 31, 2010 – Apr 5, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/integrator: Remove unneccessary CONFIG_PCI check.

pci_eth_init() is already conditional to CONFIG_PCI so not every caller needs to have conditionals.

This is the only place in the current code base where such a check is still at the calling site.

CC Ben Warren <[email protected]>
CC Peter Pearse <[email protected]>
---
 board/armltd/integrator/integrator.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
board/armltd/integrator/integrator.c +0 -2
index 518944e..9bb56b5 100644
@@ -132,9 +132,7 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_SMC91111
 	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
 #endif
-#ifdef CONFIG_PCI
 	rc += pci_eth_init(bis);
-#endif
 	return rc;
 }
 #endif
Signature · 1 line
1.6.2.5
Applied
#1 lore raw

PATCH 1/1 arm/integrator: Remove unneccessary CONFIG_PCI check.

Quoted 5 lines · Detlev Zundel

pci_eth_init() is already conditional to CONFIG_PCI so not every caller needs to have conditionals.

This is the only place in the current code base where such a check is still at the calling site.

Applied to arm/master
Thanks
Tom

Quoted 22 lines
CC Ben Warren <[email protected]>
CC Peter Pearse <[email protected]>
---
 board/armltd/integrator/integrator.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
board/armltd/integrator/integrator.c +0 -2
index 518944e..9bb56b5 100644
@@ -132,9 +132,7 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_SMC91111
 	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
 #endif
-#ifdef CONFIG_PCI
 	rc += pci_eth_init(bis);
-#endif
 	return rc;
 }
 #endif