Gitweb:     http://git.kernel.org/linus/c0fcb8dba829421fe20652a376a2bedaf168238f
Commit:     c0fcb8dba829421fe20652a376a2bedaf168238f
Parent:     3a5e854e09b77c49c8030c7dfd3a3f506571a89a
Author:     Rabin Vincent <rabin.vincent@stericsson.com>
AuthorDate: Wed Mar 3 04:48:54 2010 +0100
Committer:  Russell King <rmk+kernel@arm.linux.org.uk>
CommitDate: Fri Mar 19 18:29:31 2010 +0000

    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>
---
 arch/arm/plat-nomadik/gpio.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 9a09b27..a9ee988 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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html