fbdev: omap2: improve usage of gpiod API

Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for output.

Also make use of gpiod_get*_optional where applicable.

Apart from simplification of the affected drivers this is another step
towards making the flags argument to gpiod_get*() mandatory.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-opa362.c b/drivers/video/fbdev/omap2/displays-new/encoder-opa362.c
index 84a6b3367124edd4c877d39107d863843f50fe15..a14d993f719dddd4a80a3effc45f71566c6c8666 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/encoder-opa362.c
+++ b/drivers/video/fbdev/omap2/displays-new/encoder-opa362.c
@@ -201,15 +201,9 @@ static int opa362_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, ddata);
 
-       gpio = devm_gpiod_get(&pdev->dev, "enable");
-       if (IS_ERR(gpio)) {
-               if (PTR_ERR(gpio) != -ENOENT)
-                       return PTR_ERR(gpio);
-
-               gpio = NULL;
-       } else {
-               gpiod_direction_output(gpio, 0);
-       }
+       gpio = devm_gpiod_get_optional(&pdev->dev, "enable", GPIOD_OUT_LOW);
+       if (IS_ERR(gpio))
+               return PTR_ERR(gpio);
 
        ddata->enable_gpio = gpio;
 

diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index eb8fd8140ad03ec8b972ee0ffda854120bdc35e6..f7be3489f74436d6a11258fd9402d8a49c81dda2 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -209,16 +209,9 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
        struct videomode vm;
        struct gpio_desc *gpio;
 
-       gpio = devm_gpiod_get(&pdev->dev, "enable");
-
-       if (IS_ERR(gpio)) {
-               if (PTR_ERR(gpio) != -ENOENT)
-                       return PTR_ERR(gpio);
-               else
-                       gpio = NULL;
-       } else {
-               gpiod_direction_output(gpio, 0);
-       }
+       gpio = devm_gpiod_get_optional(&pdev->dev, "enable", GPIOD_OUT_LOW);
+       if (IS_ERR(gpio))
+               return PTR_ERR(gpio);
 
        ddata->enable_gpio = gpio;
 

diff --git a/drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c
index 9974a37a11af9455a508ffd9b7010296bc465275..6a1b6a89a92868994c1adcffd1644db3063572ae 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c
@@ -285,15 +285,14 @@ static int lb035q02_probe_of(struct spi_device *spi)
        struct omap_dss_device *in;
        struct gpio_desc *gpio;
 
-       gpio = devm_gpiod_get(&spi->dev, "enable");
+       gpio = devm_gpiod_get(&spi->dev, "enable", GPIOD_OUT_LOW);
        if (IS_ERR(gpio)) {
                dev_err(&spi->dev, "failed to parse enable gpio\n");
                return PTR_ERR(gpio);
-       } else {
-               gpiod_direction_output(gpio, 0);
-               ddata->enable_gpio = gpio;
        }
 
+       ddata->enable_gpio = gpio;
+
        ddata->backlight_gpio = -ENOENT;
 
        in = omapdss_of_find_source_for_first_ep(node);

diff --git a/drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c b/drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c
index eae263702964a7e78f22f922acc4b0b451e6b8ec..abfd1f6e33275b6d3b192df0c504669ab771c5e7 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c
@@ -268,17 +268,12 @@ static  int sharp_ls_get_gpio_of(struct device *dev, int index, int val,
        const char *desc, struct gpio_desc **gpiod)
 {
        struct gpio_desc *gd;
-       int r;
 
        *gpiod = NULL;
 
-       gd = devm_gpiod_get_index(dev, desc, index);
+       gd = devm_gpiod_get_index(dev, desc, index, GPIOD_OUT_LOW);
        if (IS_ERR(gd))
-               return PTR_ERR(gd) == -ENOENT ? 0 : PTR_ERR(gd);
-
-       r = gpiod_direction_output(gd, val);
-       if (r)
-               return r;
+               return PTR_ERR(gd);
 
        *gpiod = gd;
        return 0;