diff options
| author | Stephen Warren <swarren@nvidia.com> | 2011-08-23 00:39:57 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-24 08:28:38 +0100 |
| commit | ece88dc08b87501025927bf52e460655f89e2c02 (patch) | |
| tree | 80401ab46ecb8197a71ccb12ed07471ebe0dd3f6 | |
| parent | 438a99c078b1bc3c9aebd92e7928f2477311d3e5 (diff) | |
| download | op-kernel-dev-ece88dc08b87501025927bf52e460655f89e2c02.zip op-kernel-dev-ece88dc08b87501025927bf52e460655f89e2c02.tar.gz | |
ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
By not definining a custom gpio_to_irq, the default gpiolib version is
used, allowing platform consolidation.
irq_to_gpio is deprecated and in the process of being removed. Make that
happen now for ARM Tegra.
This also partially fixes the Tegra build; it was broken because gpio.h
referred to EINVAL, which wasn't always defined when <mach/gpio.h> was
included.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/gpio.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h index e353805..284a19e 100644 --- a/arch/arm/mach-tegra/include/mach/gpio.h +++ b/arch/arm/mach-tegra/include/mach/gpio.h @@ -26,22 +26,6 @@ #define TEGRA_NR_GPIOS INT_GPIO_NR #define TEGRA_GPIO_TO_IRQ(gpio) (INT_GPIO_BASE + (gpio)) -#define TEGRA_IRQ_TO_GPIO(irq) ((irq) - INT_GPIO_BASE) - -static inline int gpio_to_irq(unsigned int gpio) -{ - if (gpio < TEGRA_NR_GPIOS) - return INT_GPIO_BASE + gpio; - return -EINVAL; -} -#define gpio_to_irq gpio_to_irq - -static inline int irq_to_gpio(unsigned int irq) -{ - if ((irq >= INT_GPIO_BASE) && (irq < INT_GPIO_BASE + INT_GPIO_NR)) - return irq - INT_GPIO_BASE; - return -EINVAL; -} struct tegra_gpio_table { int gpio; /* GPIO number */ |
