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

Commit f9b531fe authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarRafael 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
parent 51f7bd85

drivers/clocksource/dw_apb_timer.c

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static void apbt_set_mode(enum clock_event_mode mode, 
	unsigned long period;

	struct dw_apb_clock_event_device *dw_ced = ced_to_dw_apb_ced(evt);



	pr_debug("%s CPU %d mode=%d\n", __func__, first_cpu(*evt->cpumask),

	pr_debug("%s CPU %d mode=%d\n", __func__,

		 cpumask_first(evt->cpumask),

		 mode);



	switch (mode) {

drivers/cpuidle/coupled.c

+3 −3
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static inline int cpuidle_coupled_get_state(struct cpuidle_device *dev, 
	 */

	smp_rmb();



	for_each_cpu_mask(i, coupled->coupled_cpus)

	for_each_cpu(i, &coupled->coupled_cpus)

		if (cpu_online(i) && coupled->requested_state[i] < state)

			state = coupled->requested_state[i];
@@ -338,7 +338,7 @@ static void cpuidle_coupled_poke_others(int this_cpu, 
{

	int cpu;



	for_each_cpu_mask(cpu, coupled->coupled_cpus)

	for_each_cpu(cpu, &coupled->coupled_cpus)

		if (cpu != this_cpu && cpu_online(cpu))

			cpuidle_coupled_poke(cpu);

}
@@ -638,7 +638,7 @@ int cpuidle_coupled_register_device(struct cpuidle_device *dev) 
	if (cpumask_empty(&dev->coupled_cpus))

		return 0;



	for_each_cpu_mask(cpu, dev->coupled_cpus) {

	for_each_cpu(cpu, &dev->coupled_cpus) {

		other_dev = per_cpu(cpuidle_devices, cpu);

		if (other_dev && other_dev->coupled) {

			coupled = other_dev->coupled;

drivers/crypto/n2_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc, 
				dev->dev.of_node->full_name);

			return -EINVAL;

		}

		cpu_set(*id, p->sharing);

		cpumask_set_cpu(*id, &p->sharing);

		table[*id] = p;

	}

	return 0;
@@ -1776,7 +1776,7 @@ static int handle_exec_unit(struct spu_mdesc_info *ip, struct list_head *list, 
		return -ENOMEM;

	}



	cpus_clear(p->sharing);

	cpumask_clear(&p->sharing);

	spin_lock_init(&p->lock);

	p->q_type = q_type;

	INIT_LIST_HEAD(&p->jobs);

drivers/irqchip/irq-gic-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/irqchip/irq-mips-gic.c

+3 −3
Original line number Diff line number Diff line
@@ -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);