[ARM] 4671/1: ep93xx: remove obsolete gpio_line_* operations

With the new GPIO methods in place the old gpio_line_* methods are redundant,
so this patch finally removes the old legacy gpio_line_* wrappers.

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 3 insertions, 25 deletions

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 2788da06417c..4cb3f742a6a1 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -189,6 +189,9 @@ static const u8 data_direction_register_offset[8] = {
         0x10, 0x14, 0x34, 0x1c, 0x24, 0x18, 0x3c, 0x44,
 };
 
+#define GPIO_IN         0
+#define GPIO_OUT        1
+
 static void ep93xx_gpio_set_direction(unsigned line, int direction)
 {
         unsigned int data_direction_register;
@@ -217,12 +220,6 @@ static void ep93xx_gpio_set_direction(unsigned line, int direction)
         local_irq_restore(flags);
 }
 
-void __deprecated gpio_line_config(int line, int direction)
-{
-        ep93xx_gpio_set_direction(line, direction);
-}
-EXPORT_SYMBOL(gpio_line_config);
-
 int gpio_direction_input(unsigned gpio)
 {
         if (gpio > EP93XX_GPIO_LINE_MAX)
diff --git a/include/asm-arm/arch-ep93xx/gpio.h b/include/asm-arm/arch-ep93xx/gpio.h
index cebb64be7e4b..9b1864bbd9a8 100644
--- a/include/asm-arm/arch-ep93xx/gpio.h
+++ b/include/asm-arm/arch-ep93xx/gpio.h
@@ -138,23 +138,4 @@ static inline int irq_to_gpio(unsigned irq)
         return irq - gpio_to_irq(0);
 }
 
-/* obsolete specific GPIO API */
-#define GPIO_IN                         0
-#define GPIO_OUT                        1
-
-#define EP93XX_GPIO_LOW                 0
-#define EP93XX_GPIO_HIGH                1
-
-void __deprecated gpio_line_config(int line, int direction);
-
-static inline int  __deprecated gpio_line_get(int line)
-{
-        return gpio_get_value(line);
-}
-
-static inline void __deprecated gpio_line_set(int line, int value)
-{
-        gpio_set_value(line, value);
-}
-
 #endif