staging: olpc_dcon: olpc_dcon_xo_1.c: Switch to the gpio descriptor interface

Use the gpiod interface instead of the deprecated old non-descriptor
interface in olpc_dcon_xo_1.c.

Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index ff145d493e1b5262fe111836bf45b6c7c6322eff..80b8d4153414a80d555d1dfe87fb48e77e684e10 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -11,35 +11,51 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/cs5535.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/delay.h>
+#include <linux/i2c.h>
 #include <asm/olpc.h>
 
 #include "olpc_dcon.h"
 
+enum dcon_gpios {
+       OLPC_DCON_STAT0,
+       OLPC_DCON_STAT1,
+       OLPC_DCON_IRQ,
+       OLPC_DCON_LOAD,
+       OLPC_DCON_BLANK,
+};
+
+struct dcon_gpio {
+       const char *name;
+       unsigned long flags;
+};
+
+static const struct dcon_gpio gpios_asis[] = {
+       [OLPC_DCON_STAT0] = { .name = "dcon_stat0", .flags = GPIOD_ASIS },
+       [OLPC_DCON_STAT1] = { .name = "dcon_stat1", .flags = GPIOD_ASIS },
+       [OLPC_DCON_IRQ] = { .name = "dcon_irq", .flags = GPIOD_ASIS },
+       [OLPC_DCON_LOAD] = { .name = "dcon_load", .flags = GPIOD_ASIS },
+       [OLPC_DCON_BLANK] = { .name = "dcon_blank", .flags = GPIOD_ASIS },
+};
+
+struct gpio_desc *gpios[5];
+
 static int dcon_init_xo_1(struct dcon_priv *dcon)
 {
        unsigned char lob;
-
-       if (gpio_request(OLPC_GPIO_DCON_STAT0, "OLPC-DCON")) {
-               pr_err("failed to request STAT0 GPIO\n");
-               return -EIO;
-       }
-       if (gpio_request(OLPC_GPIO_DCON_STAT1, "OLPC-DCON")) {
-               pr_err("failed to request STAT1 GPIO\n");
-               goto err_gp_stat1;
-       }
-       if (gpio_request(OLPC_GPIO_DCON_IRQ, "OLPC-DCON")) {
-               pr_err("failed to request IRQ GPIO\n");
-               goto err_gp_irq;
-       }
-       if (gpio_request(OLPC_GPIO_DCON_LOAD, "OLPC-DCON")) {
-               pr_err("failed to request LOAD GPIO\n");
-               goto err_gp_load;
-       }
-       if (gpio_request(OLPC_GPIO_DCON_BLANK, "OLPC-DCON")) {
-               pr_err("failed to request BLANK GPIO\n");
-               goto err_gp_blank;
+       int ret, i;
+       struct dcon_gpio *pin = &gpios_asis[0];
+
+       for (i = 0; i < ARRAY_SIZE(gpios_asis); i++) {
+               gpios[i] = devm_gpiod_get(&dcon->client->dev, pin[i].name,
+                                         pin[i].flags);
+               if (IS_ERR(gpios[i])) {
+                       ret = PTR_ERR(gpios[i]);
+                       pr_err("failed to request %s GPIO: %d\n", pin[i].name,
+                              ret);
+                       return ret;
+               }
        }
 
        /* Turn off the event enable for GPIO7 just to be safe */
@@ -61,12 +77,12 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
        dcon->pending_src = dcon->curr_src;
 
        /* Set the directions for the GPIO pins */
-       gpio_direction_input(OLPC_GPIO_DCON_STAT0);
-       gpio_direction_input(OLPC_GPIO_DCON_STAT1);
-       gpio_direction_input(OLPC_GPIO_DCON_IRQ);
-       gpio_direction_input(OLPC_GPIO_DCON_BLANK);
-       gpio_direction_output(OLPC_GPIO_DCON_LOAD,
-                             dcon->curr_src == DCON_SOURCE_CPU);
+       gpiod_direction_input(gpios[OLPC_DCON_STAT0]);
+       gpiod_direction_input(gpios[OLPC_DCON_STAT1]);
+       gpiod_direction_input(gpios[OLPC_DCON_IRQ]);
+       gpiod_direction_input(gpios[OLPC_DCON_BLANK]);
+       gpiod_direction_output(gpios[OLPC_DCON_LOAD],
+                              dcon->curr_src == DCON_SOURCE_CPU);
 
        /* Set up the interrupt mappings */
 
@@ -84,7 +100,7 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
        /* Register the interrupt handler */
        if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) {
                pr_err("failed to request DCON's irq\n");
-               goto err_req_irq;
+               return -EIO;
        }
 
        /* Clear INV_EN for GPIO7 (DCONIRQ) */
@@ -125,18 +141,6 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
        cs5535_gpio_set(OLPC_GPIO_DCON_BLANK, GPIO_EVENTS_ENABLE);
 
        return 0;
-
-err_req_irq:
-       gpio_free(OLPC_GPIO_DCON_BLANK);
-err_gp_blank:
-       gpio_free(OLPC_GPIO_DCON_LOAD);
-err_gp_load:
-       gpio_free(OLPC_GPIO_DCON_IRQ);
-err_gp_irq:
-       gpio_free(OLPC_GPIO_DCON_STAT1);
-err_gp_stat1:
-       gpio_free(OLPC_GPIO_DCON_STAT0);
-       return -EIO;
 }
 
 static void dcon_wiggle_xo_1(void)
@@ -180,13 +184,13 @@ static void dcon_wiggle_xo_1(void)
 
 static void dcon_set_dconload_1(int val)
 {
-       gpio_set_value(OLPC_GPIO_DCON_LOAD, val);
+       gpiod_set_value(gpios[OLPC_DCON_LOAD], val);
 }
 
 static int dcon_read_status_xo_1(u8 *status)
 {
-       *status = gpio_get_value(OLPC_GPIO_DCON_STAT0);
-       *status |= gpio_get_value(OLPC_GPIO_DCON_STAT1) << 1;
+       *status = gpiod_get_value(gpios[OLPC_DCON_STAT0]);
+       *status |= gpiod_get_value(gpios[OLPC_DCON_STAT1]) << 1;
 
        /* Clear the negative edge status for GPIO7 */
        cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_NEGATIVE_EDGE_STS);