Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-sa1100 / h3600.c

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index b8dc5bd2262388d8dd56c20756ce5acd03e35b83..a663e723014142e2fb5fabfb81508e310e0c4c52 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -28,35 +28,39 @@
 /*
  * 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;
+       int rc;
+
+       if (h3600_lcd_ok)
+               return true;
+
+       rc = gpio_request_array(h3600_lcd_gpio, ARRAY_SIZE(h3600_lcd_gpio));
+       if (rc)
+               pr_err("%s: can't request GPIOs\n", __func__);
+       else
+               h3600_lcd_ok = true;
+
+       return h3600_lcd_ok;
+}
+
 static void h3600_lcd_power(int enable)
 {
-       if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power")) {
-               pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);
-               goto err1;
-       }
-       if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control")) {
-               pr_err("%s: can't request H3XXX_EGPIO_LCD_PCI\n", __func__);
-               goto err2;
-       }
-       if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v")) {
-               pr_err("%s: can't request H3XXX_EGPIO_LCD_5V_ON\n", __func__);
-               goto err3;
-       }
-       if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v")) {
-               pr_err("%s: can't request H3600_EGPIO_LVDD_ON\n", __func__);
-               goto err4;
-       }
+       if (!h3600_lcd_request())
+               return;
 
        gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);
        gpio_direction_output(H3600_EGPIO_LCD_PCI, enable);
        gpio_direction_output(H3600_EGPIO_LCD_5V_ON, enable);
        gpio_direction_output(H3600_EGPIO_LVDD_ON, enable);
-
-       gpio_free(H3600_EGPIO_LVDD_ON);
-err4:  gpio_free(H3600_EGPIO_LCD_5V_ON);
-err3:  gpio_free(H3600_EGPIO_LCD_PCI);
-err2:  gpio_free(H3XXX_EGPIO_LCD_ON);
-err1:  return;
 }
 
 static const struct sa1100fb_rgb h3600_rgb_16 = {
@@ -93,6 +97,11 @@ static void __init h3600_map_io(void)
 /*
  * This turns the IRDA power on or off on the Compaq H3600
  */
+static struct gpio h3600_irda_gpio[] = {
+       { H3600_EGPIO_IR_ON,    GPIOF_OUT_INIT_LOW, "IrDA power" },
+       { H3600_EGPIO_IR_FSEL,  GPIOF_OUT_INIT_LOW, "IrDA fsel" },
+};
+
 static int h3600_irda_set_power(struct device *dev, unsigned int state)
 {
        gpio_set_value(H3600_EGPIO_IR_ON, state);
@@ -106,29 +115,12 @@ static void h3600_irda_set_speed(struct device *dev, unsigned int speed)
 
 static int h3600_irda_startup(struct device *dev)
 {
-       int err = gpio_request(H3600_EGPIO_IR_ON, "IrDA power");
-       if (err)
-               goto err1;
-       err = gpio_direction_output(H3600_EGPIO_IR_ON, 0);
-       if (err)
-               goto err2;
-       err = gpio_request(H3600_EGPIO_IR_FSEL, "IrDA fsel");
-       if (err)
-               goto err2;
-       err = gpio_direction_output(H3600_EGPIO_IR_FSEL, 0);
-       if (err)
-               goto err3;
-       return 0;
-
-err3:  gpio_free(H3600_EGPIO_IR_FSEL);
-err2:  gpio_free(H3600_EGPIO_IR_ON);
-err1:  return err;
+       return gpio_request_array(h3600_irda_gpio, sizeof(h3600_irda_gpio));
 }
 
 static void h3600_irda_shutdown(struct device *dev)
 {
-       gpio_free(H3600_EGPIO_IR_ON);
-       gpio_free(H3600_EGPIO_IR_FSEL);
+       return gpio_free_array(h3600_irda_gpio, sizeof(h3600_irda_gpio));
 }
 
 static struct irda_platform_data h3600_irda_data = {