iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20100927121842.927527393@linutronix.de>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2010-09-27 12:45:50 +00:00
parent b2ba2c3003
commit 2f7e99bb9b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/irq/chip.c
View File

@ -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)

4
kernel/irq/manage.c
View File

@ -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;
}