Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / lpc32xx-keys.c

diff --git a/drivers/input/keyboard/lpc32xx-keys.c b/drivers/input/keyboard/lpc32xx-keys.c
index 1b8add6cfb9d466cec790ec8e38337e180eaa8ec..42181435fe6759f4302ac8ffdd68f0ea41d1df0f 100644 (file)
--- a/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@ -144,12 +144,13 @@ static int lpc32xx_parse_dt(struct device *dev,
 {
        struct device_node *np = dev->of_node;
        u32 rows = 0, columns = 0;
+       int err;
 
-       of_property_read_u32(np, "keypad,num-rows", &rows);
-       of_property_read_u32(np, "keypad,num-columns", &columns);
-       if (!rows || rows != columns) {
-               dev_err(dev,
-                       "rows and columns must be specified and be equal!\n");
+       err = matrix_keypad_parse_of_params(dev, &rows, &columns);
+       if (err)
+               return err;
+       if (rows != columns) {
+               dev_err(dev, "rows and columns must be equal!\n");
                return -EINVAL;
        }