ARM: pxa: spitz: 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-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 8bc4ea51a0c164f9fa8bbabb98623a96e8820fd4..03b4b347f11a07c3f4c1a2016e32e98d91f7da15 100644 (file)
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -35,18 +35,20 @@
 
 static int spitz_last_ac_status;
 
-static struct gpio spitz_charger_gpios[] = {
-       { SPITZ_GPIO_KEY_INT,   GPIOF_IN, "Keyboard Interrupt" },
-       { SPITZ_GPIO_SYNC,      GPIOF_IN, "Sync" },
-       { SPITZ_GPIO_AC_IN,     GPIOF_IN, "Charger Detection" },
-       { SPITZ_GPIO_ADC_TEMP_ON, GPIOF_OUT_INIT_LOW, "ADC Temp On" },
-       { SPITZ_GPIO_JK_B,        GPIOF_OUT_INIT_LOW, "JK B" },
-       { SPITZ_GPIO_CHRG_ON,     GPIOF_OUT_INIT_LOW, "Charger On" },
-};
-
 static void spitz_charger_init(void)
 {
-       gpio_request_array(ARRAY_AND_SIZE(spitz_charger_gpios));
+       gpio_request(SPITZ_GPIO_KEY_INT, "Keyboard Interrupt");
+       gpio_direction_input(SPITZ_GPIO_KEY_INT);
+       gpio_request(SPITZ_GPIO_SYNC, "Sync");
+       gpio_direction_input(SPITZ_GPIO_SYNC);
+       gpio_request(SPITZ_GPIO_AC_IN, "Charger Detection");
+       gpio_direction_input(SPITZ_GPIO_AC_IN);
+       gpio_request(SPITZ_GPIO_ADC_TEMP_ON, "ADC Temp On");
+       gpio_direction_output(SPITZ_GPIO_ADC_TEMP_ON, 0);
+       gpio_request(SPITZ_GPIO_JK_B, "JK B");
+       gpio_direction_output(SPITZ_GPIO_JK_B, 0);
+       gpio_request(SPITZ_GPIO_CHRG_ON, "Charger On");
+       gpio_direction_output(SPITZ_GPIO_CHRG_ON, 0);
 }
 
 static void spitz_measure_temp(int on)