diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 14:40:18 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 14:40:18 -0400 |
| commit | 373e9644c5f557bc8992036f9a9281e9d98aef40 (patch) | |
| tree | 44a0c82e8405fc452965d52719611a6faa8839d5 | |
| parent | 070276d5d049f385763dee19112bea08f56c9a0d (diff) | |
[ARM] S3C24XX: GPIO: Fix error returns from gpio functions
Several GPIO functions have been returning -1 to indicate
an error instead of returning a proper error code. Change
to return -EINVAL for invalid argument(s).
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c2400/gpio.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/gpio.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/gpio.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2400/gpio.c b/arch/arm/mach-s3c2400/gpio.c index 81ebe2f09901..6c68e78f3595 100644 --- a/arch/arm/mach-s3c2400/gpio.c +++ b/arch/arm/mach-s3c2400/gpio.c | |||
| @@ -33,8 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | int s3c2400_gpio_getirq(unsigned int pin) | 34 | int s3c2400_gpio_getirq(unsigned int pin) |
| 35 | { | 35 | { |
| 36 | if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE7_EINT7) | 36 | if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE(7)) |
| 37 | return -1; /* not valid interrupts */ | 37 | return -EINVAL; /* not valid interrupts */ |
| 38 | 38 | ||
| 39 | return (pin - S3C2410_GPE(0)) + IRQ_EINT0; | 39 | return (pin - S3C2410_GPE(0)) + IRQ_EINT0; |
| 40 | } | 40 | } |
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c index bf7fbfe7e4d8..7974afca297c 100644 --- a/arch/arm/mach-s3c2410/gpio.c +++ b/arch/arm/mach-s3c2410/gpio.c | |||
| @@ -40,7 +40,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
| 40 | unsigned long val; | 40 | unsigned long val; |
| 41 | 41 | ||
| 42 | if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15)) | 42 | if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15)) |
| 43 | return -1; | 43 | return -EINVAL; |
| 44 | 44 | ||
| 45 | config &= 0xff; | 45 | config &= 0xff; |
| 46 | 46 | ||
diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c index ae0b9d6f3fb8..95df059b5a1d 100644 --- a/arch/arm/plat-s3c24xx/gpio.c +++ b/arch/arm/plat-s3c24xx/gpio.c | |||
| @@ -184,10 +184,10 @@ EXPORT_SYMBOL(s3c2410_modify_misccr); | |||
| 184 | int s3c2410_gpio_getirq(unsigned int pin) | 184 | int s3c2410_gpio_getirq(unsigned int pin) |
| 185 | { | 185 | { |
| 186 | if (pin < S3C2410_GPF(0) || pin > S3C2410_GPG(15)) | 186 | if (pin < S3C2410_GPF(0) || pin > S3C2410_GPG(15)) |
| 187 | return -1; /* not valid interrupts */ | 187 | return -EINVAL; /* not valid interrupts */ |
| 188 | 188 | ||
| 189 | if (pin < S3C2410_GPG(0) && pin > S3C2410_GPF(7)) | 189 | if (pin < S3C2410_GPG(0) && pin > S3C2410_GPF(7)) |
| 190 | return -1; /* not valid pin */ | 190 | return -EINVAL; /* not valid pin */ |
| 191 | 191 | ||
| 192 | if (pin < S3C2410_GPF(4)) | 192 | if (pin < S3C2410_GPF(4)) |
| 193 | return (pin - S3C2410_GPF(0)) + IRQ_EINT0; | 193 | return (pin - S3C2410_GPF(0)) + IRQ_EINT0; |
