ppc64: remove xics_isa_init

arch/ppc64/kernel/pSeries_pci.c

@@ -40,7 +40,6 @@
 #include <asm/naca.h>
 #include <asm/pci_dma.h>
 
-#include "xics.h"
 #include "open_pic.h"
 #include "pci.h"
 
@@ -402,7 +401,7 @@ alloc_phb(struct device_node *dev, char *model, unsigned int addr_size_words)
 	* Python
 	***************************************************************/
 	if (strstr(model, "Python")) {
-		unsigned long chip_regs;
+		void *chip_regs;
 		volatile u32 *tmp, i;
 
 		PPCDBG(PPCDBG_PHBINIT, "\tCreate python\n");
@@ -608,10 +607,6 @@ pSeries_pcibios_fixup(void)
 		pci_read_irq_line(dev);
 		PPCDBGCALL(PPCDBG_PHBINIT, dumpPci_Dev(dev) );
 	}
-
-	if (naca->interrupt_controller == IC_PPC_XIC) {
-		xics_isa_init(); 
-	}
 }
 
 /*********************************************************************** 

arch/ppc64/kernel/xics.c

@@ -430,15 +430,6 @@ xics_init_IRQ( void )
 	ppc64_boot_msg(0x21, "XICS Done");
 }
 
-void xics_isa_init(void)
-{
-	return;
-	if (request_irq(xics_irq_8259_cascade + XICS_IRQ_OFFSET, no_action,
-			0, "8259 cascade", 0))
-		printk(KERN_ERR "xics_init_IRQ: couldn't get 8259 cascade\n");
-	i8259_init();
-}
-
 void xics_set_affinity(unsigned int virq, unsigned long cpumask)
 {
         irq_desc_t *desc = irq_desc + virq;

arch/ppc64/kernel/xics.h

 /* 
- * arch/ppc/kernel/xics.h
+ * arch/ppc64/kernel/xics.h
  *
  * Copyright 2000 IBM Corporation.
  *
@@ -9,14 +9,10 @@
  *  2 of the License, or (at your option) any later version.
  */
 
-#ifndef _PPC_KERNEL_XICS_H
-#define _PPC_KERNEL_XICS_H
-
-extern struct hw_interrupt_type xics_pic;
-extern struct hw_interrupt_type xics_8259_pic;
+#ifndef _PPC64_KERNEL_XICS_H
+#define _PPC64_KERNEL_XICS_H
 
 void xics_init_IRQ(void);
 int xics_get_irq(struct pt_regs *);
-void xics_isa_init(void);
 
-#endif /* _PPC_KERNEL_XICS_H */
+#endif /* _PPC64_KERNEL_XICS_H */