23 files changed, 104 insertions, 137 deletions
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 36c1b37cea0a..9846d82eb097 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -201,7 +201,7 @@ static unsigned char *cpars[] =
 #define structTRcpyovl(x, y, l) memmove(y, x, l)
 /*-------------------------------------------------------*/
-static unsigned command_2_index(unsigned c, unsigned sc)
+static unsigned command_2_index(u8 c, u8 sc)
 {
        if (c & 0x80)
                c = 0x9 + (c & 0x0f);
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index dde5e09e6267..83f62b8d82b5 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -20,7 +20,7 @@ if ISDN_DRV_GIGASET
 config GIGASET_CAPI
        bool "Gigaset CAPI support"
        depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m')
-        default ISDN_I4L='n'
+        default 'y'
        help
          Build the Gigaset driver as a CAPI 2.0 driver interfacing with
          the Kernel CAPI subsystem. To use it with the old ISDN4Linux
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index eb63a0f7a02a..166537e2dfca 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -751,9 +751,6 @@ void gigaset_stop(struct cardstate *cs);
 /* Tell common.c that the driver is being unloaded. */
 int gigaset_shutdown(struct cardstate *cs);
-/* Tell common.c that an skb has been sent. */
-void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb);
 /* Append event to the queue.
 * Returns NULL on failure or a pointer to the event on success.
 * ptr must be kmalloc()ed (and not be freed by the caller).
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index a8e652dac54d..5f306e2eece5 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -293,7 +293,7 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
 }
 static int write_modem(struct cardstate *cs);
-static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb);
+static int send_cb(struct cardstate *cs);
 /* Write tasklet handler: Continue sending current skb, or send command, or
@@ -303,8 +303,6 @@ static void gigaset_modem_fill(unsigned long data)
 {
        struct cardstate *cs = (struct cardstate *) data;
        struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
-        struct cmdbuf_t *cb;
-        int again;
        gig_dbg(DEBUG_OUTPUT, "modem_fill");
@@ -313,36 +311,32 @@ static void gigaset_modem_fill(unsigned long data)
                return;
        }
-        do {
+again:
-                again = 0;
+        if (!bcs->tx_skb) {     /* no skb is being sent */
-                if (!bcs->tx_skb) { /* no skb is being sent */
+                if (cs->cmdbuf) {       /* commands to send? */
-                        cb = cs->cmdbuf;
+                        gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
-                        if (cb) { /* commands to send? */
+                        if (send_cb(cs) < 0) {
-                                gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
-                                if (send_cb(cs, cb) < 0) {
-                                        gig_dbg(DEBUG_OUTPUT,
-                                                "modem_fill: send_cb failed");
-                                        again = 1; /* no callback will be
-                                                      called! */
-                                }
-                        } else { /* skbs to send? */
-                                bcs->tx_skb = skb_dequeue(&bcs->squeue);
-                                if (bcs->tx_skb)
-                                        gig_dbg(DEBUG_INTR,
-                                                "Dequeued skb (Adr: %lx)!",
-                                                (unsigned long) bcs->tx_skb);
-                        }
-                }
-                if (bcs->tx_skb) {
-                        gig_dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
-                        if (write_modem(cs) < 0) {
                                gig_dbg(DEBUG_OUTPUT,
-                                        "modem_fill: write_modem failed");
+                                        "modem_fill: send_cb failed");
-                                again = 1; /* no callback will be called! */
+                                goto again; /* no callback will be called! */
                        }
+                        return;
                }
-        } while (again);
+                /* skbs to send? */
+                bcs->tx_skb = skb_dequeue(&bcs->squeue);
+                if (!bcs->tx_skb)
+                        return;
+                gig_dbg(DEBUG_INTR, "Dequeued skb (Adr: %lx)!",
+                        (unsigned long) bcs->tx_skb);
+        }
+        gig_dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
+        if (write_modem(cs) < 0) {
+                gig_dbg(DEBUG_OUTPUT, "modem_fill: write_modem failed");
+                goto again;     /* no callback will be called! */
+        }
 }
 /*
@@ -429,9 +423,9 @@ static void gigaset_write_bulk_callback(struct urb *urb)
        spin_unlock_irqrestore(&cs->lock, flags);
 }
-static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
+static int send_cb(struct cardstate *cs)
 {
-        struct cmdbuf_t *tcb;
+        struct cmdbuf_t *cb = cs->cmdbuf;
        unsigned long flags;
        int count;
        int status = -ENOENT;
@@ -439,26 +433,27 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
        do {
                if (!cb->len) {
-                        tcb = cb;
                        spin_lock_irqsave(&cs->cmdlock, flags);
                        cs->cmdbytes -= cs->curlen;
                        gig_dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left",
                                cs->curlen, cs->cmdbytes);
-                        cs->cmdbuf = cb = cb->next;
+                        cs->cmdbuf = cb->next;
-                        if (cb) {
+                        if (cs->cmdbuf) {
-                                cb->prev = NULL;
+                                cs->cmdbuf->prev = NULL;
-                                cs->curlen = cb->len;
+                                cs->curlen = cs->cmdbuf->len;
                        } else {
                                cs->lastcmdbuf = NULL;
                                cs->curlen = 0;
                        }
                        spin_unlock_irqrestore(&cs->cmdlock, flags);
-                        if (tcb->wake_tasklet)
+                        if (cb->wake_tasklet)
-                                tasklet_schedule(tcb->wake_tasklet);
+                                tasklet_schedule(cb->wake_tasklet);
-                        kfree(tcb);
+                        kfree(cb);
+                        cb = cs->cmdbuf;
                }
                if (cb) {
                        count = min(cb->len, ucs->bulk_out_size);
                        gig_dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count);
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index a82e542ffc21..d7c286656a25 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -1474,7 +1474,7 @@ static byte connect_res(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
                                        add_ai(plci, &parms[5]);
                                        sig_req(plci, REJECT, 0);
                                }
-                                else if (Reject == 1 || Reject > 9)
+                                else if (Reject == 1 || Reject >= 9)
                                {
                                        add_ai(plci, &parms[5]);
                                        sig_req(plci, HANGUP, 0);
@@ -4880,7 +4880,7 @@ static void sig_ind(PLCI *plci)
        byte SS_Ind[] = "\x05\x02\x00\x02\x00\x00"; /* Hold_Ind struct*/
        byte CF_Ind[] = "\x09\x02\x00\x06\x00\x00\x00\x00\x00\x00";
        byte Interr_Err_Ind[] = "\x0a\x02\x00\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-        byte CONF_Ind[] = "\x09\x16\x00\x06\x00\x00\0x00\0x00\0x00\0x00";
