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

Commit 68f9f440 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86/irq: Remove function apic_set_affinity() 



Now there's no user of apic_set_affinity(), so remove it.  Also rename
vector_set_affinity() to apic_set_affinity() for consistency.

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>
Link: http://lkml.kernel.org/r/1428978610-28986-25-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/include/asm/hw_irq.h

+0 −2
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ static inline void irq_complete_move(struct irq_cfg *c) { } 
#endif



extern void apic_ack_edge(struct irq_data *data);

extern int apic_set_affinity(struct irq_data *data, const struct cpumask *mask,

			     unsigned int *dest_id);

#else	/*  CONFIG_X86_LOCAL_APIC */

static inline void lock_vector_lock(void) {}

static inline void unlock_vector_lock(void) {}

arch/x86/kernel/apic/vector.c

+3 −37
Original line number Diff line number Diff line
@@ -463,41 +463,7 @@ void apic_ack_edge(struct irq_data *data) 
	ack_APIC_irq();

}



/*

 * Either sets data->affinity to a valid value, and returns

 * ->cpu_mask_to_apicid of that in dest_id, or returns -1 and

 * leaves data->affinity untouched.

 */

int apic_set_affinity(struct irq_data *data, const struct cpumask *mask,

		      unsigned int *dest_id)

{

	struct irq_cfg *cfg = irqd_cfg(data);

	unsigned int irq = data->irq;

	int err;



	if (!config_enabled(CONFIG_SMP))

		return -EPERM;



	if (!cpumask_intersects(mask, cpu_online_mask))

		return -EINVAL;



	err = assign_irq_vector(irq, cfg, mask);

	if (err)

		return err;



	err = apic->cpu_mask_to_apicid_and(mask, cfg->domain, dest_id);

	if (err) {

		if (assign_irq_vector(irq, cfg, data->affinity))

			pr_err("Failed to recover vector for irq %d\n", irq);

		return err;

	}



	cpumask_copy(data->affinity, mask);



	return 0;

}



static int vector_set_affinity(struct irq_data *irq_data,

static int apic_set_affinity(struct irq_data *irq_data,

			     const struct cpumask *dest, bool force)

{

	struct irq_cfg *cfg = irq_data->chip_data;
@@ -523,7 +489,7 @@ static int vector_set_affinity(struct irq_data *irq_data, 


static struct irq_chip lapic_controller = {

	.irq_ack		= apic_ack_edge,

	.irq_set_affinity	= vector_set_affinity,

	.irq_set_affinity	= apic_set_affinity,

	.irq_retrigger		= apic_retrigger_irq,

};