mISDN: Cleanup debug messages

This patch make debug printk's KERN_DEBUG and also fix some
codestyle issues.

Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

9 files changed, 45 insertions, 41 deletions

diff --git a/drivers/isdn/mISDN/dsp_audio.c b/drivers/isdn/mISDN/dsp_audio.c
index de3795e3f432..9c7c6451bf3d 100644
--- a/drivers/isdn/mISDN/dsp_audio.c
+++ b/drivers/isdn/mISDN/dsp_audio.c
@@ -210,9 +210,8 @@ dsp_audio_generate_seven(void)
                 j = 0;
                 for (k = 0; k < 256; k++) {
                         if (dsp_audio_alaw_to_s32[k]
-                                < dsp_audio_alaw_to_s32[i]) {
-                        j++;
-                        }
+                            < dsp_audio_alaw_to_s32[i])
+                                j++;
                 }
                 sorted_alaw[j] = i;
         }
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 05866184ba23..9c7c0d1ba55f 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -238,7 +238,7 @@ dsp_cmx_add_conf_member(struct dsp *dsp, struct dsp_conf *conf)
 
         member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC);
         if (!member) {
-                printk(KERN_ERR "kmalloc struct dsp_conf_member failed\n");
+                printk(KERN_ERR "kzalloc struct dsp_conf_member failed\n");
                 return -ENOMEM;
         }
         member->dsp = dsp;
@@ -317,7 +317,7 @@ static struct dsp_conf
 
         conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC);
         if (!conf) {
-                printk(KERN_ERR "kmalloc struct dsp_conf failed\n");
+                printk(KERN_ERR "kzalloc struct dsp_conf failed\n");
                 return NULL;
         }
         INIT_LIST_HEAD(&conf->mlist);
@@ -1389,7 +1389,8 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
                 while (r != rr && t != tt) {
 #ifdef CMX_TX_DEBUG
                         if (strlen(debugbuf) < 48)
-                            sprintf(debugbuf+strlen(debugbuf), " %02x", p[t]);
+                                sprintf(debugbuf+strlen(debugbuf), " %02x",
+                                    p[t]);
 #endif
                         *d++ = p[t]; /* write tx_buff */
                         t = (t+1) & CMX_BUFF_MASK;
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index a0e0af81eb2e..c35750647c66 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -280,7 +280,7 @@ dsp_fill_empty(struct dsp *dsp)
 static int
 dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
 {
-        struct          sk_buff *nskb;
+        struct sk_buff  *nskb;
         int ret = 0;
         int cont;
         u8 *data;
@@ -558,7 +558,7 @@ tone_off:
                         dsp->pipeline.inuse = 1;
                         dsp_cmx_hardware(dsp->conf, dsp);
                         ret = dsp_pipeline_build(&dsp->pipeline,
-                                len > 0 ? (char *)data : NULL);
+                                len > 0 ? data : NULL);
                         dsp_cmx_hardware(dsp->conf, dsp);
                         dsp_rx_off(dsp);
                 }
