1 files changed, 16 insertions, 15 deletions

diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
index 3a1587222c8a..6390d7b91b7f 100644
--- a/fs/ncpfs/sock.c
+++ b/fs/ncpfs/sock.c
@@ -8,6 +8,7 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/time.h>
 #include <linux/errno.h>
@@ -231,7 +232,7 @@ static void __ncptcp_try_send(struct ncp_server *server)
                 return;
 
         if (result < 0) {
-                printk(KERN_ERR "ncpfs: tcp: Send failed: %d\n", result);
+                pr_err("tcp: Send failed: %d\n", result);
                 __ncp_abort_request(server, rq, result);
                 return;
         }
@@ -332,7 +333,7 @@ static int ncp_add_request(struct ncp_server *server, struct ncp_request_reply *
         mutex_lock(&server->rcv.creq_mutex);
         if (!ncp_conn_valid(server)) {
                 mutex_unlock(&server->rcv.creq_mutex);
-                printk(KERN_ERR "ncpfs: tcp: Server died\n");
+                pr_err("tcp: Server died\n");
                 return -EIO;
         }
         ncp_req_get(req);
@@ -448,7 +449,7 @@ void ncpdgram_rcv_proc(struct work_struct *work)
                                                         result -= 8;
                                                         hdrl = sock->sk->sk_family == AF_INET ? 8 : 6;
                                                         if (sign_verify_reply(server, server->rxbuf + hdrl, result - hdrl, cpu_to_le32(result), server->rxbuf + result)) {
-                                                                printk(KERN_INFO "ncpfs: Signature violation\n");
+                                                                pr_info("Signature violation\n");
                                                                 result = -EIO;
                                                         }
                                                 }
@@ -524,7 +525,7 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len)
                 return result;
         }
         if (result > len) {
-                printk(KERN_ERR "ncpfs: tcp: bug in recvmsg (%u > %Zu)\n", result, len);
+                pr_err("tcp: bug in recvmsg (%u > %Zu)\n", result, len);
                 return -EIO;                    
         }
         return result;
@@ -552,7 +553,7 @@ static int __ncptcp_rcv_proc(struct ncp_server *server)
                                         __ncptcp_abort(server);
                                 }
                                 if (result < 0) {
-                                        printk(KERN_ERR "ncpfs: tcp: error in recvmsg: %d\n", result);
+                                        pr_err("tcp: error in recvmsg: %d\n", result);
                                 } else {
                                         DPRINTK(KERN_ERR "ncpfs: tcp: EOF\n");
                                 }
@@ -566,20 +567,20 @@ static int __ncptcp_rcv_proc(struct ncp_server *server)
                 switch (server->rcv.state) {
                         case 0:
                                 if (server->rcv.buf.magic != htonl(NCP_TCP_RCVD_MAGIC)) {
-                                        printk(KERN_ERR "ncpfs: tcp: Unexpected reply type %08X\n", ntohl(server->rcv.buf.magic));
+                                        pr_err("tcp: Unexpected reply type %08X\n", ntohl(server->rcv.buf.magic));
                                         __ncptcp_abort(server);
                                         return -EIO;
                                 }
                                 datalen = ntohl(server->rcv.buf.len) & 0x0FFFFFFF;
                                 if (datalen < 10) {
-                                        printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d\n", datalen);
+                                        pr_err("tcp: Unexpected reply len %d\n", datalen);
                                         __ncptcp_abort(server);
                                         return -EIO;
                                 }
 #ifdef CONFIG_NCPFS_PACKET_SIGNING                              
                                 if (server->sign_active) {
                                         if (datalen < 18) {
-                                                printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d\n", datalen);
+                                                pr_err("tcp: Unexpected reply len %d\n", datalen);
                                                 __ncptcp_abort(server);
                                                 return -EIO;
                                         }
@@ -618,7 +619,7 @@ skipdata:;
                                         goto skipdata2;
                                 }
                                 if (datalen > req->datalen + 8) {
-                                        printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
+                                        pr_err("tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
                                         server->rcv.state = 3;
                                         goto skipdata;
                                 }
@@ -638,12 +639,12 @@ skipdata:;
                                 req = server->rcv.creq;
                                 if (req->tx_type != NCP_ALLOC_SLOT_REQUEST) {
                                         if (((struct ncp_reply_header*)server->rxbuf)->sequence != server->sequence) {
-                                                printk(KERN_ERR "ncpfs: tcp: Bad sequence number\n");
+                                                pr_err("tcp: Bad sequence number\n");
                                                 __ncp_abort_request(server, req, -EIO);
                                                 return -EIO;
                                         }
                                         if ((((struct ncp_reply_header*)server->rxbuf)->conn_low | (((struct ncp_reply_header*)server->rxbuf)->conn_high << 8)) != server->connection) {
-                                                printk(KERN_ERR "ncpfs: tcp: Connection number mismatch\n");
+                                                pr_err("tcp: Connection number mismatch\n");
                                                 __ncp_abort_request(server, req, -EIO);
                                                 return -EIO;
                                         }
@@ -651,7 +652,7 @@ skipdata:;
 #ifdef CONFIG_NCPFS_PACKET_SIGNING                              
                                 if (server->sign_active && req->tx_type != NCP_DEALLOC_SLOT_REQUEST) {
                                         if (sign_verify_reply(server, server->rxbuf + 6, req->datalen - 6, cpu_to_be32(req->datalen + 16), &server->rcv.buf.type)) {
-                                                printk(KERN_ERR "ncpfs: tcp: Signature violation\n");
+                                                pr_err("tcp: Signature violation\n");
                                                 __ncp_abort_request(server, req, -EIO);
                                                 return -EIO;
                                         }
@@ -742,7 +743,7 @@ static int ncp_do_request(struct ncp_server *server, int size,
         int result;
 
         if (server->lock == 0) {
-                printk(KERN_ERR "ncpfs: Server not locked!\n");
+                pr_err("Server not locked!\n");
                 return -EIO;
         }
         if (!ncp_conn_valid(server)) {
@@ -865,14 +866,14 @@ void ncp_lock_server(struct ncp_server *server)
 {
         mutex_lock(&server->mutex);
         if (server->lock)
-                printk(KERN_WARNING "ncp_lock_server: was locked!\n");
+                pr_warn("%s: was locked!\n", __func__);
         server->lock = 1;
 }
 
 void ncp_unlock_server(struct ncp_server *server)
 {
         if (!server->lock) {
-                printk(KERN_WARNING "ncp_unlock_server: was not locked!\n");
+                pr_warn("%s: was not locked!\n", __func__);
                 return;
         }
         server->lock = 0;