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

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

sparc/irq: Use access helper irq_data_get_affinity_mask() 



This is a preparatory patch for moving irq_data struct members.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Link: http://lkml.kernel.org/r/1433145945-789-27-git-send-email-jiang.liu@linux.intel.com


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

arch/sparc/kernel/irq_64.c

+7 −5
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ static void sun4u_irq_enable(struct irq_data *data) 
		unsigned long cpuid, imap, val;

		unsigned int tid;



		cpuid = irq_choose_cpu(data->irq, data->affinity);

		cpuid = irq_choose_cpu(data->irq,

				       irq_data_get_affinity_mask(data));

		imap = handler_data->imap;



		tid = sun4u_compute_tid(imap, cpuid);
@@ -449,7 +450,8 @@ static void sun4u_irq_eoi(struct irq_data *data) 


static void sun4v_irq_enable(struct irq_data *data)

{

	unsigned long cpuid = irq_choose_cpu(data->irq, data->affinity);

	unsigned long cpuid = irq_choose_cpu(data->irq,

					     irq_data_get_affinity_mask(data));

	unsigned int ino = irq_data_to_sysino(data);

	int err;
@@ -511,7 +513,7 @@ static void sun4v_virq_enable(struct irq_data *data) 
	unsigned long cpuid;

	int err;



	cpuid = irq_choose_cpu(data->irq, data->affinity);

	cpuid = irq_choose_cpu(data->irq, irq_data_get_affinity_mask(data));



	err = sun4v_vintr_set_target(dev_handle, dev_ino, cpuid);

	if (err != HV_EOK)
@@ -884,7 +886,7 @@ void fixup_irqs(void) 
		if (desc->action && !irqd_is_per_cpu(data)) {

			if (data->chip->irq_set_affinity)

				data->chip->irq_set_affinity(data,

							     data->affinity,

					irq_data_get_affinity_mask(data),

					false);

		}

		raw_spin_unlock_irqrestore(&desc->lock, flags);

arch/sparc/kernel/leon_kernel.c

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int leon_set_affinity(struct irq_data *data, const struct cpumask *dest, 
	int oldcpu, newcpu;



	mask = (unsigned long)data->chip_data;

	oldcpu = irq_choose_cpu(data->affinity);

	oldcpu = irq_choose_cpu(irq_data_get_affinity_mask(data));

	newcpu = irq_choose_cpu(dest);



	if (oldcpu == newcpu)
@@ -149,7 +149,7 @@ static void leon_unmask_irq(struct irq_data *data) 
	int cpu;



	mask = (unsigned long)data->chip_data;

	cpu = irq_choose_cpu(data->affinity);

	cpu = irq_choose_cpu(irq_data_get_affinity_mask(data));

	spin_lock_irqsave(&leon_irq_lock, flags);

	oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(cpu));

	LEON3_BYPASS_STORE_PA(LEON_IMASK(cpu), (oldmask | mask));
@@ -162,7 +162,7 @@ static void leon_mask_irq(struct irq_data *data) 
	int cpu;



	mask = (unsigned long)data->chip_data;

	cpu = irq_choose_cpu(data->affinity);

	cpu = irq_choose_cpu(irq_data_get_affinity_mask(data));

	spin_lock_irqsave(&leon_irq_lock, flags);

	oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(cpu));

	LEON3_BYPASS_STORE_PA(LEON_IMASK(cpu), (oldmask & ~mask));