+        byte CONF_Ind[] = "\x09\x16\x00\x06\x00\x00\x00\x00\x00\x00";
        byte force_mt_info = false;
        byte dir;
        dword d;
diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig
index b8611e3e5e74..09df54fc1fef 100644
--- a/drivers/isdn/hardware/mISDN/Kconfig
+++ b/drivers/isdn/hardware/mISDN/Kconfig
@@ -24,7 +24,7 @@ config MISDN_HFCMULTI
           * HFC-E1 (E1 interface for 2Mbit ISDN)
 config MISDN_HFCMULTI_8xx
-        boolean "Support for XHFC embedded board in HFC multiport driver"
+        bool "Support for XHFC embedded board in HFC multiport driver"
        depends on MISDN
        depends on MISDN_HFCMULTI
        depends on 8xx
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 3c92780bda09..ff48da61c94c 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1755,7 +1755,7 @@ init_card(struct hfc_pci *hc)
                enable_hwirq(hc);
                spin_unlock_irqrestore(&hc->lock, flags);
                /* Timeout 80ms */
-                current->state = TASK_UNINTERRUPTIBLE;
+                set_current_state(TASK_UNINTERRUPTIBLE);
                schedule_timeout((80 * HZ) / 1000);
                printk(KERN_INFO "HFC PCI: IRQ %d count %d\n",
                       hc->irq, hc->irqcnt);
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index ccd7d851be26..a77eea594b69 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -754,10 +754,10 @@ dbusy_timer_handler(struct isac_hw *isac)
 }
 static int
