1 files changed, 8 insertions, 15 deletions

diff --git a/net/atm/common.c b/net/atm/common.c
index 282d761454ba..299ec1eb872a 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -30,13 +30,6 @@
 #include "addr.h"               /* address registry */
 #include "signaling.h"          /* for WAITING and sigd_attach */
 
-
-#if 0
-#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-
 struct hlist_head vcc_hash[VCC_HTABLE_SIZE];
 DEFINE_RWLOCK(vcc_sklist_lock);
 
@@ -70,13 +63,13 @@ static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
         struct sock *sk = sk_atm(vcc);
 
         if (atomic_read(&sk->sk_wmem_alloc) && !atm_may_send(vcc, size)) {
-                DPRINTK("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
+                pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
                         atomic_read(&sk->sk_wmem_alloc), size,
                         sk->sk_sndbuf);
                 return NULL;
         }
         while (!(skb = alloc_skb(size,GFP_KERNEL))) schedule();
-        DPRINTK("AlTx %d += %d\n", atomic_read(&sk->sk_wmem_alloc),
+        pr_debug("AlTx %d += %d\n", atomic_read(&sk->sk_wmem_alloc),
                 skb->truesize);
         atomic_add(skb->truesize, &sk->sk_wmem_alloc);
         return skb;
@@ -392,10 +385,10 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi,
         if (!error) error = adjust_tp(&vcc->qos.rxtp,vcc->qos.aal);
         if (error)
                 goto fail;
-        DPRINTK("VCC %d.%d, AAL %d\n",vpi,vci,vcc->qos.aal);
-        DPRINTK("  TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class,
+        pr_debug("VCC %d.%d, AAL %d\n",vpi,vci,vcc->qos.aal);
+        pr_debug("  TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class,
             vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu);
-        DPRINTK("  RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class,
+        pr_debug("  RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class,
             vcc->qos.rxtp.min_pcr,vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu);
 
         if (dev->ops->open) {
@@ -420,7 +413,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
         struct atm_vcc *vcc = ATM_SD(sock);
         int error;
 
-        DPRINTK("vcc_connect (vpi %d, vci %d)\n",vpi,vci);
+        pr_debug("vcc_connect (vpi %d, vci %d)\n",vpi,vci);
         if (sock->state == SS_CONNECTED)
                 return -EISCONN;
         if (sock->state != SS_UNCONNECTED)
@@ -433,7 +426,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
         else
                 if (test_bit(ATM_VF_PARTIAL,&vcc->flags))
                         return -EINVAL;
-        DPRINTK("vcc_connect (TX: cl %d,bw %d-%d,sdu %d; "
+        pr_debug("vcc_connect (TX: cl %d,bw %d-%d,sdu %d; "
             "RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n",
             vcc->qos.txtp.traffic_class,vcc->qos.txtp.min_pcr,
             vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu,
@@ -504,7 +497,7 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
         if (error)
                 return error;
         sock_recv_timestamp(msg, sk, skb);
-        DPRINTK("RcvM %d -= %d\n", atomic_read(&sk->rmem_alloc), skb->truesize);
+        pr_debug("RcvM %d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);
         atm_return(vcc, skb->truesize);
         skb_free_datagram(sk, skb);
         return copied;