ARM: sa1100: Open code gpio_request_array()

In order to prerare for removal of gpio_request_array(), open code
the latter. Note, we are not using gpio_request_one() as it's also
deprecated, hence reducing legacy API usage to the very basic ones.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 5e25dfa752e9087485717f4db32bc77e97ca6d46..1cfc0b1fa41ca4648dbf41846654bc56d5f77e59 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -20,16 +20,6 @@
 
 #include "generic.h"
 
-/*
- * helper for sa1100fb
- */
-static struct gpio h3600_lcd_gpio[] = {
-       { H3XXX_EGPIO_LCD_ON,   GPIOF_OUT_INIT_LOW,     "LCD power" },
-       { H3600_EGPIO_LCD_PCI,  GPIOF_OUT_INIT_LOW,     "LCD control" },
-       { H3600_EGPIO_LCD_5V_ON, GPIOF_OUT_INIT_LOW,    "LCD 5v" },
-       { H3600_EGPIO_LVDD_ON,  GPIOF_OUT_INIT_LOW,     "LCD 9v/-6.5v" },
-};
-
 static bool h3600_lcd_request(void)
 {
        static bool h3600_lcd_ok;
@@ -38,7 +28,42 @@ static bool h3600_lcd_request(void)
        if (h3600_lcd_ok)
                return true;
 
-       rc = gpio_request_array(h3600_lcd_gpio, ARRAY_SIZE(h3600_lcd_gpio));
+       rc = gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power");
+       if (rc)
+               goto out;
+       rc = gpio_direction_output(H3XXX_EGPIO_LCD_ON, 0);
+       if (rc)
+               goto out_free_on;
+       rc = gpio_request(H3600_EGPIO_LCD_PCI, "LCD control");
+       if (rc)
+               goto out_free_on;
+       rc = gpio_direction_output(H3600_EGPIO_LCD_PCI, 0);
+       if (rc)
+               goto out_free_pci;
+       rc = gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v");
+       if (rc)
+               goto out_free_pci;
+       rc = gpio_direction_output(H3600_EGPIO_LCD_5V_ON, 0);
+       if (rc)
+               goto out_free_5v_on;
+       rc = gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v");
+       if (rc)
+               goto out_free_5v_on;
+       rc = gpio_direction_output(H3600_EGPIO_LVDD_ON, 0);
+       if (rc)
+               goto out_free_lvdd_on;
+
+       goto out;
+
+out_free_lvdd_on:
+       gpio_free(H3600_EGPIO_LVDD_ON);
+out_free_5v_on:
+       gpio_free(H3600_EGPIO_LCD_5V_ON);
+out_free_pci:
+       gpio_free(H3600_EGPIO_LCD_PCI);
+out_free_on:
+       gpio_free(H3XXX_EGPIO_LCD_ON);
+out:
        if (rc)
                pr_err("%s: can't request GPIOs\n", __func__);
        else