-open_dchannel(struct isac_hw *isac, struct channel_req *rq)
+open_dchannel_caller(struct isac_hw *isac, struct channel_req *rq, void *caller)
 {
        pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__,
-                 isac->dch.dev.id, __builtin_return_address(1));
+                 isac->dch.dev.id, caller);
        if (rq->protocol != ISDN_P_TE_S0)
                return -EINVAL;
        if (rq->adr.channel == 1)
@@ -771,6 +771,12 @@ open_dchannel(struct isac_hw *isac, struct channel_req *rq)
        return 0;
 }
+static int
+open_dchannel(struct isac_hw *isac, struct channel_req *rq)
+{
+        return open_dchannel_caller(isac, rq, __builtin_return_address(0));
+}
 static const char *ISACVer[] =
 {"2086/2186 V1.1", "2085 B1", "2085 B2",
 "2085 V2.3"};
@@ -1548,7 +1554,7 @@ ipac_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
        case OPEN_CHANNEL:
                rq = arg;
                if (rq->protocol == ISDN_P_TE_S0)
-                        err = open_dchannel(isac, rq);
+                        err = open_dchannel_caller(isac, rq, __builtin_return_address(0));
                else
                        err = open_bchannel(ipac, rq);
                if (err)
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index de69f6828c76..741675525b53 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1176,10 +1176,10 @@ w6692_l1callback(struct dchannel *dch, u32 cmd)
 }
 static int
-open_dchannel(struct w6692_hw *card, struct channel_req *rq)
+open_dchannel(struct w6692_hw *card, struct channel_req *rq, void *caller)
 {
        pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__,
-                 card->dch.dev.id, __builtin_return_address(1));
+                 card->dch.dev.id, caller);
        if (rq->protocol != ISDN_P_TE_S0)
                return -EINVAL;
        if (rq->adr.channel == 1)
@@ -1207,7 +1207,7 @@ w6692_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
        case OPEN_CHANNEL:
                rq = arg;
                if (rq->protocol == ISDN_P_TE_S0)
-                        err = open_dchannel(card, rq);
+                        err = open_dchannel(card, rq, __builtin_return_address(0));
                else
                        err = open_bchannel(card, rq);
                if (err)
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index fc9f9d03fa13..0e5d673871c0 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -225,20 +225,6 @@ fWrite_hfc8(hfc4s8s_hw *a, u_char c)
 }
 static inline void
-Write_hfc16(hfc4s8s_hw *a, u_char b, u_short c)
-{
-        SetRegAddr(a, b);
-        outw(c, a->iobase);
-}
-static inline void
-Write_hfc32(hfc4s8s_hw *a, u_char b, u_long c)
-{
-        SetRegAddr(a, b);
-        outl(c, a->iobase);
-}
-static inline void
 fWrite_hfc32(hfc4s8s_hw *a, u_long c)
 {
        outl(c, a->iobase);
@@ -266,13 +252,6 @@ Read_hfc16(hfc4s8s_hw *a, u_char b)
 }
 static inline u_long
