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

Commit 9a93d473 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86/irq: Remove x86_io_apic_ops.write and x86_io_apic_ops.modify 



x86_io_apic_ops.write is always set to native_io_apic_write(),
and nobody overrides it. So get rid of the indirection by changing
native_io_apic_write() as io_apic_write() and removing
x86_io_apic_ops.write.

Do the same for x86_io_apic_ops.modify and native_io_apic_modify().

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: 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: Yijing Wang <wangyijing@huawei.com>
Cc: Grant Likely <grant.likely@linaro.org>
Link: http://lkml.kernel.org/r/1428978610-28986-19-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/include/asm/io_apic.h

+0 −13
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ extern void disable_ioapic_support(void); 


extern void __init native_io_apic_init_mappings(void);

extern unsigned int native_io_apic_read(unsigned int apic, unsigned int reg);

extern void native_io_apic_write(unsigned int apic, unsigned int reg, unsigned int val);

extern void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned int val);

extern void native_disable_io_apic(void);



static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)
@@ -217,15 +215,6 @@ static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg) 
	return x86_io_apic_ops.read(apic, reg);

}



static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned int value)

{

	x86_io_apic_ops.write(apic, reg, value);

}

static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)

{

	x86_io_apic_ops.modify(apic, reg, value);

}



extern void setup_IO_APIC(void);

extern void enable_IO_APIC(void);

extern void disable_IO_APIC(void);
@@ -266,8 +255,6 @@ static inline void mp_save_irq(struct mpc_intsrc *m) { }; 
static inline void disable_ioapic_support(void) { }

#define native_io_apic_init_mappings	NULL

#define native_io_apic_read		NULL

#define native_io_apic_write		NULL

#define native_io_apic_modify		NULL

#define native_disable_io_apic		NULL



static inline void setup_IO_APIC(void) { }

arch/x86/include/asm/x86_init.h

+0 −2
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ struct x86_msi_ops { 
struct x86_io_apic_ops {

	void		(*init)   (void);

	unsigned int	(*read)   (unsigned int apic, unsigned int reg);

	void		(*write)  (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*modify) (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*disable)(void);

};

arch/x86/kernel/apic/io_apic.c

+4 −2
Original line number Diff line number Diff line
@@ -280,7 +280,8 @@ unsigned int native_io_apic_read(unsigned int apic, unsigned int reg) 
	return readl(&io_apic->data);

}



void native_io_apic_write(unsigned int apic, unsigned int reg, unsigned int value)

static void io_apic_write(unsigned int apic, unsigned int reg,

			  unsigned int value)

{

	struct io_apic __iomem *io_apic = io_apic_base(apic);
@@ -294,7 +295,8 @@ void native_io_apic_write(unsigned int apic, unsigned int reg, unsigned int valu 
 *

 * Older SiS APIC requires we rewrite the index register

 */

void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)

static void io_apic_modify(unsigned int apic, unsigned int reg,

			   unsigned int value)

{

	struct io_apic __iomem *io_apic = io_apic_base(apic);

arch/x86/kernel/x86_init.c

+0 −2
Original line number Diff line number Diff line
@@ -141,7 +141,5 @@ void arch_restore_msi_irqs(struct pci_dev *dev) 
struct x86_io_apic_ops x86_io_apic_ops = {

	.init			= native_io_apic_init_mappings,

	.read			= native_io_apic_read,

	.write			= native_io_apic_write,

	.modify			= native_io_apic_modify,

	.disable		= native_disable_io_apic,

};