Revert "Input: gpio_keys - use of_property_read_u32()"

This reverts commit d6ba97c9806bff7c91fe3ae5fec83488b1a56f73.

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index e913294540dc2c4877d176737f45d2a96d32eaee..67df91af84244c40185ecb27c4bbdd2ae29f615b 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -462,6 +462,7 @@ static int gpio_keys_get_devtree_pdata(struct device *dev,
        int i;
        struct gpio_keys_button *buttons;
        const u32 *reg;
+       int len;
 
        node = dev->of_node;
        if (node == NULL)
@@ -469,7 +470,7 @@ static int gpio_keys_get_devtree_pdata(struct device *dev,
 
        memset(pdata, 0, sizeof *pdata);
 
-       pdata->rep = !!of_get_property(node, "autorepeat", NULL);
+       pdata->rep = !!of_get_property(node, "autorepeat", &len);
 
        /* First count the subnodes */
        pdata->nbuttons = 0;
@@ -497,25 +498,22 @@ static int gpio_keys_get_devtree_pdata(struct device *dev,
                buttons[i].gpio = of_get_gpio_flags(pp, 0, &flags);
                buttons[i].active_low = flags & OF_GPIO_ACTIVE_LOW;
 
-               if (of_property_read_u32(pp, "linux,code", &reg))
+               reg = of_get_property(pp, "linux,code", &len);
+               if (!reg) {
                        dev_err(dev, "Button without keycode: 0x%x\n", buttons[i].gpio);
                        goto out_fail;
                }
-               buttons[i].code = reg;
+               buttons[i].code = be32_to_cpup(reg);
 
-               buttons[i].desc = of_get_property(pp, "label", NULL);
+               buttons[i].desc = of_get_property(pp, "label", &len);
 
-               if (of_property_read_u32(pp, "linux,input-type", &reg) == 0)
-                       buttons[i].type = reg;
-               else
-                       buttons[i].type = EV_KEY;
+               reg = of_get_property(pp, "linux,input-type", &len);
+               buttons[i].type = reg ? be32_to_cpup(reg) : EV_KEY;
 
                buttons[i].wakeup = !!of_get_property(pp, "gpio-key,wakeup", NULL);
 
-               if (of_property_read_u32(pp, "debounce-interval", &reg) == 0)
-                       buttons[i].debounce_interval = reg;
-               else
-                       buttons[i].debounce_interval = 5;
+               reg = of_get_property(pp, "debounce-interval", &len);
+               buttons[i].debounce_interval = reg ? be32_to_cpup(reg) : 5;
 
                i++;
        }