genirq: Fix typo and remove unused variable

Sigh, I'm overworked.

Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 5e81d34b08d60289d227c52b34b010c3b8af363e..e33d9c8d50896494409e77f7b28f1e5deee1ae97 100644 (file)
--- 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 cd424cdf17fcf407692e5621cee62631ee680636..83f4799f46be674af37403ed82ae1aedbc992d4d 100644 (file)
--- 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