aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2015-04-13 22:29:54 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-04-24 09:36:53 -0400
commit50a6ad84b2a2c971e76d57884d61a5a55d7c1601 (patch)
tree57de357ea7539ecc58c45c0d44a5767fd0d542a0
parent4467715a44cca2fa41d25f3d32b737bd2331a8d9 (diff)
x86/irq: Remove struct io_apic_irq_attr
Now there's no user of struct io_apic_irq_attr anymore, so remove it. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Tested-by: Joerg Roedel <jroedel@suse.de> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: David Cohen <david.a.cohen@linux.intel.com> Cc: Sander Eikelenboom <linux@eikelenboom.it> Cc: David Vrabel <david.vrabel@citrix.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Dimitri Sivanich <sivanich@sgi.com> Cc: Grant Likely <grant.likely@linaro.org> Link: http://lkml.kernel.org/r/1428978610-28986-18-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/io_apic.h7
-rw-r--r--arch/x86/kernel/apic/io_apic.c10
2 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index fa4b25ebd658..4eb4bcc5f219 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -157,13 +157,6 @@ extern int restore_ioapic_entries(void);
157extern void setup_ioapic_ids_from_mpc(void); 157extern void setup_ioapic_ids_from_mpc(void);
158extern void setup_ioapic_ids_from_mpc_nocheck(void); 158extern void setup_ioapic_ids_from_mpc_nocheck(void);
159 159
160struct io_apic_irq_attr {
161 int ioapic;
162 int ioapic_pin;
163 int trigger;
164 int polarity;
165};
166
167enum ioapic_domain_type { 160enum ioapic_domain_type {
168 IOAPIC_DOMAIN_INVALID, 161 IOAPIC_DOMAIN_INVALID,
169 IOAPIC_DOMAIN_LEGACY, 162 IOAPIC_DOMAIN_LEGACY,
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index a1abdcf2cb5f..76dc9f5bfdbc 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2959,16 +2959,6 @@ int mp_ioapic_registered(u32 gsi_base)
2959 return 0; 2959 return 0;
2960} 2960}
2961 2961
2962static inline void set_io_apic_irq_attr(struct io_apic_irq_attr *irq_attr,
2963 int ioapic, int ioapic_pin,
2964 int trigger, int polarity)
2965{
2966 irq_attr->ioapic = ioapic;
2967 irq_attr->ioapic_pin = ioapic_pin;
2968 irq_attr->trigger = trigger;
2969 irq_attr->polarity = polarity;
2970}
2971
2972static void mp_irqdomain_get_attr(u32 gsi, struct mp_chip_data *data, 2962static void mp_irqdomain_get_attr(u32 gsi, struct mp_chip_data *data,
2973 struct irq_alloc_info *info) 2963 struct irq_alloc_info *info)
2974{ 2964{