git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
gpio.c
diff --git
a/arch/arm/mach-s5p64x0/gpio.c
b/arch/arm/mach-s5p64x0/gpio.c
index
131eefe
..
39159dd
100644
(file)
--- 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;
{
void __iomem *reg = chip->base;
unsigned int shift;
- unsigned long flags;
u32 con;
switch (off) {
u32 con;
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 &= ~(0xf << shift);
con |= cfg;
__raw_writel(con, reg);
con = __raw_readl(reg);
con &= ~(0xf << shift);
con |= cfg;
__raw_writel(con, reg);
- s3c_gpio_unlock(chip, flags);
-
return 0;
}
return 0;
}