backlight: gpio: Simplify the platform data handling

Now that the last user of platform data (sh ecovec24) defines a proper
GPIO lookup and sets the 'default-on' device property, we can drop the
platform_data-specific GPIO handling and unify a big chunk of code.

The only field used from the platform data is now the fbdev pointer.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
index 52f17c9..ddc7d3b 100644 (file)
--- a/drivers/video/backlight/gpio_backlight.c
+++ b/drivers/video/backlight/gpio_backlight.c
@@ -6,7 +6,6 @@
 #include <linux/backlight.h>
 #include <linux/err.h>
 #include <linux/fb.h>
-#include <linux/gpio.h> /* Only for legacy support */
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -61,28 +60,6 @@ static const struct backlight_ops gpio_backlight_ops = {
        .check_fb       = gpio_backlight_check_fb,
 };
 
-static int gpio_backlight_probe_dt(struct platform_device *pdev,
-                                  struct gpio_backlight *gbl)
-{
-       struct device *dev = &pdev->dev;
-       int ret;
-
-       gbl->def_value = device_property_read_bool(dev, "default-on");
-
-       gbl->gpiod = devm_gpiod_get(dev, NULL, GPIOD_ASIS);
-       if (IS_ERR(gbl->gpiod)) {
-               ret = PTR_ERR(gbl->gpiod);
-
-               if (ret != -EPROBE_DEFER) {
-                       dev_err(dev,
-                               "Error: The gpios parameter is missing or invalid.\n");
-               }
-               return ret;
-       }
-
-       return 0;
-}
-
 static int gpio_backlight_initial_power_state(struct gpio_backlight *gbl)
 {
        struct device_node *node = gbl->dev->of_node;
@@ -114,35 +91,18 @@ static int gpio_backlight_probe(struct platform_device *pdev)
 
        gbl->dev = &pdev->dev;
 
-       if (pdev->dev.fwnode) {
-               ret = gpio_backlight_probe_dt(pdev, gbl);
-               if (ret)
-                       return ret;
-       } else if (pdata) {
-               /*
-                * Legacy platform data GPIO retrieveal. Do not expand
-                * the use of this code path, currently only used by one
-                * SH board.
-                */
-               unsigned long flags = GPIOF_DIR_OUT;
-
+       if (pdata)
                gbl->fbdev = pdata->fbdev;
-               gbl->def_value = pdata->def_value;
-               flags |= gbl->def_value ? GPIOF_INIT_HIGH : GPIOF_INIT_LOW;
-
-               ret = devm_gpio_request_one(gbl->dev, pdata->gpio, flags,
-                                           pdata ? pdata->name : "backlight");
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "unable to request GPIO\n");
-                       return ret;
-               }
-               gbl->gpiod = gpio_to_desc(pdata->gpio);
-               if (!gbl->gpiod)
-                       return -EINVAL;
-       } else {
-               dev_err(&pdev->dev,
-                       "failed to find platform data or device tree node.\n");
-               return -ENODEV;
+
+       gbl->def_value = device_property_read_bool(&pdev->dev, "default-on");
+
+       gbl->gpiod = devm_gpiod_get(&pdev->dev, NULL, GPIOD_ASIS);
+       if (IS_ERR(gbl->gpiod)) {
+               ret = PTR_ERR(gbl->gpiod);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev,
+                               "Error: The gpios parameter is missing or invalid.\n");
+               return ret;
        }
 
        memset(&props, 0, sizeof(props));