arch/i386/kernel/: remove remaining pc98 code
PATCH 1/1 arch/i386/kernel/: remove remaining pc98 code
This patch removes the remaining code of the removed pc98 support.
Signed-off-by Adrian Bunk <[email protected]>
---
arch/i386/kernel/io_apic.c | 23 ++--------------------- arch/i386/kernel/mpparse.c | 2 -- include/asm-i386/mpspec_def.h | 2 -- 3 files changed, 2 insertions(+), 25 deletions(-)
include/asm-i386/mpspec_def.h renamed from include/asm-i386/mpspec_def.h.old +0 -2
@@ -97,7 +97,6 @@ struct mpc_config_bus#define BUSTYPE_TC "TC"#define BUSTYPE_VME "VME"#define BUSTYPE_XPRESS "XPRESS" -#define BUSTYPE_NEC98 "NEC98"struct mpc_config_ioapic {
@@ -182,7 +181,6 @@ enum mp_bustype {MP_BUS_EISA ,MP_BUS_PCI , MP_BUS_MCA, -MP_BUS_NEC98 };#endif
arch/i386/kernel/mpparse.c renamed from arch/i386/kernel/mpparse.c.old +0 -2
@@ -249,8 +249,6 @@ static void __init MP_bus_info (struct m mp_current_pci_id++; }else if (strncmp (str,BUSTYPE_MCA ,sizeof (BUSTYPE_MCA )-1 ) ==0 ) { mp_bus_id_to_type[m->mpc_busid] =MP_BUS_MCA ; - }else if (strncmp (str,BUSTYPE_NEC98 ,sizeof (BUSTYPE_NEC98 )-1 ) ==0 ) { - mp_bus_id_to_type[m->mpc_busid] =MP_BUS_NEC98 ; }else {printk (KERN_WARNING "Unknown bustype %s - ignoring\n" , str); }
arch/i386/kernel/io_apic.c renamed from arch/i386/kernel/io_apic.c.old +2 -21
@@ -843,8 +843,7 @@ static int __init find_isa_irq_pin(int iif ((mp_bus_id_to_type[lbus] ==MP_BUS_ISA || mp_bus_id_to_type[lbus] ==MP_BUS_EISA || - mp_bus_id_to_type[lbus] ==MP_BUS_MCA || - mp_bus_id_to_type[lbus] ==MP_BUS_NEC98 + mp_bus_id_to_type[lbus] ==MP_BUS_MCA ) && (mp_irqs[i].mpc_irqtype == type) && (mp_irqs[i].mpc_srcbusirq == irq))
@@ -863,8 +862,7 @@ static int __init find_isa_irq_apic(intif ((mp_bus_id_to_type[lbus] ==MP_BUS_ISA || mp_bus_id_to_type[lbus] ==MP_BUS_EISA || - mp_bus_id_to_type[lbus] ==MP_BUS_MCA || - mp_bus_id_to_type[lbus] ==MP_BUS_NEC98 + mp_bus_id_to_type[lbus] ==MP_BUS_MCA ) && (mp_irqs[i].mpc_irqtype == type) && (mp_irqs[i].mpc_srcbusirq == irq))
@@ -994,12 +992,6 @@ static int EISA_ELCR(unsigned int irq)#define default_MCA_trigger (idx) (1)#define default_MCA_polarity (idx) (0) -/* NEC98 interrupts are always polarity zero edge triggered, -* when listed as conforming in the MP table. */ - -#define default_NEC98_trigger (idx) (0) -#define default_NEC98_polarity (idx) (0) -static int __init MPBIOS_polarity (int idx) {int bus = mp_irqs[idx].mpc_srcbus;
@@ -1034,11 +1026,6 @@ static int __init MPBIOS_polarity(int id polarity =default_MCA_polarity (idx);break ; } -case MP_BUS_NEC98 :/* NEC 98 pin */ - { - polarity =default_NEC98_polarity (idx); -break ; - }default : {printk (KERN_WARNING "broken BIOS!!\n" );
@@ -1108,11 +1095,6 @@ static int MPBIOS_trigger(int idx) trigger =default_MCA_trigger (idx);break ; } -case MP_BUS_NEC98 :/* NEC 98 pin */ - { - trigger =default_NEC98_trigger (idx); -break ; - }default : {printk (KERN_WARNING "broken BIOS!!\n" );
@@ -1174,7 +1156,6 @@ static int pin_2_irq(int idx, int apic,case MP_BUS_ISA :/* ISA pin */ case MP_BUS_EISA :case MP_BUS_MCA : -case MP_BUS_NEC98 : { irq = mp_irqs[idx].mpc_srcbusirq;break ;
Quoted 3 lines · Adrian Bunk
This patch removes the remaining code of the removed pc98 support.
Signed-off-by Adrian Bunk <[email protected]>
looks good to me,
Acked-by Ingo Molnar <[email protected]>
Ingo