On Fri, 1 Jan 2010, Stephen Rothwell wrote:
>
> Today's linux-next build (powerpc allyesconfig) produced these warnings:
>
> drivers/mfd/twl4030-irq.c: In function 'twl4030_sih_do_edge':
> drivers/mfd/twl4030-irq.c:571: warning: passing argument 1 of 'spin_lock_irq' from incompatible pointer type
> include/linux/spinlock.h:304: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
> drivers/mfd/twl4030-irq.c:576: warning: passing argument 1 of 'spin_unlock_irq' from incompatible pointer type
> include/linux/spinlock.h:329: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
>
> Introduced by commit 239007b8440abff689632f50cdf0f2b9e895b534 ("genirq:
> Convert irq_desc.lock to raw_spinlock"). I guess that this file was
> missed in the conversion.
Ok, I tested and committed the other warning you pointed out, but this one
I can't test since I no longer do powerpc builds. I assume the trivial fix
below fixes it, but without testing I won't be committing it.
Linus
---
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 20d29ba..9df9a5a 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)
bytes[byte] &= ~(0x03 << off);
- spin_lock_irq(&d->lock);
+ raw_spin_lock_irq(&d->lock);
if (d->status & IRQ_TYPE_EDGE_RISING)
bytes[byte] |= BIT(off + 1);
if (d->status & IRQ_TYPE_EDGE_FALLING)
bytes[byte] |= BIT(off + 0);
- spin_unlock_irq(&d->lock);
+ raw_spin_unlock_irq(&d->lock);
edge_change &= ~BIT(i);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
