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

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

genirq: Introduce irq_do_set_affinity() to reduce duplicated code 



All invocations of chip->irq_set_affinity() are doing the same return
value checks. Let them all use a common function.

[ tglx: removed the silly likely while at it ]

Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Keping Chen <chenkeping@huawei.com>
Link: http://lkml.kernel.org/r/1333120296-13563-3-git-send-email-jiang.liu@huawei.com


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

kernel/irq/internals.h

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ extern int irq_select_affinity_usr(unsigned int irq, struct cpumask *mask); 


extern void irq_set_thread_affinity(struct irq_desc *desc);



extern int irq_do_set_affinity(struct irq_data *data,

			       const struct cpumask *dest, bool force);



/* Inline functions for support of irq chips on slow busses */

static inline void chip_bus_lock(struct irq_desc *desc)

{

kernel/irq/manage.c

+22 −17
Original line number Diff line number Diff line
@@ -139,16 +139,13 @@ static inline void 
irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { }

#endif



int __irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask)

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

			bool force)

{

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	struct irq_desc *desc = irq_data_to_desc(data);

	int ret = 0;



	if (!chip || !chip->irq_set_affinity)

		return -EINVAL;

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	int ret;



	if (irq_can_move_pcntxt(data)) {

	ret = chip->irq_set_affinity(data, mask, false);

	switch (ret) {

	case IRQ_SET_MASK_OK:
@@ -157,6 +154,21 @@ int __irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask) 
		irq_set_thread_affinity(desc);

		ret = 0;

	}



	return ret;

}



int __irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask)

{

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	struct irq_desc *desc = irq_data_to_desc(data);

	int ret = 0;



	if (!chip || !chip->irq_set_affinity)

		return -EINVAL;



	if (irq_can_move_pcntxt(data)) {

		ret = irq_do_set_affinity(data, mask, false);

	} else {

		irqd_set_move_pending(data);

		irq_copy_pending(desc, mask);
@@ -280,9 +292,8 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); 
static int

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

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct cpumask *set = irq_default_affinity;

	int ret, node = desc->irq_data.node;

	int node = desc->irq_data.node;



	/* Excludes PER_CPU and NO_BALANCE interrupts */

	if (!irq_can_set_affinity(irq))
@@ -308,13 +319,7 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) 
		if (cpumask_intersects(mask, nodemask))

			cpumask_and(mask, mask, nodemask);

	}

	ret = chip->irq_set_affinity(&desc->irq_data, mask, false);

	switch (ret) {

	case IRQ_SET_MASK_OK:

		cpumask_copy(desc->irq_data.affinity, mask);

	case IRQ_SET_MASK_OK_NOCOPY:

		irq_set_thread_affinity(desc);

	}

	irq_do_set_affinity(&desc->irq_data, mask, false);

	return 0;

}

#else

kernel/irq/migration.c

+2 −11
Original line number Diff line number Diff line
@@ -42,17 +42,8 @@ void irq_move_masked_irq(struct irq_data *idata) 
	 * For correct operation this depends on the caller

	 * masking the irqs.

	 */

	if (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask)

		   < nr_cpu_ids)) {

		int ret = chip->irq_set_affinity(&desc->irq_data,

						 desc->pending_mask, false);

		switch (ret) {

		case IRQ_SET_MASK_OK:

			cpumask_copy(desc->irq_data.affinity, desc->pending_mask);

		case IRQ_SET_MASK_OK_NOCOPY:

			irq_set_thread_affinity(desc);

		}

	}

	if (cpumask_any_and(desc->pending_mask, cpu_online_mask) < nr_cpu_ids)

		irq_do_set_affinity(&desc->irq_data, desc->pending_mask, false);



	cpumask_clear(desc->pending_mask);

}