diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2010-02-08 18:21:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-10 15:31:09 -0500 |
commit | 216437eb8b5adf12ab91e1f0c046ffba22c63431 (patch) | |
tree | 6bfea9fd0043d77e95635b273ce07eb20cfc5f3a /net | |
parent | 4f134204f740d9fbf992843a6615175f5105f49e (diff) |
net: irda: use seq_list_foo() helpers
Simplify seq_file code.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | 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 315ead3cb926..e486dc89ea59 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) | |||
1128 | */ | 1128 | */ |
1129 | static void *irlan_seq_start(struct seq_file *seq, loff_t *pos) | 1129 | static void *irlan_seq_start(struct seq_file *seq, loff_t *pos) |
1130 | { | 1130 | { |
1131 | int i = 1; | ||
1132 | struct irlan_cb *self; | ||
1133 | |||
1134 | rcu_read_lock(); | 1131 | rcu_read_lock(); |
1135 | if (*pos == 0) | 1132 | return seq_list_start_head(&irlans, *pos); |
1136 | return SEQ_START_TOKEN; | ||
1137 | |||
1138 | list_for_each_entry(self, &irlans, dev_list) { | ||
1139 | if (*pos == i) | ||
1140 | return self; | ||
1141 | ++i; | ||
1142 | } | ||
1143 | return NULL; | ||
1144 | } | 1133 | } |
1145 | 1134 | ||
1146 | /* Return entry after v, and increment pos */ | 1135 | /* Return entry after v, and increment pos */ |
1147 | static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 1136 | static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) |
1148 | { | 1137 | { |
1149 | struct list_head *nxt; | 1138 | return seq_list_next(v, &irlans, pos); |
1150 | |||
1151 | ++*pos; | ||
1152 | if (v == SEQ_START_TOKEN) | ||
1153 | nxt = irlans.next; | ||
1154 | else | ||
1155 | nxt = ((struct irlan_cb *)v)->dev_list.next; | ||
1156 | |||
1157 | return (nxt == &irlans) ? NULL | ||
1158 | : list_entry(nxt, struct irlan_cb, dev_list); | ||
1159 | } | 1139 | } |
1160 | 1140 | ||
1161 | /* End of reading /proc file */ | 1141 | /* End of reading /proc file */ |
@@ -1170,10 +1150,10 @@ static void irlan_seq_stop(struct seq_file *seq, void *v) | |||
1170 | */ | 1150 | */ |
1171 | static int irlan_seq_show(struct seq_file *seq, void *v) | 1151 | static int irlan_seq_show(struct seq_file *seq, void *v) |
1172 | { | 1152 | { |
1173 | if (v == SEQ_START_TOKEN) | 1153 | if (v == &irlans) |
1174 | seq_puts(seq, "IrLAN instances:\n"); | 1154 | seq_puts(seq, "IrLAN instances:\n"); |
1175 | else { | 1155 | else { |
1176 | struct irlan_cb *self = v; | 1156 | struct irlan_cb *self = list_entry(v, struct irlan_cb, dev_list); |
1177 | 1157 | ||
1178 | IRDA_ASSERT(self != NULL, return -1;); | 1158 | IRDA_ASSERT(self != NULL, return -1;); |
1179 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); | 1159 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); |