summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik/gpio.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-03-03 04:48:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-19 19:29:31 +0100
commitc0fcb8dba829421fe20652a376a2bedaf168238f (patch)
treef1c6afccd8c5bd09177415a8874dbd941f58e286 /arch/arm/plat-nomadik/gpio.c
parentARM: 5969/1: nomadik: move gpio to plat-nomadik (diff)
downloadlinux-c0fcb8dba829421fe20652a376a2bedaf168238f.tar.xz
linux-c0fcb8dba829421fe20652a376a2bedaf168238f.zip
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: 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>
Diffstat (limited to 'arch/arm/plat-nomadik/gpio.c')
-rw-r--r--arch/arm/plat-nomadik/gpio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 9a09b2791e03..a9ee9889a833 100644
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -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;