2 files changed, 16 insertions, 12 deletions

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 42e3bef270c9..72dad552aa00 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -577,12 +577,12 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
                 server->rcv.ptr = (unsigned char*)&server->rcv.buf;
                 server->rcv.len = 10;
                 server->rcv.state = 0;
-                INIT_WORK(&server->rcv.tq, ncp_tcp_rcv_proc, server);
-                INIT_WORK(&server->tx.tq, ncp_tcp_tx_proc, server);
+                INIT_WORK(&server->rcv.tq, ncp_tcp_rcv_proc);
+                INIT_WORK(&server->tx.tq, ncp_tcp_tx_proc);
                 sock->sk->sk_write_space = ncp_tcp_write_space;
         } else {
-                INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc, server);
-                INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc, server);
+                INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc);
+                INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc);
                 server->timeout_tm.data = (unsigned long)server;
                 server->timeout_tm.function = ncpdgram_timeout_call;
         }
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
index 11c2b252ebed..e496d8b65e92 100644
--- a/fs/ncpfs/sock.c
+++ b/fs/ncpfs/sock.c
@@ -350,9 +350,10 @@ static void info_server(struct ncp_server *server, unsigned int id, const void *
         }
 }
 
-void ncpdgram_rcv_proc(void *s)
+void ncpdgram_rcv_proc(struct work_struct *work)
 {
-        struct ncp_server *server = s;
+        struct ncp_server *server =
+                container_of(work, struct ncp_server, rcv.tq);
         struct socket* sock;
         
         sock = server->ncp_sock;
@@ -468,9 +469,10 @@ static void __ncpdgram_timeout_proc(struct ncp_server *server)
         }
 }
 
-void ncpdgram_timeout_proc(void *s)
+void ncpdgram_timeout_proc(struct work_struct *work)
 {
-        struct ncp_server *server = s;
+        struct ncp_server *server =
+                container_of(work, struct ncp_server, timeout_tq);
         mutex_lock(&server->rcv.creq_mutex);
         __ncpdgram_timeout_proc(server);
         mutex_unlock(&server->rcv.creq_mutex);
@@ -652,18 +654,20 @@ skipdata:;
         }
 }
 
-void ncp_tcp_rcv_proc(void *s)
+void ncp_tcp_rcv_proc(struct work_struct *work)
 {
-        struct ncp_server *server = s;
+        struct ncp_server *server =
+                container_of(work, struct ncp_server, rcv.tq);
 
         mutex_lock(&server->rcv.creq_mutex);
         __ncptcp_rcv_proc(server);
         mutex_unlock(&server->rcv.creq_mutex);
 }
 
-void ncp_tcp_tx_proc(void *s)
+void ncp_tcp_tx_proc(struct work_struct *work)
 {
-        struct ncp_server *server = s;
+        struct ncp_server *server =
+                container_of(work, struct ncp_server, tx.tq);
         
         mutex_lock(&server->rcv.creq_mutex);
         __ncptcp_try_send(server);