diff options
| author | Uwe Kleine König <u.kleine-koenig@pengutronix.de> | 2018-03-19 11:52:02 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 08:52:44 +0100 |
| commit | 83ac4ca943affce56a2c408ddb2f5232f478fb11 (patch) | |
| tree | cff6f9602d3c4b24841e45f325a2d136c40e378c /kernel/irq | |
| parent | cc6c98485f8e61fb3d6c51821fc75384e5a3a9c3 (diff) | |
| download | linux-stable-83ac4ca943affce56a2c408ddb2f5232f478fb11.tar.gz linux-stable-83ac4ca943affce56a2c408ddb2f5232f478fb11.tar.bz2 linux-stable-83ac4ca943affce56a2c408ddb2f5232f478fb11.zip | |
genirq: Pass desc to __irq_free instead of irq number
Given that irq_to_desc() is a radix_tree_lookup and the reverse
operation is only a pointer dereference and that all callers of
__free_irq already have the desc, pass the desc instead of the irq
number.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: kernel@pengutronix.de
Link: https://lkml.kernel.org/r/20180319105202.9794-1-u.kleine-koenig@pengutronix.de
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/manage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index d2b3c59f1200..b0aa23b2398e 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1523,9 +1523,9 @@ EXPORT_SYMBOL_GPL(setup_irq); * Internal function to unregister an irqaction - used to free * regular and special interrupts that are part of the architecture. */ -static struct irqaction *__free_irq(unsigned int irq, void *dev_id) +static struct irqaction *__free_irq(struct irq_desc *desc, void *dev_id) { - struct irq_desc *desc = irq_to_desc(irq); + unsigned irq = desc->irq_data.irq; struct irqaction *action, **action_ptr; unsigned long flags; @@ -1655,7 +1655,7 @@ void remove_irq(unsigned int irq, struct irqaction *act) struct irq_desc *desc = irq_to_desc(irq); if (desc && !WARN_ON(irq_settings_is_per_cpu_devid(desc))) - __free_irq(irq, act->dev_id); + __free_irq(desc, act->dev_id); } EXPORT_SYMBOL_GPL(remove_irq); @@ -1689,7 +1689,7 @@ const void *free_irq(unsigned int irq, void *dev_id) desc->affinity_notify = NULL; #endif - action = __free_irq(irq, dev_id); + action = __free_irq(desc, dev_id); if (!action) return NULL; |