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

Commit 21e2b8c6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Provide compat handling for chip->retrigger() 



Wrap the old chip function retrigger() until the migration is complete
and the old chip functions are removed.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20100927121843.025801092@linutronix.de>
Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2f7e99bb

kernel/irq/chip.c

+7 −0
Original line number Diff line number Diff line
@@ -386,6 +386,11 @@ static int compat_irq_set_wake(struct irq_data *data, unsigned int on) 
	return data->chip->set_wake(data->irq, on);

}



static int compat_irq_retrigger(struct irq_data *data)

{

	return data->chip->retrigger(data->irq);

}



static void compat_bus_lock(struct irq_data *data)

{

	data->chip->bus_lock(data->irq);
@@ -458,6 +463,8 @@ void irq_chip_set_defaults(struct irq_chip *chip) 
		chip->irq_set_type = compat_irq_set_type;

	if (chip->set_wake)

		chip->irq_set_wake = compat_irq_set_wake;

	if (chip->retrigger)

		chip->irq_retrigger = compat_irq_retrigger;

}



static inline void mask_ack_irq(struct irq_desc *desc)

kernel/irq/resend.c

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq) 
	if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {

		desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;



		if (!desc->irq_data.chip->retrigger ||

		    !desc->irq_data.chip->retrigger(irq)) {

		if (!desc->irq_data.chip->irq_retrigger ||

		    !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {

#ifdef CONFIG_HARDIRQS_SW_RESEND

			/* Set it pending and activate the softirq: */

			set_bit(irq, irqs_resend);