netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: David Miller <davem@davemloft.net>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	Paulius Zaleckas <paulius.zaleckas@gmail.com>
Subject: [PATCH 11/13] net: irda: use seq_list_foo() helpers
Date: Tue, 09 Feb 2010 17:21:05 +0800	[thread overview]
Message-ID: <4B712901.1030802@cn.fujitsu.com> (raw)
In-Reply-To: <4B712849.9040400@cn.fujitsu.com>

Simplify seq_file code.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 net/irda/irlan/irlan_common.c |   28 ++++------------------------
 1 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 315ead3..98911c4 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -1128,34 +1128,14 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
  */
 static void *irlan_seq_start(struct seq_file *seq, loff_t *pos)
 {
-	int i = 1;
-	struct irlan_cb *self;
-
 	rcu_read_lock();
-	if (*pos == 0)
-		return SEQ_START_TOKEN;
-
-	list_for_each_entry(self, &irlans, dev_list) {
-		if (*pos == i)
-			return self;
-		++i;
-	}
-	return NULL;
+	return seq_list_start_head(&irlans, *pos);
 }
 
 /* Return entry after v, and increment pos */
 static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-	struct list_head *nxt;
-
-	++*pos;
-	if (v == SEQ_START_TOKEN)
-		nxt = irlans.next;
-	else
-		nxt = ((struct irlan_cb *)v)->dev_list.next;
-
-	return (nxt == &irlans) ? NULL
-		: list_entry(nxt, struct irlan_cb, dev_list);
+	return seq_list_next(v, &irlans, pos);
 }
 
 /* End of reading /proc file */
@@ -1170,10 +1150,10 @@ static void irlan_seq_stop(struct seq_file *seq, void *v)
  */
 static int irlan_seq_show(struct seq_file *seq, void *v)
 {
-	if (v == SEQ_START_TOKEN)
+	if (v == &irlans)
 		seq_puts(seq, "IrLAN instances:\n");
 	else {
-		struct irlan_cb *self = v;
+		struct irlan_cb *self = list_entry(v, struct irlan_cb, list);
 
 		IRDA_ASSERT(self != NULL, return -1;);
 		IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-- 
1.6.3

  parent reply	other threads:[~2010-02-09  9:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-09  9:18 [PATCH 00/13] net: simplify seq_file code, revised Li Zefan
2010-02-09  9:18 ` [PATCH 01/13] seq_file: Add helpers for iteration over a hlist Li Zefan
2010-02-09  9:18 ` [PATCH 02/13] net: add a wrapper sk_entry() Li Zefan
2010-02-09  9:19 ` [PATCH 03/13] net: x25: use seq_hlist_foo() helpers Li Zefan
2010-02-09  9:19 ` [PATCH 04/13] net: rose: " Li Zefan
2010-02-09  9:19 ` [PATCH 05/13] net: packet: " Li Zefan
2010-02-09  9:19 ` [PATCH 06/13] net: netrom: " Li Zefan
2010-02-09  9:19 ` [PATCH 07/13] net: ax25: " Li Zefan
2010-02-09  9:20 ` [PATCH 08/13] net: appletalk: " Li Zefan
2010-02-09  9:20 ` [PATCH 09/13] net: af_key: " Li Zefan
2010-02-09  9:20 ` [PATCH 10/13] net: x25: use seq_list_foo() helpers Li Zefan
2010-02-09  9:21 ` Li Zefan [this message]
2010-02-09  9:21 ` [PATCH 12/13] net: ipx: " Li Zefan
2010-02-09  9:21 ` [PATCH 13/13] net: atm: " Li Zefan
2010-02-10 19:31 ` [PATCH 00/13] net: simplify seq_file code, revised David Miller
2010-02-10 20:29   ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2010-02-05  1:44 [PATCH 00/13] net: simplify seq_file code Li Zefan
2010-02-05  1:47 ` [PATCH 11/13] net: irda: use seq_list_foo() helpers Li Zefan
2010-02-05 11:46   ` Paulius Zaleckas
2010-02-09  6:57     ` Li Zefan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B712901.1030802@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=paulius.zaleckas@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).