summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2011-04-17 13:49:55 +0200
committerDavid S. Miller <davem@davemloft.net>2011-04-19 22:11:39 -0700
commit06010fb588700e7fcb29e720c56884e3de5fd327 (patch)
tree832891d6ffcf8f2f762094c37b5e88a86bbdd007 /arch/sparc/kernel
parentdb1cdd146a0814b6f312fe1a7fa1ab87ac177b2a (diff)
downloadlinux-stable-06010fb588700e7fcb29e720c56884e3de5fd327.tar.gz
linux-stable-06010fb588700e7fcb29e720c56884e3de5fd327.tar.bz2
linux-stable-06010fb588700e7fcb29e720c56884e3de5fd327.zip
sparc32: cleanup code for pci init
Move the ifdeffery to a header file to make the logic more obvious where we decide between PCI or SBUS init Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/irq_32.c9
-rw-r--r--arch/sparc/kernel/time_32.c10
2 files changed, 6 insertions, 13 deletions
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index 7c93df4099cb..b2dbb4ba8608 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -607,14 +607,11 @@ void __init init_IRQ(void)
break;
case sun4m:
-#ifdef CONFIG_PCI
pcic_probe();
- if (pcic_present()) {
+ if (pcic_present())
sun4m_pci_init_IRQ();
- break;
- }
-#endif
- sun4m_init_IRQ();
+ else
+ sun4m_init_IRQ();
break;
case sun4d:
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index 4e236391b635..b61840300101 100644
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -228,14 +228,10 @@ static void __init sbus_time_init(void)
void __init time_init(void)
{
-#ifdef CONFIG_PCI
- extern void pci_time_init(void);
- if (pcic_present()) {
+ if (pcic_present())
pci_time_init();
- return;
- }
-#endif
- sbus_time_init();
+ else
+ sbus_time_init();
}