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

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 1c6dea2fbc34..04b6f0732c1a 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -512,7 +512,7 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
          */
         smp_wmb();
 
-        for_each_cpu_mask(cpu, *mask) {
+        for_each_cpu(cpu, mask) {
                 u64 cluster_id = cpu_logical_map(cpu) & ~0xffUL;
                 u16 tlist;
 
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,
         int             i;
 
         cpumask_and(&tmp, cpumask, cpu_online_mask);
-        if (cpus_empty(tmp))
+        if (cpumask_empty(&tmp))
                 return -EINVAL;
 
         /* Assumption : cpumask refers to a single CPU */
         spin_lock_irqsave(&gic_lock, flags);
 
         /* Re-route this IRQ */
-        gic_map_to_vpe(irq, first_cpu(tmp));
+        gic_map_to_vpe(irq, cpumask_first(&tmp));
 
         /* Update the pcpu_masks */
         for (i = 0; i < NR_CPUS; i++)
                 clear_bit(irq, pcpu_masks[i].pcpu_mask);
-        set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask);
+        set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask);
 
         cpumask_copy(d->affinity, cpumask);
         spin_unlock_irqrestore(&gic_lock, flags);