Merge tag 'backlight-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / drivers / video / backlight / tps65217_bl.c

diff --git a/drivers/video/backlight/tps65217_bl.c b/drivers/video/backlight/tps65217_bl.c
index 61ea82d2abf4ebb5e3bc2cec1e32315dced4d160..380917c862769524c56687c0e5bf86c8fc339914 100644 (file)
--- a/drivers/video/backlight/tps65217_bl.c
+++ b/drivers/video/backlight/tps65217_bl.c
@@ -274,17 +274,9 @@ static int tps65217_bl_probe(struct platform_device *pdev)
        struct tps65217_bl_pdata *pdata;
        struct backlight_properties bl_props;
 
-       if (tps->dev->of_node) {
-               pdata = tps65217_bl_parse_dt(pdev);
-               if (IS_ERR(pdata))
-                       return PTR_ERR(pdata);
-       } else {
-               pdata = dev_get_platdata(&pdev->dev);
-               if (!pdata) {
-                       dev_err(&pdev->dev, "no platform data provided\n");
-                       return -EINVAL;
-               }
-       }
+       pdata = tps65217_bl_parse_dt(pdev);
+       if (IS_ERR(pdata))
+               return PTR_ERR(pdata);
 
        tps65217_bl = devm_kzalloc(&pdev->dev, sizeof(*tps65217_bl),
                                GFP_KERNEL);