AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
Wrap the old chip function unmask() 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.043608928@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:44 +00:00
parent e2c0f8ff0f
commit 0eda58b7f3
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/irq/chip.c
View File

@ -291,7 +291,7 @@ static void default_enable(unsigned int irq)
{ {
struct irq_desc *desc = irq_to_desc(irq); struct irq_desc *desc = irq_to_desc(irq);
desc->irq_data.chip->unmask(irq); desc->irq_data.chip->irq_unmask(&desc->irq_data);
desc->status &= ~IRQ_MASKED; desc->status &= ~IRQ_MASKED;
} }
@ -330,6 +330,11 @@ static void compat_irq_mask(struct irq_data *data)
data->chip->mask(data->irq); data->chip->mask(data->irq);
} }
static void compat_irq_unmask(struct irq_data *data)
{
data->chip->unmask(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);
@ -370,6 +375,9 @@ void irq_chip_set_defaults(struct irq_chip *chip)
if (chip->mask) if (chip->mask)
chip->irq_mask = compat_irq_mask; chip->irq_mask = compat_irq_mask;
if (chip->unmask)
chip->irq_unmask = compat_irq_unmask;
} }
static inline void mask_ack_irq(struct irq_desc *desc, int irq) static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@ -392,10 +400,10 @@ static inline void mask_irq(struct irq_desc *desc)
} }
} }
static inline void unmask_irq(struct irq_desc *desc, int irq) static inline void unmask_irq(struct irq_desc *desc)
{ {
if (desc->irq_data.chip->unmask) { if (desc->irq_data.chip->irq_unmask) {
desc->irq_data.chip->unmask(irq); desc->irq_data.chip->irq_unmask(&desc->irq_data);
desc->status &= ~IRQ_MASKED; desc->status &= ~IRQ_MASKED;
} }
} }
@ -524,7 +532,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
desc->status &= ~IRQ_INPROGRESS; desc->status &= ~IRQ_INPROGRESS;
if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT))) if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT)))
unmask_irq(desc, irq); unmask_irq(desc);
out_unlock: out_unlock:
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
@ -641,7 +649,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
if (unlikely((desc->status & if (unlikely((desc->status &
(IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) == (IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) ==
(IRQ_PENDING | IRQ_MASKED))) { (IRQ_PENDING | IRQ_MASKED))) {
unmask_irq(desc, irq); unmask_irq(desc);
} }
desc->status &= ~IRQ_PENDING; desc->status &= ~IRQ_PENDING;

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,
.unmask = compat_noop,
.end = compat_noop, .end = compat_noop,
}; };

2
kernel/irq/manage.c
View File

@ -528,7 +528,7 @@ static void irq_finalize_oneshot(unsigned int irq, struct irq_desc *desc)
if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) { if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) {
desc->status &= ~IRQ_MASKED; desc->status &= ~IRQ_MASKED;
desc->irq_data.chip->unmask(irq); desc->irq_data.chip->irq_unmask(&desc->irq_data);
} }
raw_spin_unlock_irq(&desc->lock); raw_spin_unlock_irq(&desc->lock);
chip_bus_sync_unlock(desc); chip_bus_sync_unlock(desc);

2
kernel/irq/migration.c
View File

@ -63,6 +63,6 @@ void move_native_irq(int irq)
desc->irq_data.chip->irq_mask(&desc->irq_data); 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->irq_unmask(&desc->irq_data);
} }