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

genirq: Remove the irq argument from setup_affinity() 



Unused except for the alpha wrapper, which can retrieve if from the
irq descriptor.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1433391238-19471-21-git-send-email-jiang.liu@linux.intel.com


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

kernel/irq/manage.c

+7 −8
Original line number Diff line number Diff line
@@ -361,8 +361,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); 
/*

 * Generic version of the affinity autoselector.

 */

static int

setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)

static int setup_affinity(struct irq_desc *desc, struct cpumask *mask)

{

	struct cpumask *set = irq_default_affinity;

	int node = irq_desc_get_node(desc);
@@ -395,10 +394,10 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) 
	return 0;

}

#else

static inline int

setup_affinity(unsigned int irq, struct irq_desc *d, struct cpumask *mask)

/* Wrapper for ALPHA specific affinity selector magic */

static inline int setup_affinity(struct irq_desc *d, struct cpumask *mask)

{

	return irq_select_affinity(irq);

	return irq_select_affinity(irq_desc_get_irq(d));

}

#endif
@@ -412,14 +411,14 @@ int irq_select_affinity_usr(unsigned int irq, struct cpumask *mask) 
	int ret;



	raw_spin_lock_irqsave(&desc->lock, flags);

	ret = setup_affinity(irq, desc, mask);

	ret = setup_affinity(desc, mask);

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	return ret;

}



#else

static inline int

setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)

setup_affinity(struct irq_desc *desc, struct cpumask *mask)

{

	return 0;

}
@@ -1256,7 +1255,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
		}



		/* Set default affinity mask once everything is setup */

		setup_affinity(irq, desc, mask);

		setup_affinity(desc, mask);



	} else if (new->flags & IRQF_TRIGGER_MASK) {

		unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE