redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: S5P64X0: Fix GPIO rbank support

Browse source 
The patch removes s3c_gpio_lock/unlock to avoid acquiring the lock
recursively as lock is already acquired by calling function.

Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
[kgene.kim@samsung.com: removed useless variable due to this]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Atul Dahiya 2010-10-08 21:00:02 +09:00 committed by Kukjin Kim
parent d7297612ae
commit 3d4af5cac7
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-s5p64x0/gpio.c
View file

@ -132,7 +132,6 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
{ {
void __iomem *reg = chip->base; void __iomem *reg = chip->base;
unsigned int shift; unsigned int shift;
unsigned long flags;
u32 con; u32 con;
switch (off) { switch (off) {
@ -158,15 +157,11 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
cfg <<= shift; cfg <<= shift;
} }
s3c_gpio_lock(chip, flags);
con = __raw_readl(reg); con = __raw_readl(reg);
con &= ~(0xf << shift); con &= ~(0xf << shift);
con |= cfg; con |= cfg;
__raw_writel(con, reg); __raw_writel(con, reg);
s3c_gpio_unlock(chip, flags);
return 0; return 0;
} }