linux-mips
[Top] [All Lists]

[PATCH 4/8] bcm63xx: restore spinlock in gpio.

To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 4/8] bcm63xx: restore spinlock in gpio.
From: Maxime Bizon <mbizon@freebox.fr>
Date: Wed, 3 Jun 2009 16:02:23 +0200
Cc: Florian Fainelli <florian@openwrt.org>, Maxime Bizon <mbizon@freebox.fr>
In-reply-to: <1244037747-27144-1-git-send-email-mbizon@freebox.fr>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1244037747-27144-1-git-send-email-mbizon@freebox.fr>
Sender: linux-mips-bounce@linux-mips.org
gpiolib does not do any locking around chip callbacks, local_irq_save
is enough for now but try to stay future-proof.

Fix indentation too.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
 arch/mips/bcm63xx/gpio.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index 77636aa..53e4664 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -18,10 +18,11 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
 
+static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
 static u32 gpio_out_low, gpio_out_high;
 
 static void bcm63xx_gpio_set(struct gpio_chip *chip,
-                               unsigned gpio, int val)
+                            unsigned gpio, int val)
 {
        u32 reg;
        u32 mask;
@@ -41,13 +42,13 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip,
                v = &gpio_out_high;
        }
 
-       local_irq_save(flags);
+       spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
        if (val)
                *v |= mask;
        else
                *v &= ~mask;
        bcm_gpio_writel(*v, reg);
-       local_irq_restore(flags);
+       spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags);
 }
 
 static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)
@@ -70,7 +71,7 @@ static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned 
gpio)
 }
 
 static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
-                                       unsigned gpio, int dir)
+                                     unsigned gpio, int dir)
 {
        u32 reg;
        u32 mask;
@@ -88,14 +89,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip 
*chip,
                mask = 1 << (gpio - 32);
        }
 
-       local_irq_save(flags);
+       spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
        tmp = bcm_gpio_readl(reg);
        if (dir == GPIO_DIR_IN)
                tmp &= ~mask;
        else
                tmp |= mask;
        bcm_gpio_writel(tmp, reg);
-       local_irq_restore(flags);
+       spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags);
 
        return 0;
 }
@@ -106,7 +107,7 @@ static int bcm63xx_gpio_direction_input(struct gpio_chip 
*chip, unsigned gpio)
 }
 
 static int bcm63xx_gpio_direction_output(struct gpio_chip *chip,
-                                       unsigned gpio, int value)
+                                        unsigned gpio, int value)
 {
        bcm63xx_gpio_set(chip, gpio, value);
        return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT);
-- 
1.6.0.4


<Prev in Thread] Current Thread [Next in Thread>