lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: 5970/1: nomadik-gpio: fix spinlock usage

Browse Source 
Fix the incorrect spinlock usage which leads to these compiler warnings:

arch/arm/plat-nomadik/gpio.c:60: warning: passing argument 1 of `spinlock_check' from incompatible pointer type
arch/arm/plat-nomadik/gpio.c:69: warning: passing argument 1 of `spin_unlock_irqrestore' from incompatible pointer type

Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Rabin Vincent
2010-03-03 04:48:54 +01:00
committed by Russell King
parent 3a5e854e09
commit c0fcb8dba8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/plat-nomadik/gpio.c
View File

@@ -36,7 +36,7 @@ struct nmk_gpio_chip {
struct gpio_chip chip; struct gpio_chip chip;
void __iomem *addr; void __iomem *addr;
unsigned int parent_irq; unsigned int parent_irq;
spinlock_t *lock; spinlock_t lock;
/* Keep track of configured edges */ /* Keep track of configured edges */
u32 edge_rising; u32 edge_rising;
u32 edge_falling; u32 edge_falling;
@@ -321,6 +321,7 @@ static int __init nmk_gpio_probe(struct amba_device *dev, struct amba_id *id)
nmk_chip->addr = io_p2v(dev->res.start); nmk_chip->addr = io_p2v(dev->res.start);
nmk_chip->chip = nmk_gpio_template; nmk_chip->chip = nmk_gpio_template;
nmk_chip->parent_irq = pdata->parent_irq; nmk_chip->parent_irq = pdata->parent_irq;
spin_lock_init(&nmk_chip->lock);
chip = &nmk_chip->chip; chip = &nmk_chip->chip;
chip->base = pdata->first_gpio; chip->base = pdata->first_gpio;