diff options
| -rw-r--r-- | arch/arm/mach-s5p64x0/gpio.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-s5p64x0/gpio.c b/arch/arm/mach-s5p64x0/gpio.c index 131eefe0c9f2..39159dd5a29a 100644 --- a/arch/arm/mach-s5p64x0/gpio.c +++ b/arch/arm/mach-s5p64x0/gpio.c | |||
| @@ -132,7 +132,6 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, | |||
| 132 | { | 132 | { |
| 133 | void __iomem *reg = chip->base; | 133 | void __iomem *reg = chip->base; |
| 134 | unsigned int shift; | 134 | unsigned int shift; |
| 135 | unsigned long flags; | ||
| 136 | u32 con; | 135 | u32 con; |
| 137 | 136 | ||
| 138 | switch (off) { | 137 | switch (off) { |
| @@ -158,15 +157,11 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, | |||
| 158 | cfg <<= shift; | 157 | cfg <<= shift; |
| 159 | } | 158 | } |
| 160 | 159 | ||
| 161 | s3c_gpio_lock(chip, flags); | ||
| 162 | |||
| 163 | con = __raw_readl(reg); | 160 | con = __raw_readl(reg); |
| 164 | con &= ~(0xf << shift); | 161 | con &= ~(0xf << shift); |
| 165 | con |= cfg; | 162 | con |= cfg; |
| 166 | __raw_writel(con, reg); | 163 | __raw_writel(con, reg); |
| 167 | 164 | ||
| 168 | s3c_gpio_unlock(chip, flags); | ||
| 169 | |||
| 170 | return 0; | 165 | return 0; |
| 171 | } | 166 | } |
| 172 | 167 | ||
