diff options
| author | Matteo Croce <rootkit85@yahoo.it> | 2007-10-23 15:45:54 +0000 |
|---|---|---|
| committer | Matteo Croce <rootkit85@yahoo.it> | 2007-10-23 15:45:54 +0000 |
| commit | 788a010131706f80582e9577d2fa43fb8b33e22b (patch) | |
| tree | ef4c44a63c3e908af71336abaae489a4fb2de347 | |
| parent | 71f9b205e495e01a36f17bf87a9118b414ab65c8 (diff) | |
| download | upstream-788a010131706f80582e9577d2fa43fb8b33e22b.tar.gz upstream-788a010131706f80582e9577d2fa43fb8b33e22b.tar.bz2 upstream-788a010131706f80582e9577d2fa43fb8b33e22b.zip | |
ar7_gpio: remove unneeded checks and volatile
SVN-Revision: 9419
| -rw-r--r-- | target/linux/ar7/files/include/asm-mips/ar7/gpio.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h index a7ae1eeae1..2e19fcae9d 100644 --- a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h +++ b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h @@ -31,20 +31,14 @@ static inline int gpio_get_value(unsigned gpio) void __iomem *gpio_in = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT); - if (gpio >= AR7_GPIO_MAX) - return -EINVAL; - - return ((readl(gpio_in) & (1 << gpio)) != 0); + return readl(gpio_in) & (1 << gpio); } static inline void gpio_set_value(unsigned gpio, int value) { void __iomem *gpio_out = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT); - volatile unsigned tmp; - - if (gpio >= AR7_GPIO_MAX) - return; + unsigned tmp; tmp = readl(gpio_out) & ~(1 << gpio); if (value) @@ -95,9 +89,6 @@ static inline int ar7_gpio_enable(unsigned gpio) void __iomem *gpio_en = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE); - if (gpio >= AR7_GPIO_MAX) - return -EINVAL; - writel(readl(gpio_en) | (1 << gpio), gpio_en); return 0; @@ -108,9 +99,6 @@ static inline int ar7_gpio_disable(unsigned gpio) void __iomem *gpio_en = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE); - if (gpio >= AR7_GPIO_MAX) - return -EINVAL; - writel(readl(gpio_en) & ~(1 << gpio), gpio_en); return 0; |