-Read_hfc32(hfc4s8s_hw *a, u_char b)
-{
-        SetRegAddr(a, b);
-        return (inl((volatile u_int) a->iobase));
-}
-static inline u_long
 fRead_hfc32(hfc4s8s_hw *a)
 {
        return (inl((volatile u_int) a->iobase));
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index 838531b6a60e..14dada42874e 100644
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -31,7 +31,7 @@ WaitForBusy(struct IsdnCardState *cs)
                to--;
        }
        if (!to) {
-                printk(KERN_WARNING "HiSax: waitforBusy timeout\n");
+                printk(KERN_WARNING "HiSax: %s timeout\n", __func__);
                return (0);
        } else
                return (to);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index fa1fefd711cd..b1fad81f0722 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1159,7 +1159,8 @@ hfcsx_l2l1(struct PStack *st, int pr, void *arg)
        case (PH_PULL | INDICATION):
                spin_lock_irqsave(&bcs->cs->lock, flags);
                if (bcs->tx_skb) {
-                        printk(KERN_WARNING "hfc_l2l1: this shouldn't happen\n");
+                        printk(KERN_WARNING "%s: this shouldn't happen\n",
+                               __func__);
                } else {
 //                              test_and_set_bit(BC_FLG_BUSY, &bcs->Flag);
                        bcs->tx_skb = skb;
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 849a80752685..678bd5224bc3 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -927,9 +927,8 @@ start_int_fifo(usb_fifo *fifo)
        fifo->active = 1;       /* must be marked active */
        errcode = usb_submit_urb(fifo->urb, GFP_KERNEL);
        if (errcode) {
-                printk(KERN_ERR
+                printk(KERN_ERR "HFC-S USB: submit URB error(%s): status:%i\n",
-                       "HFC-S USB: submit URB error(start_int_info): status:%i\n",
+                       __func__, errcode);
-                       errcode);
                fifo->active = 0;
                fifo->skbuff = NULL;
        }
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index 5faa5de24305..9cc26b40a437 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -580,7 +580,7 @@ bch_fill_fifo(struct BCState *bcs)
        if (cs->debug & L1_DEB_HSCX_FIFO) {
                char *t = bcs->blog;
-                t += sprintf(t, "chb_fill_fifo() B-%d cnt %d", hscx, count);
+                t += sprintf(t, "%s() B-%d cnt %d", __func__, hscx, count);
                QuickHex(t, ptr, count);
                debugl1(cs, "%s", bcs->blog);
        }
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index 800095781bfb..a560842c0e48 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -867,7 +867,7 @@ l1_msg(struct IsdnCardState *cs, int pr, void *arg) {
                        break;
                default:
                        if (cs->debug)
-                                debugl1(cs, "l1msg %04X unhandled", pr);
+                                debugl1(cs, "%s %04X unhandled", __func__, pr);
                        break;
                }
                st = st->next;
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
index 45b03840f716..c754706f83cd 100644
--- a/drivers/isdn/hisax/isdnl3.c
+++ b/drivers/isdn/hisax/isdnl3.c
@@ -153,7 +153,7 @@ void
 newl3state(struct l3_process *pc, int state)
 {
        if (pc->debug & L3_DEB_STATE)
-                l3_debug(pc->st, "newstate cr %d %d --> %d",
+                l3_debug(pc->st, "%s cr %d %d --> %d", __func__,
                         pc->callref & 0x7F,
                         pc->state, state);
        pc->state = state;
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index 00aad10507d8..93bae94314a6 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -501,7 +501,7 @@ static char *hycapi_procinfo(struct capi_ctr *ctrl)
 {
        hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata);
 #ifdef HYCAPI_PRINTFNAMES
-        printk(KERN_NOTICE "hycapi_proc_info\n");
+        printk(KERN_NOTICE "%s\n", __func__);
 #endif
        if (!cinfo)
                return "";
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 6a7447c304ac..358a574d9e8b 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1609,7 +1609,7 @@ icn_setup(char *line)
        if (ints[0] > 1)
                membase = (unsigned long)ints[2];
        if (str && *str) {
-                strcpy(sid, str);
+                strlcpy(sid, str, sizeof(sid));
                icn_id = sid;
                if ((p = strchr(sid, ','))) {
                        *p++ = 0;
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index 5a4da94aefb0..ef9c8e4f1fa2 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -59,7 +59,8 @@ isdnloop_bchan_send(isdnloop_card *card, int ch)
        isdn_ctrl cmd;
        while (card->sndcount[ch]) {
-                if ((skb = skb_dequeue(&card->bqueue[ch]))) {
+                skb = skb_dequeue(&card->bqueue[ch]);
+                if (skb) {
                        len = skb->len;
                        card->sndcount[ch] -= len;
                        ack = *(skb->head); /* used as scratch area */
@@ -149,8 +150,7 @@ typedef struct isdnloop_stat {
        int action;
 } isdnloop_stat;
 /* *INDENT-OFF* */
-static isdnloop_stat isdnloop_stat_table[] =
+static isdnloop_stat isdnloop_stat_table[] = {
-{
        {"BCON_",          ISDN_STAT_BCONN, 1}, /* B-Channel connected        */
        {"BDIS_",          ISDN_STAT_BHUP,  2}, /* B-Channel disconnected     */
        {"DCON_",          ISDN_STAT_DCONN, 0}, /* D-Channel connected        */
@@ -317,7 +317,8 @@ isdnloop_polldchan(unsigned long data)
        u_char *p;
        isdn_ctrl cmd;
-        if ((skb = skb_dequeue(&card->dqueue)))
+        skb = skb_dequeue(&card->dqueue);
+        if (skb)
                avail = skb->len;
        else
                avail = 0;
@@ -471,8 +472,8 @@ isdnloop_fake(isdnloop_card *card, char *s, int ch)
 {
        struct sk_buff *skb;
        int len = strlen(s) + ((ch >= 0) ? 3 : 0);
+        skb = dev_alloc_skb(len);
-        if (!(skb = dev_alloc_skb(len))) {
+        if (!skb) {
                printk(KERN_WARNING "isdnloop: Out of memory in isdnloop_fake\n");
                return 1;
        }
@@ -483,8 +484,7 @@ isdnloop_fake(isdnloop_card *card, char *s, int ch)
        return 0;
 }
 /* *INDENT-OFF* */
-static isdnloop_stat isdnloop_cmd_table[] =
+static isdnloop_stat isdnloop_cmd_table[] = {
-{
        {"BCON_R",         0,  1},      /* B-Channel connect        */
        {"BCON_I",         0, 17},      /* B-Channel connect ind    */
        {"BDIS_R",         0,  2},      /* B-Channel disconnect     */
@@ -525,10 +525,8 @@ isdnloop_fake_err(isdnloop_card *card)
        isdnloop_fake(card, "NAK", -1);
 }
-static u_char ctable_eu[] =
+static u_char ctable_eu[] = {0x00, 0x11, 0x01, 0x12};
-{0x00, 0x11, 0x01, 0x12};
+static u_char ctable_1t[] = {0x00, 0x3b, 0x01, 0x3a};
-static u_char ctable_1t[] =
-{0x00, 0x3b, 0x01, 0x3a};
 /*
 * Assemble a simplified cause message depending on the
@@ -554,9 +552,9 @@ isdnloop_unicause(isdnloop_card *card, int loc, int cau)
                sprintf(buf, "%02X44", ctable_1t[cau]);
                break;
        default:
-                return ("0000");
+                return "0000";
        }
-        return (buf);
+        return buf;
 }
 /*
@@ -647,10 +645,8 @@ isdnloop_kill_ctimer(isdnloop_card *card, int ch)
        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
-static u_char si2bit[] =
+static u_char si2bit[] = {0, 1, 0, 0, 0, 2, 0, 4, 0, 0};
-{0, 1, 0, 0, 0, 2, 0, 4, 0, 0};
+static u_char bit2si[] = {1, 5, 7};
-static u_char bit2si[] =
-{1, 5, 7};
 /*
 * Try finding a listener for an outgoing call.
@@ -754,17 +750,17 @@ isdnloop_vstphone(isdnloop_card *card, char *phone, int caller)
                if (caller) {
                        for (i = 0; i < 2; i++)
                                if (!(strcmp(card->s0num[i], phone)))
-                                        return (phone);
+                                        return phone;
-                        return (card->s0num[0]);
+                        return card->s0num[0];
                }
-                return (phone);
+                return phone;
                break;
        case ISDN_PTYPE_1TR6:
                if (caller) {
                        sprintf(nphone, "%s%c", card->s0num[0], phone[0]);
-                        return (nphone);
+                        return nphone;
                } else
-                        return (&phone[strlen(phone) - 1]);
+                        return &phone[strlen(phone) - 1];
                break;
        }
        return "";
@@ -1148,14 +1144,14 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card)
                case ISDNLOOP_IOCTL_STARTUP:
                        if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef)))
                                return -EFAULT;
-                        return (isdnloop_start(card, (isdnloop_sdef *) a));
+                        return isdnloop_start(card, (isdnloop_sdef *) a);
                        break;
                case ISDNLOOP_IOCTL_ADDCARD:
                        if (copy_from_user((char *)&cdef,
                                           (char *)a,
                                           sizeof(cdef)))
                                return -EFAULT;
-                        return (isdnloop_addcard(cdef.id1));
+                        return isdnloop_addcard(cdef.id1);
                        break;
                case ISDNLOOP_IOCTL_LEASEDCFG:
                        if (a) {
@@ -1377,7 +1373,7 @@ if_command(isdn_ctrl *c)
        isdnloop_card *card = isdnloop_findcard(c->driver);
        if (card)
-                return (isdnloop_command(c, card));
+                return isdnloop_command(c, card);
        printk(KERN_ERR
               "isdnloop: if_command called with invalid driverId!\n");
        return -ENODEV;
@@ -1391,7 +1387,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
        if (card) {
                if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
                        return -ENODEV;
-                return (isdnloop_writecmd(buf, len, 1, card));
+                return isdnloop_writecmd(buf, len, 1, card);
        }
        printk(KERN_ERR
               "isdnloop: if_writecmd called with invalid driverId!\n");
@@ -1406,7 +1402,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
        if (card) {
                if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
                        return -ENODEV;
-                return (isdnloop_readstatus(buf, len, card));
+                return isdnloop_readstatus(buf, len, card);
        }
        printk(KERN_ERR
               "isdnloop: if_readstatus called with invalid driverId!\n");
@@ -1423,7 +1419,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
                        return -ENODEV;
                /* ack request stored in skb scratch area */
                *(skb->head) = ack;
-                return (isdnloop_sendbuf(channel, skb, card));
+                return isdnloop_sendbuf(channel, skb, card);
        }
        printk(KERN_ERR
               "isdnloop: if_sendbuf called with invalid driverId!\n");
@@ -1439,8 +1435,8 @@ isdnloop_initcard(char *id)
 {
        isdnloop_card *card;
        int i;
+        card = kzalloc(sizeof(isdnloop_card), GFP_KERNEL);
-        if (!(card = kzalloc(sizeof(isdnloop_card), GFP_KERNEL))) {
+        if (!card) {
                printk(KERN_WARNING
                       "isdnloop: (%s) Could not allocate card-struct.\n", id);
                return (isdnloop_card *) 0;
@@ -1489,8 +1485,8 @@ static int
 isdnloop_addcard(char *id1)
 {
        isdnloop_card *card;
+        card = isdnloop_initcard(id1);
-        if (!(card = isdnloop_initcard(id1))) {
+        if (!card) {
                return -EIO;
        }
        printk(KERN_INFO
@@ -1503,7 +1499,7 @@ static int __init
 isdnloop_init(void)
 {
        if (isdnloop_id)
-                return (isdnloop_addcard(isdnloop_id));
+                return isdnloop_addcard(isdnloop_id);
        return 0;
 }
diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c
index a601c8472220..9b033be11a5f 100644
--- a/drivers/isdn/mISDN/l1oip_codec.c
+++ b/drivers/isdn/mISDN/l1oip_codec.c
@@ -312,10 +312,8 @@ l1oip_ulaw_to_alaw(u8 *data, int len, u8 *result)
 void
 l1oip_4bit_free(void)
 {
-        if (table_dec)
+        vfree(table_dec);
-                vfree(table_dec);
+        vfree(table_com);
-        if (table_com)
-                vfree(table_com);
        table_com = NULL;
        table_dec = NULL;
 }
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 1be82284cf9d..84b35925ee4d 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -163,7 +163,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
        memcpy(skb_push(skb, MISDN_HEADER_LEN), mISDN_HEAD_P(skb),
               MISDN_HEADER_LEN);
-        err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+        err = skb_copy_datagram_msg(skb, 0, msg, copied);
        mISDN_sock_cmsg(sk, msg, skb);
@@ -203,7 +203,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
        if (!skb)
                goto done;
-        if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
+        if (memcpy_from_msg(skb_put(skb, len), msg, len)) {
                err = -EFAULT;
                goto done;
        }
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
index 42ecfef80132..46e1240ae074 100644
--- a/drivers/isdn/pcbit/layer2.c
+++ b/drivers/isdn/pcbit/layer2.c
@@ -85,7 +85,6 @@ pcbit_l2_write(struct pcbit_dev *dev, ulong msg, ushort refnum,
        }
        if ((frame = kmalloc(sizeof(struct frame_buf),
                             GFP_ATOMIC)) == NULL) {
-                printk(KERN_WARNING "pcbit_2_write: kmalloc failed\n");
                dev_kfree_skb(skb);
                return -1;
        }
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index d6f19b168e8a..3597ef47b28a 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -30,7 +30,7 @@ static const char *boardname[] = { "DataCommute/BRI", "DataCommute/PRI", "TeleCo
 static unsigned int io[] = {0, 0, 0, 0};
 static unsigned char irq[] = {0, 0, 0, 0};
 static unsigned long ram[] = {0, 0, 0, 0};
-static bool do_reset = 0;
+static bool do_reset;
 module_param_array(io, int, NULL, 0);
 module_param_array(irq, byte, NULL, 0);
@@ -104,13 +104,12 @@ static int __init sc_init(void)
                                         io[b] + 0x400 * EXP_PAGE0);
                                continue;
                        }
-                }
+                } else {
-                else {
                        /*
                         * Yes, probe for I/O Base
                         */
                        if (probe_exhasted) {
-                                pr_debug("All probe addresses exhasted, skipping\n");
+                                pr_debug("All probe addresses exhausted, skipping\n");
                                continue;
                        }
                        pr_debug("Probing for I/O...\n");
@@ -169,8 +168,7 @@ static int __init sc_init(void)
                                model = identify_board(ram[b], io[b]);
                                release_region(ram[b], SRAM_PAGESIZE);
                        }
-                }
+                } else {
-                else {
                        /*
                         * Yes, probe for free RAM and look for
                         * a signature and id the board model
@@ -187,7 +185,7 @@ static int __init sc_init(void)
                                                ram[b] = i;
                                                break;
                                        }
-                                        pr_debug("  Unidentifed or inaccessible\n");
+                                        pr_debug("  Unidentified or inaccessible\n");
                                        continue;
                                }
                                pr_debug("  request failed\n");
@@ -337,8 +335,7 @@ static int __init sc_init(void)
                sc_adapter[cinst]->interrupt = irq[b];
                if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler,
                                0, interface->id,
-                                (void *)(unsigned long) cinst))
+                                (void *)(unsigned long) cinst)) {
-                {
                        kfree(sc_adapter[cinst]->channel);
                        indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL);      /* Fix me */
                        kfree(interface);