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

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

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



Wrap the old chip function set_wake() 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: <20100927121842.927527393@linutronix.de>
Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent b2ba2c30

kernel/irq/chip.c

+7 −0
Original line number Diff line number Diff line
@@ -381,6 +381,11 @@ static int compat_irq_set_type(struct irq_data *data, unsigned int type) 
	return data->chip->set_type(data->irq, type);

}



static int compat_irq_set_wake(struct irq_data *data, unsigned int on)

{

	return data->chip->set_wake(data->irq, on);

}



static void compat_bus_lock(struct irq_data *data)

{

	data->chip->bus_lock(data->irq);
@@ -451,6 +456,8 @@ void irq_chip_set_defaults(struct irq_chip *chip) 
		chip->irq_set_affinity = compat_irq_set_affinity;

	if (chip->set_type)

		chip->irq_set_type = compat_irq_set_type;

	if (chip->set_wake)

		chip->irq_set_wake = compat_irq_set_wake;

}



static inline void mask_ack_irq(struct irq_desc *desc)

kernel/irq/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -337,8 +337,8 @@ static int set_irq_wake_real(unsigned int irq, unsigned int on) 
	struct irq_desc *desc = irq_to_desc(irq);

	int ret = -ENXIO;



	if (desc->irq_data.chip->set_wake)

		ret = desc->irq_data.chip->set_wake(irq, on);

	if (desc->irq_data.chip->irq_set_wake)

		ret = desc->irq_data.chip->irq_set_wake(&desc->irq_data, on);



	return ret;

}