iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genirq: Get rid of unneeded force parameter in irq_finalize_oneshot()

Browse Source 
The only place irq_finalize_oneshot() is called with force parameter set
is the threaded handler error exit path. But IRQTF_RUNTHREAD is dropped
at this point and irq_wake_thread() is not going to set it again,
since PF_EXITING is set for this thread already. So irq_finalize_oneshot()
will drop the threads bit in threads_oneshot anyway and hence the force
parameter is superfluous.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Link: http://lkml.kernel.org/r/20120321162234.GP24806@dhcp-26-207.brq.redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Alexander Gordeev 2012-03-21 17:22:35 +01:00 committed by Thomas Gleixner
parent 69592db298
commit f3f79e38d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/irq/manage.c
View File

@ -645,7 +645,7 @@ static int irq_wait_for_interrupt(struct irqaction *action)
* is marked MASKED. * is marked MASKED.
*/ */
static void irq_finalize_oneshot(struct irq_desc *desc, static void irq_finalize_oneshot(struct irq_desc *desc,
struct irqaction *action, bool force) struct irqaction *action)
{ {
if (!(desc->istate & IRQS_ONESHOT)) if (!(desc->istate & IRQS_ONESHOT))
return; return;
@ -679,7 +679,7 @@ again:
* we would clear the threads_oneshot bit of this thread which * we would clear the threads_oneshot bit of this thread which
* was just set. * was just set.
*/ */
if (!force && test_bit(IRQTF_RUNTHREAD, &action->thread_flags)) if (test_bit(IRQTF_RUNTHREAD, &action->thread_flags))
goto out_unlock; goto out_unlock;
desc->threads_oneshot &= ~action->thread_mask; desc->threads_oneshot &= ~action->thread_mask;
@ -739,7 +739,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
local_bh_disable(); local_bh_disable();
ret = action->thread_fn(action->irq, action->dev_id); ret = action->thread_fn(action->irq, action->dev_id);
irq_finalize_oneshot(desc, action, false); irq_finalize_oneshot(desc, action);
local_bh_enable(); local_bh_enable();
return ret; return ret;
} }
@ -755,7 +755,7 @@ static irqreturn_t irq_thread_fn(struct irq_desc *desc,
irqreturn_t ret; irqreturn_t ret;
ret = action->thread_fn(action->irq, action->dev_id); ret = action->thread_fn(action->irq, action->dev_id);
irq_finalize_oneshot(desc, action, false); irq_finalize_oneshot(desc, action);
return ret; return ret;
} }
@ -844,7 +844,7 @@ void exit_irq_thread(void)
wake_threads_waitq(desc); wake_threads_waitq(desc);
/* Prevent a stale desc->threads_oneshot */ /* Prevent a stale desc->threads_oneshot */
irq_finalize_oneshot(desc, action, true); irq_finalize_oneshot(desc, action);
} }
static void irq_setup_forced_threading(struct irqaction *new) static void irq_setup_forced_threading(struct irqaction *new)