Commit 216437eb authored by Li Zefan's avatar Li Zefan Committed by David S. Miller

net: irda: use seq_list_foo() helpers

Simplify seq_file code.
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f134204
...@@ -1128,34 +1128,14 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len) ...@@ -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) static void *irlan_seq_start(struct seq_file *seq, loff_t *pos)
{ {
int i = 1;
struct irlan_cb *self;
rcu_read_lock(); rcu_read_lock();
if (*pos == 0) return seq_list_start_head(&irlans, *pos);
return SEQ_START_TOKEN;
list_for_each_entry(self, &irlans, dev_list) {
if (*pos == i)
return self;
++i;
}
return NULL;
} }
/* Return entry after v, and increment pos */ /* Return entry after v, and increment pos */
static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct list_head *nxt; return seq_list_next(v, &irlans, pos);
++*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);
} }
/* End of reading /proc file */ /* End of reading /proc file */
...@@ -1170,10 +1150,10 @@ static void irlan_seq_stop(struct seq_file *seq, void *v) ...@@ -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) 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"); seq_puts(seq, "IrLAN instances:\n");
else { else {
struct irlan_cb *self = v; struct irlan_cb *self = list_entry(v, struct irlan_cb, dev_list);
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment