From: Atul Dahiya Date: Fri, 8 Oct 2010 12:00:02 +0000 (+0900) Subject: ARM: S5P64X0: Fix GPIO rbank support X-Git-Tag: upstream/snapshot3+hdmi~12565^2^2~2^2~103 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d4af5cac77f8d4f7422b1d00cb9e67000f94301;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ARM: S5P64X0: Fix GPIO rbank support 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 Signed-off-by: Sangbeom Kim [kgene.kim@samsung.com: removed useless variable due to this] Signed-off-by: Kukjin Kim --- diff --git a/arch/arm/mach-s5p64x0/gpio.c b/arch/arm/mach-s5p64x0/gpio.c index 131eefe..39159dd 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, { void __iomem *reg = chip->base; unsigned int shift; - unsigned long flags; u32 con; switch (off) { @@ -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; }