Skip to content

Commit bc831fa

Browse files
Wang Haidavem330
authored andcommitted
net: x25: Use list_for_each_entry() to simplify code in x25_route.c
Convert list_for_each() to list_for_each_entry() where applicable. This simplifies the code. Reported-by: Hulk Robot <[email protected]> Signed-off-by: Wang Hai <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9e2b7b0 commit bc831fa

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

net/x25/x25_route.c

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits,
2727
struct net_device *dev)
2828
{
2929
struct x25_route *rt;
30-
struct list_head *entry;
3130
int rc = -EINVAL;
3231

3332
write_lock_bh(&x25_route_list_lock);
3433

35-
list_for_each(entry, &x25_route_list) {
36-
rt = list_entry(entry, struct x25_route, node);
37-
34+
list_for_each_entry(rt, &x25_route_list, node) {
3835
if (!memcmp(&rt->address, address, sigdigits) &&
3936
rt->sigdigits == sigdigits)
4037
goto out;
@@ -78,14 +75,11 @@ static int x25_del_route(struct x25_address *address, unsigned int sigdigits,
7875
struct net_device *dev)
7976
{
8077
struct x25_route *rt;
81-
struct list_head *entry;
8278
int rc = -EINVAL;
8379

8480
write_lock_bh(&x25_route_list_lock);
8581

86-
list_for_each(entry, &x25_route_list) {
87-
rt = list_entry(entry, struct x25_route, node);
88-
82+
list_for_each_entry(rt, &x25_route_list, node) {
8983
if (!memcmp(&rt->address, address, sigdigits) &&
9084
rt->sigdigits == sigdigits && rt->dev == dev) {
9185
__x25_remove_route(rt);
@@ -141,13 +135,10 @@ struct net_device *x25_dev_get(char *devname)
141135
struct x25_route *x25_get_route(struct x25_address *addr)
142136
{
143137
struct x25_route *rt, *use = NULL;
144-
struct list_head *entry;
145138

146139
read_lock_bh(&x25_route_list_lock);
147140

148-
list_for_each(entry, &x25_route_list) {
149-
rt = list_entry(entry, struct x25_route, node);
150-
141+
list_for_each_entry(rt, &x25_route_list, node) {
151142
if (!memcmp(&rt->address, addr, rt->sigdigits)) {
152143
if (!use)
153144
use = rt;

0 commit comments

Comments
 (0)