From df901a63d2b79e25213adecf3b80407c4c22d771 Mon Sep 17 00:00:00 2001 From: Pavel Emelianov Date: Wed, 18 Jul 2007 00:38:32 -0400 Subject: [PATCH] --- yaml --- r: 62172 b: refs/heads/master c: ad5d972cdad41ab4d6bfb95f656e508707447c95 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/input.c | 29 ++++------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 7138acf7d05d..f815c3332fe0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080c652d6d68e5524de800b32f0701f9c6834f23 +refs/heads/master: ad5d972cdad41ab4d6bfb95f656e508707447c95 diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index 75b4d2a83dd9..5fe755586623 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/drivers/input/input.c @@ -471,37 +471,16 @@ static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait) return 0; } -static struct list_head *list_get_nth_element(struct list_head *list, loff_t *pos) -{ - struct list_head *node; - loff_t i = 0; - - list_for_each(node, list) - if (i++ == *pos) - return node; - - return NULL; -} - -static struct list_head *list_get_next_element(struct list_head *list, struct list_head *element, loff_t *pos) -{ - if (element->next == list) - return NULL; - - ++(*pos); - return element->next; -} - static void *input_devices_seq_start(struct seq_file *seq, loff_t *pos) { /* acquire lock here ... Yes, we do need locking, I knowi, I know... */ - return list_get_nth_element(&input_dev_list, pos); + return seq_list_start(&input_dev_list, *pos); } static void *input_devices_seq_next(struct seq_file *seq, void *v, loff_t *pos) { - return list_get_next_element(&input_dev_list, v, pos); + return seq_list_next(v, &input_dev_list, pos); } static void input_devices_seq_stop(struct seq_file *seq, void *v) @@ -592,13 +571,13 @@ static void *input_handlers_seq_start(struct seq_file *seq, loff_t *pos) { /* acquire lock here ... Yes, we do need locking, I knowi, I know... */ seq->private = (void *)(unsigned long)*pos; - return list_get_nth_element(&input_handler_list, pos); + return seq_list_start(&input_handler_list, *pos); } static void *input_handlers_seq_next(struct seq_file *seq, void *v, loff_t *pos) { seq->private = (void *)(unsigned long)(*pos + 1); - return list_get_next_element(&input_handler_list, v, pos); + return seq_list_next(v, &input_handler_list, pos); } static void input_handlers_seq_stop(struct seq_file *seq, void *v)