luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Wrap the old chip function mask() 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: <20100927121841.940355859@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:44:42 +00:00
parent 3876ec9ef3
commit e2c0f8ff0f
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/irq/chip.c
View File

@ -320,11 +320,16 @@ static void default_shutdown(unsigned int irq)
{ {
struct irq_desc *desc = irq_to_desc(irq); struct irq_desc *desc = irq_to_desc(irq);
desc->irq_data.chip->mask(irq); desc->irq_data.chip->irq_mask(&desc->irq_data);
desc->status |= IRQ_MASKED; desc->status |= IRQ_MASKED;
} }
/* Temporary migration helpers */ /* Temporary migration helpers */
static void compat_irq_mask(struct irq_data *data)
{
data->chip->mask(data->irq);
}
static void compat_bus_lock(struct irq_data *data) static void compat_bus_lock(struct irq_data *data)
{ {
data->chip->bus_lock(data->irq); data->chip->bus_lock(data->irq);
@ -362,6 +367,9 @@ void irq_chip_set_defaults(struct irq_chip *chip)
chip->irq_bus_lock = compat_bus_lock; chip->irq_bus_lock = compat_bus_lock;
if (chip->bus_sync_unlock) if (chip->bus_sync_unlock)
chip->irq_bus_sync_unlock = compat_bus_sync_unlock; chip->irq_bus_sync_unlock = compat_bus_sync_unlock;
if (chip->mask)
chip->irq_mask = compat_irq_mask;
} }
static inline void mask_ack_irq(struct irq_desc *desc, int irq) static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@ -369,17 +377,17 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
if (desc->irq_data.chip->mask_ack) if (desc->irq_data.chip->mask_ack)
desc->irq_data.chip->mask_ack(irq); desc->irq_data.chip->mask_ack(irq);
else { else {
desc->irq_data.chip->mask(irq); desc->irq_data.chip->irq_mask(&desc->irq_data);
if (desc->irq_data.chip->ack) if (desc->irq_data.chip->ack)
desc->irq_data.chip->ack(irq); desc->irq_data.chip->ack(irq);
} }
desc->status |= IRQ_MASKED; desc->status |= IRQ_MASKED;
} }
static inline void mask_irq(struct irq_desc *desc, int irq) static inline void mask_irq(struct irq_desc *desc)
{ {
if (desc->irq_data.chip->mask) { if (desc->irq_data.chip->irq_mask) {
desc->irq_data.chip->mask(irq); desc->irq_data.chip->irq_mask(&desc->irq_data);
desc->status |= IRQ_MASKED; desc->status |= IRQ_MASKED;
} }
} }
@ -553,7 +561,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
action = desc->action; action = desc->action;
if (unlikely(!action || (desc->status & IRQ_DISABLED))) { if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
desc->status |= IRQ_PENDING; desc->status |= IRQ_PENDING;
mask_irq(desc, irq); mask_irq(desc);
goto out; goto out;
} }
@ -621,7 +629,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
irqreturn_t action_ret; irqreturn_t action_ret;
if (unlikely(!action)) { if (unlikely(!action)) {
mask_irq(desc, irq); mask_irq(desc);
goto out_unlock; goto out_unlock;
} }

1
kernel/irq/handle.c
View File

@ -360,7 +360,6 @@ struct irq_chip dummy_irq_chip = {
.enable = compat_noop, .enable = compat_noop,
.disable = compat_noop, .disable = compat_noop,
.ack = compat_noop, .ack = compat_noop,
.mask = compat_noop,
.unmask = compat_noop, .unmask = compat_noop,
.end = compat_noop, .end = compat_noop,
}; };

2
kernel/irq/migration.c
View File

@ -61,7 +61,7 @@ void move_native_irq(int irq)
if (unlikely(desc->status & IRQ_DISABLED)) if (unlikely(desc->status & IRQ_DISABLED))
return; return;
desc->irq_data.chip->mask(irq); desc->irq_data.chip->irq_mask(&desc->irq_data);
move_masked_irq(irq); move_masked_irq(irq);
desc->irq_data.chip->unmask(irq); desc->irq_data.chip->unmask(irq);
} }