diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2010-03-30 04:07:16 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-04 16:35:20 -0400 |
commit | 7b20bd5fb902088579af4e70f7f802b93181a628 (patch) | |
tree | f31e9c820c28caad15cb9aa6b1a9a139aefbdd39 /arch/x86/kernel/apic/io_apic.c | |
parent | 988856ee1623bd37e384105f7bb2b7fe44c009f6 (diff) |
x86, irq: Kill io_apic_renumber_irq
Now that the generic irq layer is performing the exact same remapping as
io_apic_renumber_irq we can kill this weird es7000 specific function.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <1269936436-7039-15-git-send-email-ebiederm@xmission.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 594827c3c615..d174d8866547 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -1016,7 +1016,6 @@ static inline int irq_trigger(int idx) | |||
1016 | return MPBIOS_trigger(idx); | 1016 | return MPBIOS_trigger(idx); |
1017 | } | 1017 | } |
1018 | 1018 | ||
1019 | int (*ioapic_renumber_irq)(int ioapic, int irq); | ||
1020 | static int pin_2_irq(int idx, int apic, int pin) | 1019 | static int pin_2_irq(int idx, int apic, int pin) |
1021 | { | 1020 | { |
1022 | int irq; | 1021 | int irq; |
@@ -1032,11 +1031,6 @@ static int pin_2_irq(int idx, int apic, int pin) | |||
1032 | irq = mp_irqs[idx].srcbusirq; | 1031 | irq = mp_irqs[idx].srcbusirq; |
1033 | } else { | 1032 | } else { |
1034 | u32 gsi = mp_gsi_routing[apic].gsi_base + pin; | 1033 | u32 gsi = mp_gsi_routing[apic].gsi_base + pin; |
1035 | /* | ||
1036 | * For MPS mode, so far only needed by ES7000 platform | ||
1037 | */ | ||
1038 | if (ioapic_renumber_irq) | ||
1039 | gsi = ioapic_renumber_irq(apic, gsi); | ||
1040 | 1034 | ||
1041 | if (gsi >= NR_IRQS_LEGACY) | 1035 | if (gsi >= NR_IRQS_LEGACY) |
1042 | irq = gsi; | 1036 | irq = gsi; |