Skip to content

Commit

Permalink
[ARM] S3C24XX: GPIO: Fix error returns from gpio functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ben Dooks committed May 18, 2009
1 parent 070276d commit 373e964
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-s3c2400/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

int s3c2400_gpio_getirq(unsigned int pin)
{
if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE7_EINT7)
return -1; /* not valid interrupts */
if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE(7))
return -EINVAL; /* not valid interrupts */

return (pin - S3C2410_GPE(0)) + IRQ_EINT0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2410/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
unsigned long val;

if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15))
return -1;
return -EINVAL;

config &= 0xff;

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/plat-s3c24xx/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ EXPORT_SYMBOL(s3c2410_modify_misccr);
int s3c2410_gpio_getirq(unsigned int pin)
{
if (pin < S3C2410_GPF(0) || pin > S3C2410_GPG(15))
return -1; /* not valid interrupts */
return -EINVAL; /* not valid interrupts */

if (pin < S3C2410_GPG(0) && pin > S3C2410_GPF(7))
return -1; /* not valid pin */
return -EINVAL; /* not valid pin */

if (pin < S3C2410_GPF(4))
return (pin - S3C2410_GPF(0)) + IRQ_EINT0;
Expand Down

0 comments on commit 373e964

Please sign in to comment.