Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ARM] 4096/1: S3C24XX: change return code form s3c2410_gpio_getcfg()

Browse source 
The s3c2410_gpio_getcfg() currently returns
a value which is dependant on the GPIO no
passed in. Now we have more generic constants
it is sensible to use those as return codes
so that any function dealing with >1 GPIO
does not need to do it's own number processing.

Since this function is only currently used in
pm.c, it is easy to fixup (and correct pm.c
to use the generic constants)

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ben Dooks 2007-01-16 12:56:58 +01:00 committed by Russell King
parent 6c3c5bb3c6
commit 30f0e0f415
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/mach-s3c2410/gpio.c
View file

@ -84,15 +84,18 @@ EXPORT_SYMBOL(s3c2410_gpio_cfgpin);
unsigned int s3c2410_gpio_getcfg(unsigned int pin) unsigned int s3c2410_gpio_getcfg(unsigned int pin)
{ {
void __iomem *base = S3C24XX_GPIO_BASE(pin); void __iomem *base = S3C24XX_GPIO_BASE(pin);
unsigned long mask; unsigned long val = __raw_readl(base);
if (pin < S3C2410_GPIO_BANKB) { if (pin < S3C2410_GPIO_BANKB) {
mask = 1 << S3C2410_GPIO_OFFSET(pin); val >>= S3C2410_GPIO_OFFSET(pin);
val &= 1;
val += 1;
} else { } else {
mask = 3 << S3C2410_GPIO_OFFSET(pin)*2; val >>= S3C2410_GPIO_OFFSET(pin)*2;
val &= 3;
} }
return __raw_readl(base) & mask; return val | S3C2410_GPIO_INPUT;
} }
EXPORT_SYMBOL(s3c2410_gpio_getcfg); EXPORT_SYMBOL(s3c2410_gpio_getcfg);

7
arch/arm/mach-s3c2410/pm.c
View file

@ -451,15 +451,14 @@ static void s3c2410_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs)
irqstate = s3c_irqwake_eintmask & (1L<<irqoffs); irqstate = s3c_irqwake_eintmask & (1L<<irqoffs);
pinstate = s3c2410_gpio_getcfg(pin); pinstate = s3c2410_gpio_getcfg(pin);
pinstate >>= S3C2410_GPIO_OFFSET(pin)*2;
if (!irqstate) { if (!irqstate) {
if (pinstate == 0x02) if (pinstate == S3C2410_GPIO_IRQ)
DBG("Leaving IRQ %d (pin %d) enabled\n", irq, pin); DBG("Leaving IRQ %d (pin %d) enabled\n", irq, pin);
} else { } else {
if (pinstate == 0x02) { if (pinstate == S3C2410_GPIO_IRQ) {
DBG("Disabling IRQ %d (pin %d)\n", irq, pin); DBG("Disabling IRQ %d (pin %d)\n", irq, pin);
s3c2410_gpio_cfgpin(pin, 0x00); s3c2410_gpio_cfgpin(pin, S3C2410_GPIO_INPUT);
} }
} }
} }