[media] dvb_usb_v2: make local function dvb_usb_v2_generic_io() static

[cascardo/linux.git] / net / x25 / af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a306bc6..37ca969 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -208,11 +208,10 @@ static void x25_remove_socket(struct sock *sk)
 static void x25_kill_by_device(struct net_device *dev)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        write_lock_bh(&x25_list_lock);
 
-       sk_for_each(s, node, &x25_list)
+       sk_for_each(s, &x25_list)
                if (x25_sk(s)->neighbour && x25_sk(s)->neighbour->dev == dev)
                        x25_disconnect(s, ENETUNREACH, 0, 0);
 
@@ -280,12 +279,11 @@ static struct sock *x25_find_listener(struct x25_address *addr,
 {
        struct sock *s;
        struct sock *next_best;
-       struct hlist_node *node;
 
        read_lock_bh(&x25_list_lock);
        next_best = NULL;
 
-       sk_for_each(s, node, &x25_list)
+       sk_for_each(s, &x25_list)
                if ((!strcmp(addr->x25_addr,
                        x25_sk(s)->source_addr.x25_addr) ||
                                !strcmp(addr->x25_addr,
@@ -323,9 +321,8 @@ found:
 static struct sock *__x25_find_socket(unsigned int lci, struct x25_neigh *nb)
 {
        struct sock *s;
-       struct hlist_node *node;
 
-       sk_for_each(s, node, &x25_list)
+       sk_for_each(s, &x25_list)
                if (x25_sk(s)->lci == lci && x25_sk(s)->neighbour == nb) {
                        sock_hold(s);
                        goto found;
@@ -1782,11 +1779,10 @@ static struct notifier_block x25_dev_notifier = {
 void x25_kill_by_neigh(struct x25_neigh *nb)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        write_lock_bh(&x25_list_lock);
 
-       sk_for_each(s, node, &x25_list)
+       sk_for_each(s, &x25_list)
                if (x25_sk(s)->neighbour == nb)
                        x25_disconnect(s, ENETUNREACH, 0, 0);