]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Input: ad7879 - try parsing properties on non-DT systems
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 Feb 2017 19:50:56 +0000 (11:50 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 1 Mar 2017 17:42:44 +0000 (09:42 -0800)
We have switched the driver to use generic device properties API, so there
is no need to check for presence of DT node before trying parse properties.

Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/ad7879.c

index 7118f611e2222eed2e995fbeba73d12b12fd414f..c415614ada6805d379ad8e8458ed3e192a57ff21 100644 (file)
@@ -560,11 +560,10 @@ int ad7879_probe(struct device *dev, struct regmap *regmap,
                ts->averaging = pdata->averaging;
                ts->pen_down_acc_interval = pdata->pen_down_acc_interval;
                ts->median = pdata->median;
-       } else if (dev->of_node) {
-               ad7879_parse_dt(dev, ts);
        } else {
-               dev_err(dev, "No platform data\n");
-               return -EINVAL;
+               err = ad7879_parse_dt(dev, ts);
+               if (err)
+                       return err;
        }
 
        input_dev = devm_input_allocate_device(dev);