lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc32: cleanup code for pci init

Browse Source 
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>
This commit is contained in:
Sam Ravnborg
2011-04-17 13:49:55 +02:00
committed by David S. Miller
parent db1cdd146a
commit 06010fb588
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/sparc/include/asm/pcic.h
View File

@@ -29,11 +29,17 @@ struct linux_pcic {
int pcic_imdim;
};
extern int pcic_probe(void);
/* Erm... MJ redefined pcibios_present() so that it does not work early. */
#ifdef CONFIG_PCI
extern int pcic_present(void);
extern int pcic_probe(void);
extern void pci_time_init(void);
extern void sun4m_pci_init_IRQ(void);
#else
static inline int pcic_present(void) { return 0; }
static inline int pcic_probe(void) { return 0; }
static inline void pci_time_init(void) {}
static inline void sun4m_pci_init_IRQ(void) {}
#endif
#endif
/* Size of PCI I/O space which we relocate. */

7
arch/sparc/kernel/irq_32.c
View File

@@ -607,13 +607,10 @@ 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
else
sun4m_init_IRQ();
break;

8
arch/sparc/kernel/time_32.c
View File

@@ -228,13 +228,9 @@ 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
else
sbus_time_init();
}