Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06010fb5 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

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: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db1cdd14

arch/sparc/include/asm/pcic.h

+9 −3
Original line number Diff line number Diff line
@@ -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. */

arch/sparc/kernel/irq_32.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

arch/sparc/kernel/time_32.c

+3 −7
Original line number Diff line number Diff line
@@ -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();

}