PPC32: adapt platform code to changes in i8259 PIC code

arch/ppc/platforms/adir_pic.c

@@ -118,7 +118,7 @@ adir_init_IRQ(void)
 }
 
 int
-adir_get_irq(void)
+adir_get_irq(struct pt_regs *regs)
 {
 	int	irq;
 
@@ -126,7 +126,7 @@ adir_get_irq(void)
 		return irq;
 
 	if (irq == ADIR_IRQ_VT82C686_INTR)
-		irq = i8259_poll();
+		irq = i8259_irq(regs);
 
 	return irq;
 }

arch/ppc/platforms/adir_setup.c

@@ -158,8 +158,6 @@ adir_halt(void)
 	adir_restart(NULL);
 }
 
-extern unsigned int boot_mem_size;
-
 static unsigned long __init
 adir_find_end_of_memory(void)
 {

arch/ppc/platforms/k2_setup.c

@@ -320,12 +320,6 @@ k2_init_irq(void)
 	i8259_init(NULL);
 }
 
-static int
-k2_get_irq(struct pt_regs *regs)
-{
-	return i8259_poll();
-}
-
 void __init platform_init(unsigned long r3, unsigned long r4,
 		unsigned long r5, unsigned long r6, unsigned long r7)
 {
@@ -338,7 +332,7 @@ void __init platform_init(unsigned long r3, unsigned long r4,
 	ppc_md.setup_arch = k2_setup_arch;
 	ppc_md.show_cpuinfo = k2_show_cpuinfo;
 	ppc_md.init_IRQ = k2_init_irq;
-	ppc_md.get_irq = k2_get_irq;
+	ppc_md.get_irq = i8259_irq;
 
 	ppc_md.find_end_of_memory = k2_find_end_of_memory;
 	ppc_md.setup_io_mappings = k2_map_io;

arch/ppc/platforms/menf1_setup.c

@@ -150,11 +150,6 @@ menf1_init_IRQ(void)
 	i8259_init(NULL);
 }
 
-static int menf1_get_irq(struct pt_regs *regs)
-{
-	return i8259_poll();
-}
-
 /*
  * Set BAT 3 to map 0xF0000000.
  */
@@ -259,7 +254,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	ppc_md.setup_arch	= menf1_setup_arch;
 	ppc_md.show_cpuinfo	= menf1_show_cpuinfo;
 	ppc_md.init_IRQ		= menf1_init_IRQ;
-	ppc_md.get_irq		= menf1_get_irq;
+	ppc_md.get_irq		= i8259_irq;
 
 	ppc_md.find_end_of_memory = menf1_find_end_of_memory;
 	ppc_md.setup_io_mappings = menf1_map_io;

arch/ppc/platforms/powerpmc250.c

@@ -193,12 +193,6 @@ powerpmc250_power_off(void)
 	powerpmc250_halt();
 }
 
-/* Resolves the open_pic.c build without including i8259.c */
-int i8259_poll(void)
-{
-	return 0;
-}
-
 static void __init
 powerpmc250_init_IRQ(void)
 {

arch/ppc/platforms/pplus_setup.c

@@ -224,12 +224,6 @@ pplus_irq_cannonicalize(u_int irq)
 	}
 }
 
-static int
-pplus_get_irq(struct pt_regs *regs)
-{
-	return i8259_poll();
-}		
-
 static void __init
 pplus_init_IRQ(void)
 {
@@ -484,7 +478,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	ppc_md.irq_cannonicalize = pplus_irq_cannonicalize;
 	ppc_md.init_IRQ       = pplus_init_IRQ;
 	/* this gets changed later on if we have an OpenPIC -- Cort */
-	ppc_md.get_irq        = pplus_get_irq;
+	ppc_md.get_irq        = i8259_irq;
 	ppc_md.init           = pplus_init2;
 
 	ppc_md.restart        = pplus_restart;

arch/ppc/platforms/prpmc750_setup.c

@@ -202,12 +202,6 @@ prpmc750_power_off(void)
 	prpmc750_halt();
 }
 
-/* Resolves the open_pic.c build without including i8259.c */
-int i8259_poll(void)
-{
-	return 0;
-}
-
 static void __init
 prpmc750_init_IRQ(void)
 {

arch/ppc/platforms/prpmc800_setup.c

@@ -196,12 +196,6 @@ prpmc800_power_off(void)
 	prpmc800_halt();
 }
 
-/* Resolves the open_pic.c build without including i8259.c */
-int i8259_poll()
-{
-	return 0;
-}
-
 static void __init
 prpmc800_init_IRQ(void)
 {

arch/ppc/platforms/sandpoint_setup.c

@@ -336,7 +336,7 @@ sandpoint_get_irq(struct pt_regs *regs)
 	irq = openpic_irq();
 
 	if (irq == SANDPOINT_SIO_IRQ) {
-		cascade_irq = i8259_poll();
+		cascade_irq = i8259_irq(regs);
 
 		if (cascade_irq != -1) {
 			irq = cascade_irq;