Re: [PATCH 3/4] Input: ad7879 - try parsing properties on non-DT systems

[Michael Hennerich]

On 28.02.2017 23:08, Dmitry Torokhov wrote:

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.

Signed-off-by: Dmitry Torokhov 


Acked-by: Michael Hennerich 


---
 drivers/input/touchscreen/ad7879.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/ad7879.c 
b/drivers/input/touchscreen/ad7879.c
index 7118f611e222..c415614ada68 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -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);




--
Greetings,
Michael

--
Analog Devices GmbH  Otl-Aicher Strasse 60-64  80807 München
Sitz der Gesellschaft München, Registergericht München HRB 40368,
Geschäftsführer: Peter Kolberg, Ali Raza Husain, Eileen Wynne

Re: [PATCH 3/4] Input: ad7879 - try parsing properties on non-DT systems

[Michael Hennerich]

On 28.02.2017 23:08, Dmitry Torokhov wrote:

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.

Signed-off-by: Dmitry Torokhov 


Acked-by: Michael Hennerich 


---
 drivers/input/touchscreen/ad7879.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/ad7879.c 
b/drivers/input/touchscreen/ad7879.c
index 7118f611e222..c415614ada68 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -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);




--
Greetings,
Michael

--
Analog Devices GmbH  Otl-Aicher Strasse 60-64  80807 München
Sitz der Gesellschaft München, Registergericht München HRB 40368,
Geschäftsführer: Peter Kolberg, Ali Raza Husain, Eileen Wynne