genirq: Provide compat handling for chip->disable()/shutdown()
Wrap the old chip functions disable() and shutdown() 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.532070631@linutronix.de> Reviewed-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
c5f756344c
commit
bc310dda41
|
@ -98,7 +98,7 @@ unsigned long probe_irq_on(void)
|
||||||
/* It triggered already - consider it spurious. */
|
/* It triggered already - consider it spurious. */
|
||||||
if (!(status & IRQ_WAITING)) {
|
if (!(status & IRQ_WAITING)) {
|
||||||
desc->status = status & ~IRQ_AUTODETECT;
|
desc->status = status & ~IRQ_AUTODETECT;
|
||||||
desc->irq_data.chip->shutdown(i);
|
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
|
||||||
} else
|
} else
|
||||||
if (i < 32)
|
if (i < 32)
|
||||||
mask |= 1 << i;
|
mask |= 1 << i;
|
||||||
|
@ -137,7 +137,7 @@ unsigned int probe_irq_mask(unsigned long val)
|
||||||
mask |= 1 << i;
|
mask |= 1 << i;
|
||||||
|
|
||||||
desc->status = status & ~IRQ_AUTODETECT;
|
desc->status = status & ~IRQ_AUTODETECT;
|
||||||
desc->irq_data.chip->shutdown(i);
|
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
|
||||||
}
|
}
|
||||||
raw_spin_unlock_irq(&desc->lock);
|
raw_spin_unlock_irq(&desc->lock);
|
||||||
}
|
}
|
||||||
|
@ -181,7 +181,7 @@ int probe_irq_off(unsigned long val)
|
||||||
nr_of_irqs++;
|
nr_of_irqs++;
|
||||||
}
|
}
|
||||||
desc->status = status & ~IRQ_AUTODETECT;
|
desc->status = status & ~IRQ_AUTODETECT;
|
||||||
desc->irq_data.chip->shutdown(i);
|
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
|
||||||
}
|
}
|
||||||
raw_spin_unlock_irq(&desc->lock);
|
raw_spin_unlock_irq(&desc->lock);
|
||||||
}
|
}
|
||||||
|
|
|
@ -298,7 +298,7 @@ static void default_enable(struct irq_data *data)
|
||||||
/*
|
/*
|
||||||
* default disable function
|
* default disable function
|
||||||
*/
|
*/
|
||||||
static void default_disable(unsigned int irq)
|
static void default_disable(struct irq_data *data)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,9 +316,9 @@ static unsigned int default_startup(unsigned int irq)
|
||||||
/*
|
/*
|
||||||
* default shutdown function
|
* default shutdown function
|
||||||
*/
|
*/
|
||||||
static void default_shutdown(unsigned int irq)
|
static void default_shutdown(struct irq_data *data)
|
||||||
{
|
{
|
||||||
struct irq_desc *desc = irq_to_desc(irq);
|
struct irq_desc *desc = irq_data_to_desc(data);
|
||||||
|
|
||||||
desc->irq_data.chip->irq_mask(&desc->irq_data);
|
desc->irq_data.chip->irq_mask(&desc->irq_data);
|
||||||
desc->status |= IRQ_MASKED;
|
desc->status |= IRQ_MASKED;
|
||||||
|
@ -355,6 +355,16 @@ static void compat_irq_enable(struct irq_data *data)
|
||||||
data->chip->enable(data->irq);
|
data->chip->enable(data->irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void compat_irq_disable(struct irq_data *data)
|
||||||
|
{
|
||||||
|
data->chip->disable(data->irq);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void compat_irq_shutdown(struct irq_data *data)
|
||||||
|
{
|
||||||
|
data->chip->shutdown(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);
|
||||||
|
@ -376,28 +386,35 @@ void irq_chip_set_defaults(struct irq_chip *chip)
|
||||||
*/
|
*/
|
||||||
if (chip->enable)
|
if (chip->enable)
|
||||||
chip->irq_enable = compat_irq_enable;
|
chip->irq_enable = compat_irq_enable;
|
||||||
|
if (chip->disable)
|
||||||
|
chip->irq_disable = compat_irq_disable;
|
||||||
|
if (chip->shutdown)
|
||||||
|
chip->irq_shutdown = compat_irq_shutdown;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The real defaults
|
* The real defaults
|
||||||
*/
|
*/
|
||||||
if (!chip->irq_enable)
|
if (!chip->irq_enable)
|
||||||
chip->irq_enable = default_enable;
|
chip->irq_enable = default_enable;
|
||||||
if (!chip->disable)
|
if (!chip->irq_disable)
|
||||||
chip->disable = default_disable;
|
chip->irq_disable = default_disable;
|
||||||
if (!chip->startup)
|
if (!chip->startup)
|
||||||
chip->startup = default_startup;
|
chip->startup = default_startup;
|
||||||
/*
|
/*
|
||||||
* We use chip->disable, when the user provided its own. When
|
* We use chip->irq_disable, when the user provided its own. When
|
||||||
* we have default_disable set for chip->disable, then we need
|
* we have default_disable set for chip->irq_disable, then we need
|
||||||
* to use default_shutdown, otherwise the irq line is not
|
* to use default_shutdown, otherwise the irq line is not
|
||||||
* disabled on free_irq():
|
* disabled on free_irq():
|
||||||
*/
|
*/
|
||||||
if (!chip->shutdown)
|
if (!chip->irq_shutdown)
|
||||||
chip->shutdown = chip->disable != default_disable ?
|
chip->irq_shutdown = chip->irq_disable != default_disable ?
|
||||||
chip->disable : default_shutdown;
|
chip->irq_disable : default_shutdown;
|
||||||
if (!chip->end)
|
if (!chip->end)
|
||||||
chip->end = dummy_irq_chip.end;
|
chip->end = dummy_irq_chip.end;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now fix up the remaining compat handlers
|
||||||
|
*/
|
||||||
if (chip->bus_lock)
|
if (chip->bus_lock)
|
||||||
chip->irq_bus_lock = compat_bus_lock;
|
chip->irq_bus_lock = compat_bus_lock;
|
||||||
if (chip->bus_sync_unlock)
|
if (chip->bus_sync_unlock)
|
||||||
|
|
|
@ -327,8 +327,6 @@ struct irq_chip no_irq_chip = {
|
||||||
.irq_disable = noop,
|
.irq_disable = noop,
|
||||||
.irq_ack = ack_bad,
|
.irq_ack = ack_bad,
|
||||||
.startup = compat_noop_ret,
|
.startup = compat_noop_ret,
|
||||||
.shutdown = compat_noop,
|
|
||||||
.disable = compat_noop,
|
|
||||||
.end = compat_noop,
|
.end = compat_noop,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -346,8 +344,6 @@ struct irq_chip dummy_irq_chip = {
|
||||||
.irq_mask = noop,
|
.irq_mask = noop,
|
||||||
.irq_unmask = noop,
|
.irq_unmask = noop,
|
||||||
.startup = compat_noop_ret,
|
.startup = compat_noop_ret,
|
||||||
.shutdown = compat_noop,
|
|
||||||
.disable = compat_noop,
|
|
||||||
.end = compat_noop,
|
.end = compat_noop,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -223,7 +223,7 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
|
||||||
|
|
||||||
if (!desc->depth++) {
|
if (!desc->depth++) {
|
||||||
desc->status |= IRQ_DISABLED;
|
desc->status |= IRQ_DISABLED;
|
||||||
desc->irq_data.chip->disable(irq);
|
desc->irq_data.chip->irq_disable(&desc->irq_data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -919,10 +919,10 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
|
||||||
/* If this was the last handler, shut down the IRQ line: */
|
/* If this was the last handler, shut down the IRQ line: */
|
||||||
if (!desc->action) {
|
if (!desc->action) {
|
||||||
desc->status |= IRQ_DISABLED;
|
desc->status |= IRQ_DISABLED;
|
||||||
if (desc->irq_data.chip->shutdown)
|
if (desc->irq_data.chip->irq_shutdown)
|
||||||
desc->irq_data.chip->shutdown(irq);
|
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
|
||||||
else
|
else
|
||||||
desc->irq_data.chip->disable(irq);
|
desc->irq_data.chip->irq_disable(&desc->irq_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
|
|
|
@ -254,7 +254,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
|
||||||
printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
|
printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
|
||||||
desc->status |= IRQ_DISABLED | IRQ_SPURIOUS_DISABLED;
|
desc->status |= IRQ_DISABLED | IRQ_SPURIOUS_DISABLED;
|
||||||
desc->depth++;
|
desc->depth++;
|
||||||
desc->irq_data.chip->disable(irq);
|
desc->irq_data.chip->irq_disable(&desc->irq_data);
|
||||||
|
|
||||||
mod_timer(&poll_spurious_irq_timer,
|
mod_timer(&poll_spurious_irq_timer,
|
||||||
jiffies + POLL_SPURIOUS_IRQ_INTERVAL);
|
jiffies + POLL_SPURIOUS_IRQ_INTERVAL);
|
||||||
|
|
Loading…
Reference in New Issue