diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 20:26:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 20:26:05 -0500 |
commit | cd6e125c58ae1561bedb6ea6f70b00d6c2599d62 (patch) | |
tree | cbed14647878227212ea32cd9fbc1e6a7c1fb6aa /drivers/mfd | |
parent | df9d1e8a4379119cbc47c474f168b5103e404e17 (diff) |
twl4030-irq.c: fix compiler warning due to raw-spinlock conversion
Commit 239007b844 ("genirq: Convert irq_desc.lock to raw_spinlock")
seems to have missed this driver, leaving it to use the normal spin-lock
functions for the irq descriptor lock, which is now a raw lock.
Reported-and-compile-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl4030-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 20d29bafc9f5..9df9a5ad38f9 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c | |||
@@ -568,12 +568,12 @@ static void twl4030_sih_do_edge(struct work_struct *work) | |||
568 | 568 | ||
569 | bytes[byte] &= ~(0x03 << off); | 569 | bytes[byte] &= ~(0x03 << off); |
570 | 570 | ||
571 | spin_lock_irq(&d->lock); | 571 | raw_spin_lock_irq(&d->lock); |
572 | if (d->status & IRQ_TYPE_EDGE_RISING) | 572 | if (d->status & IRQ_TYPE_EDGE_RISING) |
573 | bytes[byte] |= BIT(off + 1); | 573 | bytes[byte] |= BIT(off + 1); |
574 | if (d->status & IRQ_TYPE_EDGE_FALLING) | 574 | if (d->status & IRQ_TYPE_EDGE_FALLING) |
575 | bytes[byte] |= BIT(off + 0); | 575 | bytes[byte] |= BIT(off + 0); |
576 | spin_unlock_irq(&d->lock); | 576 | raw_spin_unlock_irq(&d->lock); |
577 | 577 | ||
578 | edge_change &= ~BIT(i); | 578 | edge_change &= ~BIT(i); |
579 | } | 579 | } |