Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh/irq: Use access helper irq_data_get_affinity_mask()

This is a preparatory patch for moving irq_data struct members.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Link: http://lkml.kernel.org/r/20150713151626.713278346@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Thomas Gleixner and committed by
Ingo Molnar
8b8149df d0abe2f3

+7 -6
+4 -3
arch/sh/kernel/irq.c
··· 228 228 struct irq_data *data = irq_get_irq_data(irq); 229 229 230 230 if (irq_data_get_node(data) == cpu) { 231 - unsigned int newcpu = cpumask_any_and(data->affinity, 231 + struct cpumask *mask = irq_data_get_affinity_mask(data); 232 + unsigned int newcpu = cpumask_any_and(mask, 232 233 cpu_online_mask); 233 234 if (newcpu >= nr_cpu_ids) { 234 235 pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n", 235 236 irq, cpu); 236 237 237 - cpumask_setall(data->affinity); 238 + cpumask_setall(mask); 238 239 } 239 - irq_set_affinity(irq, data->affinity); 240 + irq_set_affinity(irq, mask); 240 241 } 241 242 } 242 243 }
+3 -3
drivers/sh/intc/chip.c
··· 22 22 23 23 for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_E(handle)); cpu++) { 24 24 #ifdef CONFIG_SMP 25 - if (!cpumask_test_cpu(cpu, data->affinity)) 25 + if (!cpumask_test_cpu(cpu, irq_data_get_affinity_mask(data))) 26 26 continue; 27 27 #endif 28 28 addr = INTC_REG(d, _INTC_ADDR_E(handle), cpu); ··· 50 50 51 51 for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_D(handle)); cpu++) { 52 52 #ifdef CONFIG_SMP 53 - if (!cpumask_test_cpu(cpu, data->affinity)) 53 + if (!cpumask_test_cpu(cpu, irq_data_get_affinity_mask(data))) 54 54 continue; 55 55 #endif 56 56 addr = INTC_REG(d, _INTC_ADDR_D(handle), cpu); ··· 72 72 if (!cpumask_intersects(cpumask, cpu_online_mask)) 73 73 return -1; 74 74 75 - cpumask_copy(data->affinity, cpumask); 75 + cpumask_copy(irq_data_get_affinity_mask(data), cpumask); 76 76 77 77 return IRQ_SET_MASK_OK_NOCOPY; 78 78 }