diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-28 20:28:56 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-28 20:28:56 +0200 |
commit | a6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296 (patch) | |
tree | 18350cbcc8aa5619e98e5f56750828da300db537 /kernel | |
parent | 30398bf6c684a77274dbdabf7efc1f24e4a99028 (diff) | |
download | linux-stable-a6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296.tar.gz linux-stable-a6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296.tar.bz2 linux-stable-a6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296.zip |
genirq: Fix typo and remove unused variable
Sigh, I'm overworked.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/migration.c | 1 | ||||
-rw-r--r-- | kernel/irq/spurious.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index 5e81d34b08d6..e33d9c8d5089 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c @@ -60,7 +60,6 @@ void move_masked_irq(int irq) void irq_move_irq(struct irq_data *idata) { - struct irq_desc *desc = irq_data_to_desc(idata); bool masked; if (likely(!irqd_is_setaffinity_pending(idata))) diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index cd424cdf17fc..83f4799f46be 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -48,7 +48,7 @@ bool irq_wait_for_poll(struct irq_desc *desc) while (irqd_irq_inprogress(&desc->irq_data)) cpu_relax(); raw_spin_lock(&desc->lock); - } while irqd_irq_inprogress(&desc->irq_data); + } while (irqd_irq_inprogress(&desc->irq_data)); /* Might have been disabled in meantime */ return !irqd_irq_disabled(&desc->irq_data) && desc->action; #else |