Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d50d8f authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86/irq: Remove x86_io_apic_ops.setup_entry and related interfaces 



Now there is no user of x86_io_apic_ops.setup_entry anymore, so remove it.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Tested-by: default avatarJoerg 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: iommu@lists.linux-foundation.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: Joerg Roedel <joro@8bytes.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Grant Likely <grant.likely@linaro.org>
Link: http://lkml.kernel.org/r/1428978610-28986-5-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 84bea5cc

arch/x86/include/asm/io_apic.h

+0 −4
Original line number Diff line number Diff line
@@ -150,9 +150,6 @@ struct irq_cfg; 
extern void ioapic_insert_resources(void);

extern int arch_early_ioapic_init(void);



extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,

				     unsigned int, int,

				     struct io_apic_irq_attr *);

extern void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg);



extern void native_eoi_ioapic_pin(int apic, int pin, int vector);
@@ -289,7 +286,6 @@ static inline void disable_ioapic_support(void) { } 
#define native_io_apic_modify		NULL

#define native_disable_io_apic		NULL

#define native_ioapic_set_affinity	NULL

#define native_setup_ioapic_entry	NULL

#define native_eoi_ioapic_pin		NULL



static inline void setup_IO_APIC(void) { }

arch/x86/include/asm/irq_remapping.h

+0 −13
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ extern int irq_remapping_enable(void); 
extern void irq_remapping_disable(void);

extern int irq_remapping_reenable(int);

extern int irq_remap_enable_fault_handling(void);

extern int setup_ioapic_remapped_entry(int irq,

				       struct IO_APIC_route_entry *entry,

				       unsigned int destination,

				       int vector,

				       struct io_apic_irq_attr *attr);

extern void free_remapped_irq(int irq);

extern void panic_if_irq_remap(const char *msg);

extern bool setup_remapped_irq(int irq,
@@ -77,14 +72,6 @@ static inline int irq_remapping_enable(void) { return -ENODEV; } 
static inline void irq_remapping_disable(void) { }

static inline int irq_remapping_reenable(int eim) { return -ENODEV; }

static inline int irq_remap_enable_fault_handling(void) { return -ENODEV; }

static inline int setup_ioapic_remapped_entry(int irq,

					      struct IO_APIC_route_entry *entry,

					      unsigned int destination,

					      int vector,

					      struct io_apic_irq_attr *attr)

{

	return -ENODEV;

}

static inline void free_remapped_irq(int irq) { }



static inline void panic_if_irq_remap(const char *msg)

arch/x86/include/asm/x86_init.h

+0 −3
Original line number Diff line number Diff line
@@ -194,9 +194,6 @@ struct x86_io_apic_ops { 
	int		(*set_affinity)(struct irq_data *data,

					const struct cpumask *mask,

					bool force);

	int		(*setup_entry)(int irq, struct IO_APIC_route_entry *entry,

				       unsigned int destination, int vector,

				       struct io_apic_irq_attr *attr);

	void		(*eoi_ioapic_pin)(int apic, int pin, int vector);

};

arch/x86/kernel/apic/io_apic.c

+0 −24
Original line number Diff line number Diff line
@@ -1296,30 +1296,6 @@ static inline int IO_APIC_irq_trigger(int irq) 
}

#endif



int native_setup_ioapic_entry(int irq, struct IO_APIC_route_entry *entry,

			      unsigned int destination, int vector,

			      struct io_apic_irq_attr *attr)

{

	memset(entry, 0, sizeof(*entry));



	entry->delivery_mode = apic->irq_delivery_mode;

	entry->dest_mode     = apic->irq_dest_mode;

	entry->dest	     = destination;

	entry->vector	     = vector;

	entry->mask	     = 0;			/* enable IRQ */

	entry->trigger	     = attr->trigger;

	entry->polarity	     = attr->polarity;



	/*

	 * Mask level triggered irqs.

	 * Use IRQ_DELAYED_DISABLE for edge triggered irqs.

	 */

	if (attr->trigger)

		entry->mask = 1;



	return 0;

}



static void __init setup_IO_APIC_irqs(void)

{

	unsigned int ioapic, pin;

arch/x86/kernel/x86_init.c

+0 −1
Original line number Diff line number Diff line
@@ -145,6 +145,5 @@ struct x86_io_apic_ops x86_io_apic_ops = { 
	.modify			= native_io_apic_modify,

	.disable		= native_disable_io_apic,

	.set_affinity		= native_ioapic_set_affinity,

	.setup_entry		= native_setup_ioapic_entry,

	.eoi_ioapic_pin		= native_eoi_ioapic_pin,

};