diff options
author | Ursula Braun <ursula.braun@de.ibm.com> | 2011-05-12 14:45:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-13 14:55:21 -0400 |
commit | 9f6298a6ca38e251aa72a6035a8a36a52cf94536 (patch) | |
tree | 55736b4a450e2e28302064fa29755b79be746923 /net/iucv | |
parent | 5db79c0679e542a156de54e97be8901aeaa7638a (diff) |
af_iucv: get rid of compile warning
-Wunused-but-set-variable generates compile warnings. The affected
variables are removed.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/iucv')
-rw-r--r-- | net/iucv/af_iucv.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 986b2a5e8769..e2013e434d03 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
@@ -190,7 +190,6 @@ static int afiucv_pm_freeze(struct device *dev) | |||
190 | */ | 190 | */ |
191 | static int afiucv_pm_restore_thaw(struct device *dev) | 191 | static int afiucv_pm_restore_thaw(struct device *dev) |
192 | { | 192 | { |
193 | struct iucv_sock *iucv; | ||
194 | struct sock *sk; | 193 | struct sock *sk; |
195 | struct hlist_node *node; | 194 | struct hlist_node *node; |
196 | 195 | ||
@@ -199,7 +198,6 @@ static int afiucv_pm_restore_thaw(struct device *dev) | |||
199 | #endif | 198 | #endif |
200 | read_lock(&iucv_sk_list.lock); | 199 | read_lock(&iucv_sk_list.lock); |
201 | sk_for_each(sk, node, &iucv_sk_list.head) { | 200 | sk_for_each(sk, node, &iucv_sk_list.head) { |
202 | iucv = iucv_sk(sk); | ||
203 | switch (sk->sk_state) { | 201 | switch (sk->sk_state) { |
204 | case IUCV_CONNECTED: | 202 | case IUCV_CONNECTED: |
205 | sk->sk_err = EPIPE; | 203 | sk->sk_err = EPIPE; |
@@ -381,7 +379,6 @@ static void iucv_sock_close(struct sock *sk) | |||
381 | { | 379 | { |
382 | unsigned char user_data[16]; | 380 | unsigned char user_data[16]; |
383 | struct iucv_sock *iucv = iucv_sk(sk); | 381 | struct iucv_sock *iucv = iucv_sk(sk); |
384 | int err; | ||
385 | unsigned long timeo; | 382 | unsigned long timeo; |
386 | 383 | ||
387 | iucv_sock_clear_timer(sk); | 384 | iucv_sock_clear_timer(sk); |
@@ -394,8 +391,6 @@ static void iucv_sock_close(struct sock *sk) | |||
394 | 391 | ||
395 | case IUCV_CONNECTED: | 392 | case IUCV_CONNECTED: |
396 | case IUCV_DISCONN: | 393 | case IUCV_DISCONN: |
397 | err = 0; | ||
398 | |||
399 | sk->sk_state = IUCV_CLOSING; | 394 | sk->sk_state = IUCV_CLOSING; |
400 | sk->sk_state_change(sk); | 395 | sk->sk_state_change(sk); |
401 | 396 | ||
@@ -404,7 +399,7 @@ static void iucv_sock_close(struct sock *sk) | |||
404 | timeo = sk->sk_lingertime; | 399 | timeo = sk->sk_lingertime; |
405 | else | 400 | else |
406 | timeo = IUCV_DISCONN_TIMEOUT; | 401 | timeo = IUCV_DISCONN_TIMEOUT; |
407 | err = iucv_sock_wait(sk, | 402 | iucv_sock_wait(sk, |
408 | iucv_sock_in_state(sk, IUCV_CLOSED, 0), | 403 | iucv_sock_in_state(sk, IUCV_CLOSED, 0), |
409 | timeo); | 404 | timeo); |
410 | } | 405 | } |
@@ -417,7 +412,7 @@ static void iucv_sock_close(struct sock *sk) | |||
417 | low_nmcpy(user_data, iucv->src_name); | 412 | low_nmcpy(user_data, iucv->src_name); |
418 | high_nmcpy(user_data, iucv->dst_name); | 413 | high_nmcpy(user_data, iucv->dst_name); |
419 | ASCEBC(user_data, sizeof(user_data)); | 414 | ASCEBC(user_data, sizeof(user_data)); |
420 | err = iucv_path_sever(iucv->path, user_data); | 415 | iucv_path_sever(iucv->path, user_data); |
421 | iucv_path_free(iucv->path); | 416 | iucv_path_free(iucv->path); |
422 | iucv->path = NULL; | 417 | iucv->path = NULL; |
423 | } | 418 | } |