Input: samsung-keypad - use of_get_child_count() helper
authorTobias Klauser <tklauser@distanz.ch>
Wed, 22 Aug 2012 05:04:46 +0000 (22:04 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 22 Aug 2012 05:40:01 +0000 (22:40 -0700)
Use of_get_child_count() instead of custom implementation.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/samsung-keypad.c

index e2f31c8..277e26d 100644 (file)
@@ -256,7 +256,7 @@ static struct samsung_keypad_platdata *samsung_keypad_parse_dt(
        struct matrix_keymap_data *keymap_data;
        uint32_t *keymap, num_rows = 0, num_cols = 0;
        struct device_node *np = dev->of_node, *key_np;
-       unsigned int key_count = 0;
+       unsigned int key_count;
 
        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata) {
@@ -280,9 +280,7 @@ static struct samsung_keypad_platdata *samsung_keypad_parse_dt(
        }
        pdata->keymap_data = keymap_data;
 
-       for_each_child_of_node(np, key_np)
-               key_count++;
-
+       key_count = of_get_child_count(np);
        keymap_data->keymap_size = key_count;
        keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);
        if (!keymap) {