genirq: Provide compat handling for chip->startup()
Wrap the old chip function startup() 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.635152961@linutronix.de> Reviewed-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
bc310dda41
commit
37e12df709
|
@ -59,7 +59,7 @@ unsigned long probe_irq_on(void)
|
||||||
*/
|
*/
|
||||||
if (desc->irq_data.chip->set_type)
|
if (desc->irq_data.chip->set_type)
|
||||||
desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE);
|
desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE);
|
||||||
desc->irq_data.chip->startup(i);
|
desc->irq_data.chip->irq_startup(&desc->irq_data);
|
||||||
}
|
}
|
||||||
raw_spin_unlock_irq(&desc->lock);
|
raw_spin_unlock_irq(&desc->lock);
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ unsigned long probe_irq_on(void)
|
||||||
raw_spin_lock_irq(&desc->lock);
|
raw_spin_lock_irq(&desc->lock);
|
||||||
if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
|
if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
|
||||||
desc->status |= IRQ_AUTODETECT | IRQ_WAITING;
|
desc->status |= IRQ_AUTODETECT | IRQ_WAITING;
|
||||||
if (desc->irq_data.chip->startup(i))
|
if (desc->irq_data.chip->irq_startup(&desc->irq_data))
|
||||||
desc->status |= IRQ_PENDING;
|
desc->status |= IRQ_PENDING;
|
||||||
}
|
}
|
||||||
raw_spin_unlock_irq(&desc->lock);
|
raw_spin_unlock_irq(&desc->lock);
|
||||||
|
|
|
@ -305,11 +305,11 @@ static void default_disable(struct irq_data *data)
|
||||||
/*
|
/*
|
||||||
* default startup function
|
* default startup function
|
||||||
*/
|
*/
|
||||||
static unsigned int default_startup(unsigned int irq)
|
static unsigned int default_startup(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_enable(&desc->irq_data);
|
desc->irq_data.chip->irq_enable(data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -365,6 +365,11 @@ static void compat_irq_shutdown(struct irq_data *data)
|
||||||
data->chip->shutdown(data->irq);
|
data->chip->shutdown(data->irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static unsigned int compat_irq_startup(struct irq_data *data)
|
||||||
|
{
|
||||||
|
return data->chip->startup(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);
|
||||||
|
@ -390,6 +395,8 @@ void irq_chip_set_defaults(struct irq_chip *chip)
|
||||||
chip->irq_disable = compat_irq_disable;
|
chip->irq_disable = compat_irq_disable;
|
||||||
if (chip->shutdown)
|
if (chip->shutdown)
|
||||||
chip->irq_shutdown = compat_irq_shutdown;
|
chip->irq_shutdown = compat_irq_shutdown;
|
||||||
|
if (chip->startup)
|
||||||
|
chip->irq_startup = compat_irq_startup;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The real defaults
|
* The real defaults
|
||||||
|
@ -398,8 +405,8 @@ void irq_chip_set_defaults(struct irq_chip *chip)
|
||||||
chip->irq_enable = default_enable;
|
chip->irq_enable = default_enable;
|
||||||
if (!chip->irq_disable)
|
if (!chip->irq_disable)
|
||||||
chip->irq_disable = default_disable;
|
chip->irq_disable = default_disable;
|
||||||
if (!chip->startup)
|
if (!chip->irq_startup)
|
||||||
chip->startup = default_startup;
|
chip->irq_startup = default_startup;
|
||||||
/*
|
/*
|
||||||
* We use chip->irq_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->irq_disable, then we need
|
* we have default_disable set for chip->irq_disable, then we need
|
||||||
|
@ -786,7 +793,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
|
||||||
desc->status &= ~IRQ_DISABLED;
|
desc->status &= ~IRQ_DISABLED;
|
||||||
desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE;
|
desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE;
|
||||||
desc->depth = 0;
|
desc->depth = 0;
|
||||||
desc->irq_data.chip->startup(irq);
|
desc->irq_data.chip->irq_startup(&desc->irq_data);
|
||||||
}
|
}
|
||||||
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
||||||
chip_bus_sync_unlock(desc);
|
chip_bus_sync_unlock(desc);
|
||||||
|
|
|
@ -311,11 +311,6 @@ static unsigned int noop_ret(struct irq_data *data)
|
||||||
|
|
||||||
static void compat_noop(unsigned int irq) { }
|
static void compat_noop(unsigned int irq) { }
|
||||||
|
|
||||||
static unsigned int compat_noop_ret(unsigned int irq)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generic no controller implementation
|
* Generic no controller implementation
|
||||||
*/
|
*/
|
||||||
|
@ -326,7 +321,6 @@ struct irq_chip no_irq_chip = {
|
||||||
.irq_enable = noop,
|
.irq_enable = noop,
|
||||||
.irq_disable = noop,
|
.irq_disable = noop,
|
||||||
.irq_ack = ack_bad,
|
.irq_ack = ack_bad,
|
||||||
.startup = compat_noop_ret,
|
|
||||||
.end = compat_noop,
|
.end = compat_noop,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -343,7 +337,6 @@ struct irq_chip dummy_irq_chip = {
|
||||||
.irq_ack = noop,
|
.irq_ack = noop,
|
||||||
.irq_mask = noop,
|
.irq_mask = noop,
|
||||||
.irq_unmask = noop,
|
.irq_unmask = noop,
|
||||||
.startup = compat_noop_ret,
|
|
||||||
.end = compat_noop,
|
.end = compat_noop,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -779,7 +779,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
|
||||||
if (!(desc->status & IRQ_NOAUTOEN)) {
|
if (!(desc->status & IRQ_NOAUTOEN)) {
|
||||||
desc->depth = 0;
|
desc->depth = 0;
|
||||||
desc->status &= ~IRQ_DISABLED;
|
desc->status &= ~IRQ_DISABLED;
|
||||||
desc->irq_data.chip->startup(irq);
|
desc->irq_data.chip->irq_startup(&desc->irq_data);
|
||||||
} else
|
} else
|
||||||
/* Undo nested disables: */
|
/* Undo nested disables: */
|
||||||
desc->depth = 1;
|
desc->depth = 1;
|
||||||
|
|
Loading…
Reference in New Issue