@@ -720,7 +720,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)
                 /* check if dtmf soft decoding is turned on */
                 if (dsp->dtmf.software) {
                         digits = dsp_dtmf_goertzel_decode(dsp, skb->data,
-                                skb->len, (dsp_options&DSP_OPT_ULAW)?1:0);
+                                skb->len, (dsp_options&DSP_OPT_ULAW) ? 1 : 0);
                 }
                 /* we need to process receive data if software */
                 if (dsp->conf && dsp->conf->software) {
@@ -952,7 +952,7 @@ dsp_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
         int             err = 0;
 
         if (debug & DEBUG_DSP_CTRL)
-        printk(KERN_DEBUG "%s:(%x)\n", __func__, cmd);
+                printk(KERN_DEBUG "%s:(%x)\n", __func__, cmd);
 
         switch (cmd) {
         case OPEN_CHANNEL:
@@ -1175,9 +1175,9 @@ static int dsp_init(void)
 
         /* init conversion tables */
         dsp_audio_generate_law_tables();
-        dsp_silence = (dsp_options&DSP_OPT_ULAW)?0xff:0x2a;
-        dsp_audio_law_to_s32 = (dsp_options&DSP_OPT_ULAW)?dsp_audio_ulaw_to_s32:
-                dsp_audio_alaw_to_s32;
+        dsp_silence = (dsp_options&DSP_OPT_ULAW) ? 0xff : 0x2a;
+        dsp_audio_law_to_s32 = (dsp_options&DSP_OPT_ULAW) ?
+                dsp_audio_ulaw_to_s32 : dsp_audio_alaw_to_s32;
         dsp_audio_generate_s2law_table();
         dsp_audio_generate_seven();
         dsp_audio_generate_mix_table();
diff --git a/drivers/isdn/mISDN/dsp_ecdis.h b/drivers/isdn/mISDN/dsp_ecdis.h
index 8a20af43308b..21dbd153ee26 100644
--- a/drivers/isdn/mISDN/dsp_ecdis.h
+++ b/drivers/isdn/mISDN/dsp_ecdis.h
@@ -91,7 +91,7 @@ int16_t amp)
                                         && det->tone_cycle_duration <= 475*8) {
                                         det->good_cycles++;
                                         if (det->good_cycles > 2)
-                                        det->hit = TRUE;
+                                                det->hit = TRUE;
                                 }
                                 det->tone_cycle_duration = 0;
                         }
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c
index 7a9af66f4b19..1debf53670de 100644
--- a/drivers/isdn/mISDN/dsp_tones.c
+++ b/drivers/isdn/mISDN/dsp_tones.c
@@ -253,18 +253,24 @@ static struct pattern {
         {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
 
         {TONE_GERMAN_DIALPBX,
-        {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL},
-        {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL},
+        {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL,
+                NULL},
+        {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL,
+                NULL},
         {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
 
         {TONE_GERMAN_OLDDIALPBX,
-        {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL},
-        {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL},
+        {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL,
+                NULL},
+        {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL,
+                NULL},
         {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
 
         {TONE_AMERICAN_DIALPBX,
-        {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL, NULL},
-        {SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL, NULL},
+        {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL,
+                NULL},
+        {SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL,
+                NULL},
         {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
 
         {TONE_GERMAN_RINGING,
@@ -434,7 +440,7 @@ dsp_tone_hw_message(struct dsp *dsp, u8 *sample, int len)
 
         /* unlocking is not required, because we don't expect a response */
         nskb = _alloc_mISDN_skb(PH_CONTROL_REQ,
-                (len)?HFC_SPL_LOOP_ON:HFC_SPL_LOOP_OFF, len, sample,
+                (len) ? HFC_SPL_LOOP_ON : HFC_SPL_LOOP_OFF, len, sample,
                 GFP_ATOMIC);
         if (nskb) {
                 if (dsp->ch.peer) {
@@ -498,8 +504,7 @@ dsp_tone(struct dsp *dsp, int tone)
 
         /* we turn off the tone */
         if (!tone) {
-                if (dsp->features.hfc_loops)
-                if (timer_pending(&tonet->tl))
+                if (dsp->features.hfc_loops && timer_pending(&tonet->tl))
                         del_timer(&tonet->tl);
                 if (dsp->features.hfc_loops)
                         dsp_tone_hw_message(dsp, NULL, 0);
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index ea3c3aa2004b..d9cf83b17e3c 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -308,8 +308,8 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
 
         /* assemble frame */
         *p++ = (L1OIP_VERSION<<6) /* version and coding */
-             | (hc->pri?0x20:0x00) /* type */
-             | (hc->id?0x10:0x00) /* id */
+             | (hc->pri ? 0x20 : 0x00) /* type */
+             | (hc->id ? 0x10 : 0x00) /* id */
              | localcodec;
         if (hc->id) {
                 *p++ = hc->id>>24; /* id */
@@ -317,7 +317,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
                 *p++ = hc->id>>8;
                 *p++ = hc->id;
         }
-        *p++ = (multi == 1)?0x80:0x00 + channel; /* m-flag, channel */
+        *p++ = (multi == 1) ? 0x80 : 0x00 + channel; /* m-flag, channel */
         if (multi == 1)
                 *p++ = len; /* length */
         *p++ = timebase>>8; /* time base */
@@ -401,12 +401,12 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase,
         }
 
         /* prepare message */
-        nskb = mI_alloc_skb((remotecodec == 3)?(len<<1):len, GFP_ATOMIC);
+        nskb = mI_alloc_skb((remotecodec == 3) ? (len<<1) : len, GFP_ATOMIC);
         if (!nskb) {
                 printk(KERN_ERR "%s: No mem for skb.\n", __func__);
                 return;
         }
-        p = skb_put(nskb, (remotecodec == 3)?(len<<1):len);
+        p = skb_put(nskb, (remotecodec == 3) ? (len<<1) : len);
 
         if (remotecodec == 1 && ulaw)
                 l1oip_alaw_to_ulaw(buf, len, p);
@@ -458,7 +458,7 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase,
                 hc->chan[channel].disorder_flag ^= 1;
                 if (nskb)
 #endif
-                queue_ch_frame(&bch->ch, PH_DATA_IND, rx_counter, nskb);
+                        queue_ch_frame(&bch->ch, PH_DATA_IND, rx_counter, nskb);
         }
 }
 
@@ -749,8 +749,8 @@ l1oip_socket_thread(void *data)
                         l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen);
                 } else {
                         if (debug & DEBUG_L1OIP_SOCKET)
-                            printk(KERN_WARNING "%s: broken pipe on socket\n",
-                                __func__);
+                                printk(KERN_WARNING
+                                    "%s: broken pipe on socket\n", __func__);
                 }
         }
 
@@ -925,7 +925,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
                 p = skb->data;
                 l = skb->len;
                 while (l) {
-                        ll = (l < L1OIP_MAX_PERFRAME)?l:L1OIP_MAX_PERFRAME;
+                        ll = (l < L1OIP_MAX_PERFRAME) ? l : L1OIP_MAX_PERFRAME;
                         l1oip_socket_send(hc, 0, dch->slot, 0,
                                 hc->chan[dch->slot].tx_counter++, p, ll);
                         p += ll;
@@ -1173,7 +1173,7 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
                 p = skb->data;
                 l = skb->len;
                 while (l) {
-                        ll = (l < L1OIP_MAX_PERFRAME)?l:L1OIP_MAX_PERFRAME;
+                        ll = (l < L1OIP_MAX_PERFRAME) ? l : L1OIP_MAX_PERFRAME;
                         l1oip_socket_send(hc, hc->codec, bch->slot, 0,
                                 hc->chan[bch->slot].tx_counter, p, ll);
                         hc->chan[bch->slot].tx_counter += ll;
@@ -1331,8 +1331,8 @@ init_card(struct l1oip *hc, int pri, int bundle)
         spin_lock_init(&hc->socket_lock);
         hc->idx = l1oip_cnt;
         hc->pri = pri;
-        hc->d_idx = pri?16:3;
-        hc->b_num = pri?30:2;
+        hc->d_idx = pri ? 16 : 3;
+        hc->b_num = pri ? 30 : 2;
         hc->bundle = bundle;
         if (hc->pri)
                 sprintf(hc->name, "l1oip-e1.%d", l1oip_cnt + 1);
@@ -1517,9 +1517,9 @@ l1oip_init(void)
 
                 if (debug & DEBUG_L1OIP_INIT)
                         printk(KERN_DEBUG "%s: interface %d is %s with %s.\n",
-                                __func__, l1oip_cnt, pri?"PRI":"BRI",
-                                bundle?"bundled IP packet for all B-channels"
-                                 :"seperate IP packets for every B-channel");
+                            __func__, l1oip_cnt, pri ? "PRI" : "BRI",
+                            bundle ? "bundled IP packet for all B-channels" :
+                            "seperate IP packets for every B-channel");
 
                 hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC);
                 if (!hc) {
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 2a2c30a9438f..c36f52137456 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -222,7 +222,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
         } else { /* use default for L2 messages */
                 if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||
                     (sk->sk_protocol == ISDN_P_LAPD_NT))
-                    mISDN_HEAD_ID(skb) = _pms(sk)->ch.nr;
+                        mISDN_HEAD_ID(skb) = _pms(sk)->ch.nr;
         }
 
         if (*debug & DEBUG_SOCKET)
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 778b660f0672..bfcdd97df95d 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -872,7 +872,6 @@ ph_data_ind(struct manager *mgr, struct sk_buff *skb)
                             __func__, skb->len);
                 goto done;
         }
-        if (*debug  & DEBUG_L2_TEI)
 
         if ((skb->data[0] >> 2) != TEI_SAPI) /* not for us */
                 goto done;
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index bbd99d3282c0..5b7e9bf514f1 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -259,7 +259,7 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
         return ret;
 }
 
-static struct file_operations mISDN_fops = {
+static const struct file_operations mISDN_fops = {
         .read           = mISDN_read,
         .poll           = mISDN_poll,
         .ioctl          = mISDN_ioctl,