Merge tag 'drm-next-2021-07-08-1' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / net / x25 / x25_route.c

diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 9fbe4bb..647f325 100644 (file)
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -27,14 +27,11 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits,
                         struct net_device *dev)
 {
        struct x25_route *rt;
-       struct list_head *entry;
        int rc = -EINVAL;
 
        write_lock_bh(&x25_route_list_lock);
 
-       list_for_each(entry, &x25_route_list) {
-               rt = list_entry(entry, struct x25_route, node);
-
+       list_for_each_entry(rt, &x25_route_list, node) {
                if (!memcmp(&rt->address, address, sigdigits) &&
                    rt->sigdigits == sigdigits)
                        goto out;
@@ -78,14 +75,11 @@ static int x25_del_route(struct x25_address *address, unsigned int sigdigits,
                         struct net_device *dev)
 {
        struct x25_route *rt;
-       struct list_head *entry;
        int rc = -EINVAL;
 
        write_lock_bh(&x25_route_list_lock);
 
-       list_for_each(entry, &x25_route_list) {
-               rt = list_entry(entry, struct x25_route, node);
-
+       list_for_each_entry(rt, &x25_route_list, node) {
                if (!memcmp(&rt->address, address, sigdigits) &&
                    rt->sigdigits == sigdigits && rt->dev == dev) {
                        __x25_remove_route(rt);
@@ -141,13 +135,10 @@ struct net_device *x25_dev_get(char *devname)
 struct x25_route *x25_get_route(struct x25_address *addr)
 {
        struct x25_route *rt, *use = NULL;
-       struct list_head *entry;
 
        read_lock_bh(&x25_route_list_lock);
 
-       list_for_each(entry, &x25_route_list) {
-               rt = list_entry(entry, struct x25_route, node);
-
+       list_for_each_entry(rt, &x25_route_list, node) {
                if (!memcmp(&rt->address, addr, rt->sigdigits)) {
                        if (!use)
                                use = rt;