diff mbox

[2/2] input: samsung-keypad: Use of_get_child_count() helper

Message ID 1345545733-27503-1-git-send-email-tklauser@distanz.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Tobias Klauser Aug. 21, 2012, 10:42 a.m. UTC
Use of_get_child_count() instead of custom implementation.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/input/keyboard/samsung-keypad.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Comments

Dmitry Torokhov Aug. 22, 2012, 5:49 a.m. UTC | #1
On Tue, Aug 21, 2012 at 12:42:13PM +0200, Tobias Klauser wrote:
> Use of_get_child_count() instead of custom implementation.
> 

Applied both, thanks Tobias.
diff mbox

Patch

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index e2f31c8..277e26d 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -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) {