diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2015-03-04 19:19:16 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2015-03-04 22:07:02 -0500 |
commit | f9b531fe14a539ec2ad802b73c9638f324e4a4ff (patch) | |
tree | b01a1070d33aef3ac045faca56772bc6432f283e /drivers/irqchip/irq-mips-gic.c | |
parent | 51f7bd8590267011db7b632f53f3d32ec83ee8bb (diff) |
drivers: fix up obsolete cpu function usage.
Thanks to spatch, plus manual removal of "&*". Then a sweep for
for_each_cpu_mask => for_each_cpu.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: netdev@vger.kernel.org
Diffstat (limited to 'drivers/irqchip/irq-mips-gic.c')
-rw-r--r-- | drivers/irqchip/irq-mips-gic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 9acdc080e7ec..f26307908a2a 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c | |||
@@ -345,19 +345,19 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask, | |||
345 | int i; | 345 | int i; |
346 | 346 | ||
347 | cpumask_and(&tmp, cpumask, cpu_online_mask); | 347 | cpumask_and(&tmp, cpumask, cpu_online_mask); |
348 | if (cpus_empty(tmp)) | 348 | if (cpumask_empty(&tmp)) |
349 | return -EINVAL; | 349 | return -EINVAL; |
350 | 350 | ||
351 | /* Assumption : cpumask refers to a single CPU */ | 351 | /* Assumption : cpumask refers to a single CPU */ |
352 | spin_lock_irqsave(&gic_lock, flags); | 352 | spin_lock_irqsave(&gic_lock, flags); |
353 | 353 | ||
354 | /* Re-route this IRQ */ | 354 | /* Re-route this IRQ */ |
355 | gic_map_to_vpe(irq, first_cpu(tmp)); | 355 | gic_map_to_vpe(irq, cpumask_first(&tmp)); |
356 | 356 | ||
357 | /* Update the pcpu_masks */ | 357 | /* Update the pcpu_masks */ |
358 | for (i = 0; i < NR_CPUS; i++) | 358 | for (i = 0; i < NR_CPUS; i++) |
359 | clear_bit(irq, pcpu_masks[i].pcpu_mask); | 359 | clear_bit(irq, pcpu_masks[i].pcpu_mask); |
360 | set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask); | 360 | set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask); |
361 | 361 | ||
362 | cpumask_copy(d->affinity, cpumask); | 362 | cpumask_copy(d->affinity, cpumask); |
363 | spin_unlock_irqrestore(&gic_lock, flags); | 363 | spin_unlock_irqrestore(&gic_lock, flags); |