aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apic/io_apic.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 7344b428e08d..2d49e4b41c2d 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -821,7 +821,7 @@ static int EISA_ELCR(unsigned int irq)
821#define default_MCA_trigger(idx) (1) 821#define default_MCA_trigger(idx) (1)
822#define default_MCA_polarity(idx) default_ISA_polarity(idx) 822#define default_MCA_polarity(idx) default_ISA_polarity(idx)
823 823
824static int MPBIOS_polarity(int idx) 824static int irq_polarity(int idx)
825{ 825{
826 int bus = mp_irqs[idx].srcbus; 826 int bus = mp_irqs[idx].srcbus;
827 int polarity; 827 int polarity;
@@ -863,7 +863,7 @@ static int MPBIOS_polarity(int idx)
863 return polarity; 863 return polarity;
864} 864}
865 865
866static int MPBIOS_trigger(int idx) 866static int irq_trigger(int idx)
867{ 867{
868 int bus = mp_irqs[idx].srcbus; 868 int bus = mp_irqs[idx].srcbus;
869 int trigger; 869 int trigger;
@@ -935,16 +935,6 @@ static int MPBIOS_trigger(int idx)
935 return trigger; 935 return trigger;
936} 936}
937 937
938static inline int irq_polarity(int idx)
939{
940 return MPBIOS_polarity(idx);
941}
942
943static inline int irq_trigger(int idx)
944{
945 return MPBIOS_trigger(idx);
946}
947
948static int pin_2_irq(int idx, int apic, int pin) 938static int pin_2_irq(int idx, int apic, int pin)
949{ 939{
950 int irq; 940 int irq;