diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 16:53:09 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 16:53:12 +0000 |
| commit | ba71e17269633ea36e776d744d5cc0fcb5a41f93 (patch) | |
| tree | 0a51c86e5c218ac2ae74ff8193880a64053a77bc /arch/arm/mach-sa1100/include/mach/gpio.h | |
| parent | ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request (diff) | |
| parent | collie: support pda_power driver (diff) | |
| download | linux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.tar.xz linux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.zip | |
Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/gpio.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h index 582a0c92da53..7befc104e9a9 100644 --- a/arch/arm/mach-sa1100/include/mach/gpio.h +++ b/arch/arm/mach-sa1100/include/mach/gpio.h @@ -49,20 +49,9 @@ static inline void gpio_set_value(unsigned gpio, int value) #define gpio_cansleep __gpio_cansleep -static inline unsigned gpio_to_irq(unsigned gpio) -{ - if (gpio < 11) - return IRQ_GPIO0 + gpio; - else - return IRQ_GPIO11 - 11 + gpio; -} - -static inline unsigned irq_to_gpio(unsigned irq) -{ - if (irq < IRQ_GPIO11_27) - return irq - IRQ_GPIO0; - else - return irq - IRQ_GPIO11 + 11; -} +#define gpio_to_irq(gpio) ((gpio < 11) ? (IRQ_GPIO0 + gpio) : \ + (IRQ_GPIO11 - 11 + gpio)) +#define irq_to_gpio(irq) ((irq < IRQ_GPIO11_27) ? (irq - IRQ_GPIO0) : \ + (irq - IRQ_GPIO11 + 11)) #endif |