From 8aa59f0859b3d6575859d7c41fbe66b6df4f71a7 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 27 Sep 2012 17:55:17 +0800 Subject: [PATCH] --- yaml --- r: 328494 b: refs/heads/master c: 58d26c1eab8e94f89f17593e11d88a3821be6c3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-sirf.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f721ed7849ba..8fa3699e9434 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dd9766f68f647692fa38f339fb70f9c8560e729 +refs/heads/master: 58d26c1eab8e94f89f17593e11d88a3821be6c3c diff --git a/trunk/drivers/pinctrl/pinctrl-sirf.c b/trunk/drivers/pinctrl/pinctrl-sirf.c index f309af2ced25..0f4f833e3c93 100644 --- a/trunk/drivers/pinctrl/pinctrl-sirf.c +++ b/trunk/drivers/pinctrl/pinctrl-sirf.c @@ -1458,15 +1458,10 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc) static inline void sirfsoc_gpio_set_input(struct sirfsoc_gpio_bank *bank, unsigned ctrl_offset) { u32 val; - unsigned long flags; - - spin_lock_irqsave(&bank->lock, flags); val = readl(bank->chip.regs + ctrl_offset); val &= ~SIRFSOC_GPIO_CTL_OUT_EN_MASK; writel(val, bank->chip.regs + ctrl_offset); - - spin_unlock_irqrestore(&bank->lock, flags); } static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset)