Skip to content

Commit

Permalink
ARM: 5970/1: nomadik-gpio: fix spinlock usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rabin Vincent authored and Russell King committed Mar 19, 2010
1 parent 3a5e854 commit c0fcb8d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/plat-nomadik/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct nmk_gpio_chip {
struct gpio_chip chip;
void __iomem *addr;
unsigned int parent_irq;
spinlock_t *lock;
spinlock_t lock;
/* Keep track of configured edges */
u32 edge_rising;
u32 edge_falling;
Expand Down Expand Up @@ -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->chip = nmk_gpio_template;
nmk_chip->parent_irq = pdata->parent_irq;
spin_lock_init(&nmk_chip->lock);

chip = &nmk_chip->chip;
chip->base = pdata->first_gpio;
Expand Down

0 comments on commit c0fcb8d

Please sign in to comment.