Input: of_touchscreen - switch to using device properties

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / of_touchscreen.c

diff --git a/drivers/input/touchscreen/of_touchscreen.c b/drivers/input/touchscreen/of_touchscreen.c
index 50bc0f219547a4605011e285ba9bfb745e38afd4..bb6f2fe1466728a8dc41e77b9f633b85a43404e1 100644 (file)
--- a/drivers/input/touchscreen/of_touchscreen.c
+++ b/drivers/input/touchscreen/of_touchscreen.c
@@ -9,12 +9,12 @@
  *
  */
 
-#include <linux/of.h>
+#include <linux/property.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
 #include <linux/input/touchscreen.h>
 
-static bool touchscreen_get_prop_u32(struct device_node *np,
+static bool touchscreen_get_prop_u32(struct device *dev,
                                     const char *property,
                                     unsigned int default_value,
                                     unsigned int *value)
@@ -22,7 +22,7 @@ static bool touchscreen_get_prop_u32(struct device_node *np,
        u32 val;
        int error;
 
-       error = of_property_read_u32(np, property, &val);
+       error = device_property_read_u32(dev, property, &val);
        if (error) {
                *value = default_value;
                return false;
@@ -51,54 +51,58 @@ static void touchscreen_set_params(struct input_dev *dev,
 }
 
 /**
- * touchscreen_parse_of_params - parse common touchscreen DT properties
- * @dev: device that should be parsed
+ * touchscreen_parse_properties - parse common touchscreen DT properties
+ * @input: input device that should be parsed
+ * @multitouch: specifies whether parsed properties should be applied to
+ *     single-touch or multi-touch axes
  *
  * This function parses common DT properties for touchscreens and setups the
- * input device accordingly. The function keeps previously setuped default
+ * input device accordingly. The function keeps previously set up default
  * values if no value is specified via DT.
  */
-void touchscreen_parse_of_params(struct input_dev *dev, bool multitouch)
+void touchscreen_parse_properties(struct input_dev *input, bool multitouch)
 {
-       struct device_node *np = dev->dev.parent->of_node;
+       struct device *dev = input->dev.parent;
        unsigned int axis;
        unsigned int maximum, fuzz;
        bool data_present;
 
-       input_alloc_absinfo(dev);
-       if (!dev->absinfo)
+       input_alloc_absinfo(input);
+       if (!input->absinfo)
                return;
 
        axis = multitouch ? ABS_MT_POSITION_X : ABS_X;
-       data_present = touchscreen_get_prop_u32(np, "touchscreen-size-x",
-                                               input_abs_get_max(dev,
+       data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-x",
+                                               input_abs_get_max(input,
                                                                  axis) + 1,
                                                &maximum) |
-                      touchscreen_get_prop_u32(np, "touchscreen-fuzz-x",
-                                               input_abs_get_fuzz(dev, axis),
+                      touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x",
+                                               input_abs_get_fuzz(input, axis),
                                                &fuzz);
        if (data_present)
-               touchscreen_set_params(dev, axis, maximum - 1, fuzz);
+               touchscreen_set_params(input, axis, maximum - 1, fuzz);
 
        axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;
-       data_present = touchscreen_get_prop_u32(np, "touchscreen-size-y",
-                                               input_abs_get_max(dev,
+       data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-y",
+                                               input_abs_get_max(input,
                                                                  axis) + 1,
                                                &maximum) |
-                      touchscreen_get_prop_u32(np, "touchscreen-fuzz-y",
-                                               input_abs_get_fuzz(dev, axis),
+                      touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y",
+                                               input_abs_get_fuzz(input, axis),
                                                &fuzz);
        if (data_present)
-               touchscreen_set_params(dev, axis, maximum - 1, fuzz);
+               touchscreen_set_params(input, axis, maximum - 1, fuzz);
 
        axis = multitouch ? ABS_MT_PRESSURE : ABS_PRESSURE;
-       data_present = touchscreen_get_prop_u32(np, "touchscreen-max-pressure",
-                                               input_abs_get_max(dev, axis),
+       data_present = touchscreen_get_prop_u32(dev,
+                                               "touchscreen-max-pressure",
+                                               input_abs_get_max(input, axis),
                                                &maximum) |
-                      touchscreen_get_prop_u32(np, "touchscreen-fuzz-pressure",
-                                               input_abs_get_fuzz(dev, axis),
+                      touchscreen_get_prop_u32(dev,
+                                               "touchscreen-fuzz-pressure",
+                                               input_abs_get_fuzz(input, axis),
                                                &fuzz);
        if (data_present)
-               touchscreen_set_params(dev, axis, maximum, fuzz);
+               touchscreen_set_params(input, axis, maximum, fuzz);
 }
-EXPORT_SYMBOL(touchscreen_parse_of_params);
+EXPORT_SYMBOL(touchscreen_parse_properties);