mirror of
https://github.com/torvalds/linux.git
synced 2024-10-27 07:16:27 +00:00
genirq: Remove default magic
Now that everything uses the wrappers, we can remove the default functions. None of those functions is performance critical. That makes the IRQ_MASKED flag tracking fully consistent. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
87923470c7
commit
50f7c03275
|
@ -208,45 +208,29 @@ void irq_shutdown(struct irq_desc *desc)
|
||||||
{
|
{
|
||||||
desc->status |= IRQ_MASKED | IRQ_DISABLED;
|
desc->status |= IRQ_MASKED | IRQ_DISABLED;
|
||||||
desc->depth = 1;
|
desc->depth = 1;
|
||||||
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
|
if (desc->irq_data.chip->irq_shutdown)
|
||||||
|
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
|
||||||
|
if (desc->irq_data.chip->irq_disable)
|
||||||
|
desc->irq_data.chip->irq_disable(&desc->irq_data);
|
||||||
|
else
|
||||||
|
desc->irq_data.chip->irq_mask(&desc->irq_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
void irq_enable(struct irq_desc *desc)
|
void irq_enable(struct irq_desc *desc)
|
||||||
{
|
{
|
||||||
desc->irq_data.chip->irq_enable(&desc->irq_data);
|
if (desc->irq_data.chip->irq_enable)
|
||||||
|
desc->irq_data.chip->irq_enable(&desc->irq_data);
|
||||||
|
else
|
||||||
|
desc->irq_data.chip->irq_unmask(&desc->irq_data);
|
||||||
|
desc->status &= ~IRQ_MASKED;
|
||||||
}
|
}
|
||||||
|
|
||||||
void irq_disable(struct irq_desc *desc)
|
void irq_disable(struct irq_desc *desc)
|
||||||
{
|
{
|
||||||
desc->irq_data.chip->irq_disable(&desc->irq_data);
|
if (desc->irq_data.chip->irq_disable) {
|
||||||
}
|
desc->irq_data.chip->irq_disable(&desc->irq_data);
|
||||||
|
desc->status |= IRQ_MASKED;
|
||||||
/*
|
}
|
||||||
* default enable function
|
|
||||||
*/
|
|
||||||
static void default_enable(struct irq_data *data)
|
|
||||||
{
|
|
||||||
struct irq_desc *desc = irq_data_to_desc(data);
|
|
||||||
|
|
||||||
desc->irq_data.chip->irq_unmask(&desc->irq_data);
|
|
||||||
desc->status &= ~IRQ_MASKED;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* default disable function
|
|
||||||
*/
|
|
||||||
static void default_disable(struct irq_data *data)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* default shutdown function
|
|
||||||
*/
|
|
||||||
static void default_shutdown(struct irq_data *data)
|
|
||||||
{
|
|
||||||
struct irq_desc *desc = irq_data_to_desc(data);
|
|
||||||
|
|
||||||
desc->irq_data.chip->irq_mask(&desc->irq_data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
|
#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
|
||||||
|
@ -334,10 +318,6 @@ static void compat_bus_sync_unlock(struct irq_data *data)
|
||||||
void irq_chip_set_defaults(struct irq_chip *chip)
|
void irq_chip_set_defaults(struct irq_chip *chip)
|
||||||
{
|
{
|
||||||
#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
|
#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
|
||||||
/*
|
|
||||||
* Compat fixup functions need to be before we set the
|
|
||||||
* defaults for enable/disable/startup/shutdown
|
|
||||||
*/
|
|
||||||
if (chip->enable)
|
if (chip->enable)
|
||||||
chip->irq_enable = compat_irq_enable;
|
chip->irq_enable = compat_irq_enable;
|
||||||
if (chip->disable)
|
if (chip->disable)
|
||||||
|
@ -346,31 +326,8 @@ void irq_chip_set_defaults(struct irq_chip *chip)
|
||||||
chip->irq_shutdown = compat_irq_shutdown;
|
chip->irq_shutdown = compat_irq_shutdown;
|
||||||
if (chip->startup)
|
if (chip->startup)
|
||||||
chip->irq_startup = compat_irq_startup;
|
chip->irq_startup = compat_irq_startup;
|
||||||
#endif
|
|
||||||
/*
|
|
||||||
* The real defaults
|
|
||||||
*/
|
|
||||||
if (!chip->irq_enable)
|
|
||||||
chip->irq_enable = default_enable;
|
|
||||||
if (!chip->irq_disable)
|
|
||||||
chip->irq_disable = default_disable;
|
|
||||||
/*
|
|
||||||
* We use chip->irq_disable, when the user provided its own. When
|
|
||||||
* we have default_disable set for chip->irq_disable, then we need
|
|
||||||
* to use default_shutdown, otherwise the irq line is not
|
|
||||||
* disabled on free_irq():
|
|
||||||
*/
|
|
||||||
if (!chip->irq_shutdown)
|
|
||||||
chip->irq_shutdown = chip->irq_disable != default_disable ?
|
|
||||||
chip->irq_disable : default_shutdown;
|
|
||||||
|
|
||||||
#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
|
|
||||||
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)
|
||||||
|
|
|
@ -440,8 +440,8 @@ void enable_irq(unsigned int irq)
|
||||||
if (!desc)
|
if (!desc)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (WARN(!desc->irq_data.chip || !desc->irq_data.chip->irq_enable,
|
if (WARN(!desc->irq_data.chip,
|
||||||
KERN_ERR "enable_irq before setup/request_irq: irq %u\n", irq))
|
KERN_ERR "enable_irq before setup/request_irq: irq %u\n", irq))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
chip_bus_lock(desc);
|
chip_bus_lock(desc);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user