2 files changed, 3 insertions, 10 deletions

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index aef664580355..2255e3c082ed 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -94,13 +94,6 @@ static void iucv_sock_clear_timer(struct sock *sk)
         sk_stop_timer(sk, &sk->sk_timer);
 }
 
-static void iucv_sock_init_timer(struct sock *sk)
-{
-        init_timer(&sk->sk_timer);
-        sk->sk_timer.function = iucv_sock_timeout;
-        sk->sk_timer.data = (unsigned long)sk;
-}
-
 static struct sock *__iucv_get_sock_by_name(char *nm)
 {
         struct sock *sk;
@@ -238,7 +231,7 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
         sk->sk_protocol = proto;
         sk->sk_state    = IUCV_OPEN;
 
-        iucv_sock_init_timer(sk);
+        setup_timer(&sk->sk_timer, iucv_sock_timeout, (unsigned long)sk);
 
         iucv_sock_link(&iucv_sk_list, sk);
         return sk;
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 7698f6c459d6..f13fe8821cbd 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -1492,7 +1492,7 @@ static void iucv_tasklet_fn(unsigned long ignored)
                 [0x08] = iucv_message_pending,
                 [0x09] = iucv_message_pending,
         };
-        struct list_head task_queue = LIST_HEAD_INIT(task_queue);
+        LIST_HEAD(task_queue);
         struct iucv_irq_list *p, *n;
 
         /* Serialize tasklet, iucv_path_sever and iucv_path_connect. */
@@ -1526,7 +1526,7 @@ static void iucv_tasklet_fn(unsigned long ignored)
 static void iucv_work_fn(struct work_struct *work)
 {
         typedef void iucv_irq_fn(struct iucv_irq_data *);
-        struct list_head work_queue = LIST_HEAD_INIT(work_queue);
+        LIST_HEAD(work_queue);
         struct iucv_irq_list *p, *n;
 
         /* Serialize tasklet, iucv_path_sever and iucv_path_connect. */