[ATM]: Replace DPRINTK() with pr_debug().

Get rid of using DPRINTK macro in ATM and use pr_debug (in kernel.h).
Using the standard macro is cleaner and forces code to check for bad arguments
and formatting.

Fixes from Thomas Graf.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 17 deletions

diff --git a/net/atm/svc.c b/net/atm/svc.c
index 876ec7b47a2f..53d04c7992cf 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -25,17 +25,8 @@
 #include "signaling.h"
 #include "addr.h"
 
-
-#if 0
-#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-
-
 static int svc_create(struct socket *sock,int protocol);
 
-
 /*
  * Note: since all this is still nicely synchronized with the signaling demon,
  *       there's no need to protect sleep loops with clis. If signaling is
@@ -55,7 +46,7 @@ static void svc_disconnect(struct atm_vcc *vcc)
         struct sk_buff *skb;
         struct sock *sk = sk_atm(vcc);
 
-        DPRINTK("svc_disconnect %p\n",vcc);
+        pr_debug("svc_disconnect %p\n",vcc);
         if (test_bit(ATM_VF_REGIS,&vcc->flags)) {
                 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
                 sigd_enq(vcc,as_close,NULL,NULL,NULL);
@@ -69,7 +60,7 @@ static void svc_disconnect(struct atm_vcc *vcc)
            as_indicate has been answered */
         while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
                 atm_return(vcc, skb->truesize);
-                DPRINTK("LISTEN REL\n");
+                pr_debug("LISTEN REL\n");
                 sigd_enq2(NULL,as_reject,vcc,NULL,NULL,&vcc->qos,0);
                 dev_kfree_skb(skb);
         }
@@ -85,7 +76,7 @@ static int svc_release(struct socket *sock)
 
         if (sk)  {
                 vcc = ATM_SD(sock);
-                DPRINTK("svc_release %p\n", vcc);
+                pr_debug("svc_release %p\n", vcc);
                 clear_bit(ATM_VF_READY, &vcc->flags);
                 /* VCC pointer is used as a reference, so we must not free it
                    (thereby subjecting it to re-use) before all pending connections
@@ -162,7 +153,7 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
         struct atm_vcc *vcc = ATM_SD(sock);
         int error;
 
-        DPRINTK("svc_connect %p\n",vcc);
+        pr_debug("svc_connect %p\n",vcc);
         lock_sock(sk);
         if (sockaddr_len != sizeof(struct sockaddr_atmsvc)) {
                 error = -EINVAL;
@@ -224,7 +215,7 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
                                 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
                                 continue;
                         }
-                        DPRINTK("*ABORT*\n");
+                        pr_debug("*ABORT*\n");
                         /*
                          * This is tricky:
                          *   Kernel ---close--> Demon
@@ -295,7 +286,7 @@ static int svc_listen(struct socket *sock,int backlog)
         struct atm_vcc *vcc = ATM_SD(sock);
         int error;
 
-        DPRINTK("svc_listen %p\n",vcc);
+        pr_debug("svc_listen %p\n",vcc);
         lock_sock(sk);
         /* let server handle listen on unbound sockets */
         if (test_bit(ATM_VF_SESSION,&vcc->flags)) {
@@ -341,7 +332,7 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
 
         new_vcc = ATM_SD(newsock);
 
-        DPRINTK("svc_accept %p -> %p\n",old_vcc,new_vcc);
+        pr_debug("svc_accept %p -> %p\n",old_vcc,new_vcc);
         while (1) {
                 DEFINE_WAIT(wait);
 
@@ -545,7 +536,7 @@ static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr,
                 error = -EINPROGRESS;
                 goto out;
         }
-        DPRINTK("svc_addparty added wait queue\n");
+        pr_debug("svc_addparty added wait queue\n");
         while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
                 schedule();
                 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);