hlist: drop the node parameter from iterators

[uclinux-h8/linux.git] / net / netrom / nr_route.c

diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index 70ffff7..b976d5e 100644 (file)
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -49,10 +49,9 @@ static struct nr_node *nr_node_get(ax25_address *callsign)
 {
        struct nr_node *found = NULL;
        struct nr_node *nr_node;
-       struct hlist_node *node;
 
        spin_lock_bh(&nr_node_list_lock);
-       nr_node_for_each(nr_node, node, &nr_node_list)
+       nr_node_for_each(nr_node, &nr_node_list)
                if (ax25cmp(callsign, &nr_node->callsign) == 0) {
                        nr_node_hold(nr_node);
                        found = nr_node;
@@ -67,10 +66,9 @@ static struct nr_neigh *nr_neigh_get_dev(ax25_address *callsign,
 {
        struct nr_neigh *found = NULL;
        struct nr_neigh *nr_neigh;
-       struct hlist_node *node;
 
        spin_lock_bh(&nr_neigh_list_lock);
-       nr_neigh_for_each(nr_neigh, node, &nr_neigh_list)
+       nr_neigh_for_each(nr_neigh, &nr_neigh_list)
                if (ax25cmp(callsign, &nr_neigh->callsign) == 0 &&
                    nr_neigh->dev == dev) {
                        nr_neigh_hold(nr_neigh);
@@ -114,10 +112,9 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic,
         */
        if (nr_neigh != NULL && nr_neigh->failed != 0 && quality == 0) {
                struct nr_node *nr_nodet;
-               struct hlist_node *node;
 
                spin_lock_bh(&nr_node_list_lock);
-               nr_node_for_each(nr_nodet, node, &nr_node_list) {
+               nr_node_for_each(nr_nodet, &nr_node_list) {
                        nr_node_lock(nr_nodet);
                        for (i = 0; i < nr_nodet->count; i++)
                                if (nr_nodet->routes[i].neighbour == nr_neigh)
@@ -485,11 +482,11 @@ static int nr_dec_obs(void)
 {
        struct nr_neigh *nr_neigh;
        struct nr_node  *s;
-       struct hlist_node *node, *nodet;
+       struct hlist_node *nodet;
        int i;
 
        spin_lock_bh(&nr_node_list_lock);
-       nr_node_for_each_safe(s, node, nodet, &nr_node_list) {
+       nr_node_for_each_safe(s, nodet, &nr_node_list) {
                nr_node_lock(s);
                for (i = 0; i < s->count; i++) {
                        switch (s->routes[i].obs_count) {
@@ -540,15 +537,15 @@ static int nr_dec_obs(void)
 void nr_rt_device_down(struct net_device *dev)
 {
        struct nr_neigh *s;
-       struct hlist_node *node, *nodet, *node2, *node2t;
+       struct hlist_node *nodet, *node2t;
        struct nr_node  *t;
        int i;
 
        spin_lock_bh(&nr_neigh_list_lock);
-       nr_neigh_for_each_safe(s, node, nodet, &nr_neigh_list) {
+       nr_neigh_for_each_safe(s, nodet, &nr_neigh_list) {
                if (s->dev == dev) {
                        spin_lock_bh(&nr_node_list_lock);
-                       nr_node_for_each_safe(t, node2, node2t, &nr_node_list) {
+                       nr_node_for_each_safe(t, node2t, &nr_node_list) {
                                nr_node_lock(t);
                                for (i = 0; i < t->count; i++) {
                                        if (t->routes[i].neighbour == s) {
@@ -737,11 +734,10 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg)
 void nr_link_failed(ax25_cb *ax25, int reason)
 {
        struct nr_neigh *s, *nr_neigh = NULL;
-       struct hlist_node *node;
        struct nr_node  *nr_node = NULL;
 
        spin_lock_bh(&nr_neigh_list_lock);
-       nr_neigh_for_each(s, node, &nr_neigh_list) {
+       nr_neigh_for_each(s, &nr_neigh_list) {
                if (s->ax25 == ax25) {
                        nr_neigh_hold(s);
                        nr_neigh = s;
@@ -761,7 +757,7 @@ void nr_link_failed(ax25_cb *ax25, int reason)
                return;
        }
        spin_lock_bh(&nr_node_list_lock);
-       nr_node_for_each(nr_node, node, &nr_node_list) {
+       nr_node_for_each(nr_node, &nr_node_list) {
                nr_node_lock(nr_node);
                if (nr_node->which < nr_node->count &&
                    nr_node->routes[nr_node->which].neighbour == nr_neigh)
@@ -1013,16 +1009,16 @@ void __exit nr_rt_free(void)
 {
        struct nr_neigh *s = NULL;
        struct nr_node  *t = NULL;
-       struct hlist_node *node, *nodet;
+       struct hlist_node *nodet;
 
        spin_lock_bh(&nr_neigh_list_lock);
        spin_lock_bh(&nr_node_list_lock);
-       nr_node_for_each_safe(t, node, nodet, &nr_node_list) {
+       nr_node_for_each_safe(t, nodet, &nr_node_list) {
                nr_node_lock(t);
                nr_remove_node_locked(t);
                nr_node_unlock(t);
        }
-       nr_neigh_for_each_safe(s, node, nodet, &nr_neigh_list) {
+       nr_neigh_for_each_safe(s, nodet, &nr_neigh_list) {
                while(s->count) {
                        s->count--;
                        nr_neigh_put(s);