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

Commit 2ea4db65 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

xtensa: Fixup irq conversion fallout and nmi_count 



Some unnamed moron fatfingered the arguments of the irq chip callbacks
to irq_chip instead of irq_data.

While at it remove the nmi_count() print in arch_show_interrupts()
which has been broken before the irq conversion already.

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

arch/xtensa/kernel/irq.c

+6 −12
Original line number Diff line number Diff line
@@ -64,47 +64,41 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) 


int arch_show_interrupts(struct seq_file *p, int prec)

{

	int j;



	seq_printf(p, "%*s: ", prec, "NMI");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", nmi_count(j));

	seq_putc(p, '\n');

	seq_printf(p, "%*s: ", prec, "ERR");

	seq_printf(p, "%10u\n", atomic_read(&irq_err_count));

	return 0;

}



static void xtensa_irq_mask(struct irq_chip *d)

static void xtensa_irq_mask(struct irq_data *d)

{

	cached_irq_mask &= ~(1 << d->irq);

	set_sr (cached_irq_mask, INTENABLE);

}



static void xtensa_irq_unmask(struct irq_chip *d)

static void xtensa_irq_unmask(struct irq_data *d)

{

	cached_irq_mask |= 1 << d->irq;

	set_sr (cached_irq_mask, INTENABLE);

}



static void xtensa_irq_enable(struct irq_chip *d)

static void xtensa_irq_enable(struct irq_data *d)

{

	variant_irq_enable(d->irq);

	xtensa_irq_unmask(d->irq);

}



static void xtensa_irq_disable(struct irq_chip *d)

static void xtensa_irq_disable(struct irq_data *d)

{

	xtensa_irq_mask(d->irq);

	variant_irq_disable(d->irq);

}



static void xtensa_irq_ack(struct irq_chip *d)

static void xtensa_irq_ack(struct irq_data *d)

{

	set_sr(1 << d->irq, INTCLEAR);

}



static int xtensa_irq_retrigger(struct irq_chip *d)

static int xtensa_irq_retrigger(struct irq_data *d)

{

	set_sr (1 << d->irq, INTSET);

	return 1;