Skip to content

Commit

Permalink
ARM: S5P64X0: Fix GPIO rbank support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Atul Dahiya authored and Kukjin Kim committed Oct 18, 2010
1 parent d729761 commit 3d4af5c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions arch/arm/mach-s5p64x0/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
{
void __iomem *reg = chip->base;
unsigned int shift;
unsigned long flags;
u32 con;

switch (off) {
Expand All @@ -158,15 +157,11 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
cfg <<= shift;
}

s3c_gpio_lock(chip, flags);

con = __raw_readl(reg);
con &= ~(0xf << shift);
con |= cfg;
__raw_writel(con, reg);

s3c_gpio_unlock(chip, flags);

return 0;
}

Expand Down

0 comments on commit 3d4af5c

Please sign in to comment.