Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0fcb8db authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

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



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: default avatarAlessandro Rubini <rubini@unipv.it>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3a5e854e

arch/arm/plat-nomadik/gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -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;