From 18244cfbc34e6bb3793977739b359a248899f42a Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Sun, 4 Nov 2007 13:22:46 +1100 Subject: [PATCH] [POWERPC] iSeries_init_IRQ non-PCI tidy ppc_md.init_IRQ is not called if it is NULL, so we don't need an empty routine in the non PCI case. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras --- arch/powerpc/platforms/iseries/irq.h | 4 ++++ arch/powerpc/platforms/iseries/setup.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/iseries/irq.h b/arch/powerpc/platforms/iseries/irq.h index 69f1b437fc7b..a1c236074034 100644 --- a/arch/powerpc/platforms/iseries/irq.h +++ b/arch/powerpc/platforms/iseries/irq.h @@ -1,9 +1,13 @@ #ifndef _ISERIES_IRQ_H #define _ISERIES_IRQ_H +#ifdef CONFIG_PCI extern void iSeries_init_IRQ(void); extern int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, u32); extern void iSeries_activate_IRQs(void); +#else +#define iSeries_init_IRQ NULL +#endif extern unsigned int iSeries_get_irq(void); #endif /* _ISERIES_IRQ_H */ diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 37ae07ee54a9..0877a8834110 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -617,10 +617,6 @@ static void iseries_dedicated_idle(void) } } -#ifndef CONFIG_PCI -void __init iSeries_init_IRQ(void) { } -#endif - static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size, unsigned long flags) { -- GitLab