27 files changed, 117 insertions, 78 deletions

diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index e54e79d4e2c1..92607ed25e2e 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -2297,6 +2297,7 @@ static int __init capidrv_init(void)
 
         errcode = capi20_get_profile(0, &profile);
         if (errcode != CAPI_NOERROR) {
+                unregister_capictr_notifier(&capictr_nb);
                 capi20_release(&global.ap);
                 return -EIO;
         }
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index 3acf94cc5acd..2b33b2627fce 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -38,6 +38,7 @@
 #include <linux/rcupdate.h>
 
 static int showcapimsgs = 0;
+static struct workqueue_struct *kcapi_wq;
 
 MODULE_DESCRIPTION("CAPI4Linux: kernel CAPI layer");
 MODULE_AUTHOR("Carsten Paeth");
@@ -291,7 +292,7 @@ static int notify_push(unsigned int event_type, u32 controller)
         event->type = event_type;
         event->controller = controller;
 
-        schedule_work(&event->work);
+        queue_work(kcapi_wq, &event->work);
         return 0;
 }
 
@@ -408,7 +409,7 @@ void capi_ctr_handle_message(struct capi_ctr *ctr, u16 appl,
                 goto error;
         }
         skb_queue_tail(&ap->recv_queue, skb);
-        schedule_work(&ap->recv_work);
+        queue_work(kcapi_wq, &ap->recv_work);
         rcu_read_unlock();
 
         return;
@@ -743,7 +744,7 @@ u16 capi20_release(struct capi20_appl *ap)
 
         mutex_unlock(&capi_controller_lock);
 
-        flush_scheduled_work();
+        flush_workqueue(kcapi_wq);
         skb_queue_purge(&ap->recv_queue);
 
         if (showcapimsgs & 1) {
@@ -1285,21 +1286,30 @@ static int __init kcapi_init(void)
 {
         int err;
 
+        kcapi_wq = alloc_workqueue("kcapi", 0, 0);
+        if (!kcapi_wq)
+                return -ENOMEM;
+
         register_capictr_notifier(&capictr_nb);
 
         err = cdebug_init();
-        if (!err)
-                kcapi_proc_init();
-        return err;
+        if (err) {
+                unregister_capictr_notifier(&capictr_nb);
+                destroy_workqueue(kcapi_wq);
+                return err;
+        }
+
+        kcapi_proc_init();
+        return 0;
 }
 
 static void __exit kcapi_exit(void)
 {
         kcapi_proc_exit();
 
-        /* make sure all notifiers are finished */
-        flush_scheduled_work();
+        unregister_capictr_notifier(&capictr_nb);
         cdebug_exit();
+        destroy_workqueue(kcapi_wq);
 }
 
 module_init(kcapi_init);
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index bcc174e4f3b1..658e75f18d05 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -1900,6 +1900,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
                 if (b3skb == NULL) {
                         dev_err(cs->dev, "%s: out of memory\n", __func__);
                         send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
+                        kfree(b3cmsg);
                         return;
                 }
                 capi_cmsg2message(b3cmsg,
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index e90db8870b6c..bc0529ac88a1 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -420,7 +420,7 @@ enable_hwirq(struct inf_hw *hw)
                 break;
         case INF_NICCY:
                 val = inl((u32)hw->cfg.start + NICCY_IRQ_CTRL_REG);
-                val |= NICCY_IRQ_ENABLE;;
+                val |= NICCY_IRQ_ENABLE;
                 outl(val, (u32)hw->cfg.start + NICCY_IRQ_CTRL_REG);
                 break;
         case INF_SCT_1:
@@ -924,7 +924,7 @@ setup_instance(struct inf_hw *card)
                 mISDNipac_init(&card->ipac, card);
 
         if (card->ipac.isac.dch.dev.Bprotocols == 0)
-                goto error_setup;;
+                goto error_setup;
 
         err = mISDN_register_device(&card->ipac.isac.dch.dev,
                 &card->pdev->dev, card->name);
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index 38eb31439a73..d13fa5b119f5 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -264,7 +264,7 @@ load_firmware(struct isar_hw *isar, const u8 *buf, int size)
                         while (noc) {
                                 val = le16_to_cpu(*sp++);
                                 *mp++ = val >> 8;
-                                *mp++ = val & 0xFF;;
+                                *mp++ = val & 0xFF;
                                 noc--;
                         }
                         spin_lock_irqsave(isar->hwlock, flags);
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index fcf4ed1cb4b9..0e66af1decd4 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -314,7 +314,7 @@ hdlc_fill_fifo(struct BCState *bcs)
                         bcs->hw.hdlc.ctrl.sr.cmd |= HDLC_CMD_XME;
         }
         if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
-                debugl1(cs, "hdlc_fill_fifo %d/%ld", count, bcs->tx_skb->len);
+                debugl1(cs, "hdlc_fill_fifo %d/%u", count, bcs->tx_skb->len);
         p = bcs->tx_skb->data;
         ptr = (u_int *)p;
         skb_pull(bcs->tx_skb, count);
diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c
index f150330b5a23..37e685eafd24 100644
--- a/drivers/isdn/hisax/callc.c
+++ b/drivers/isdn/hisax/callc.c
@@ -65,7 +65,7 @@ hisax_findcard(int driverid)
         return (struct IsdnCardState *) 0;
 }
 
-static void
+static __attribute__((format(printf, 3, 4))) void
 link_debug(struct Channel *chanp, int direction, char *fmt, ...)
 {
         va_list args;
@@ -1068,7 +1068,7 @@ init_d_st(struct Channel *chanp)
         return 0;
 }
 
-static void
+static __attribute__((format(printf, 2, 3))) void
 callc_debug(struct FsmInst *fi, char *fmt, ...)
 {
         va_list args;
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index b133378d4dc9..c110f8679bab 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1917,7 +1917,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
 
-static struct pci_device_id hisax_pci_tbl[] __devinitdata = {
+static struct pci_device_id hisax_pci_tbl[] __devinitdata __used = {
 #ifdef CONFIG_HISAX_FRITZPCI
         {PCI_VDEVICE(AVM,      PCI_DEVICE_ID_AVM_A1)                    },
 #endif
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 7250f56a5246..a16459a1332c 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -292,7 +292,7 @@ hfc_fill_fifo(struct BCState *bcs)
         }
         count = GetFreeFifoBytes_B(bcs);
         if (cs->debug & L1_DEB_HSCX)
-                debugl1(cs, "hfc_fill_fifo %d count(%ld/%d),%lx",
+                debugl1(cs, "hfc_fill_fifo %d count(%u/%d),%lx",
                         bcs->channel, bcs->tx_skb->len,
                         count, current->state);
         if (count < bcs->tx_skb->len) {
@@ -719,7 +719,7 @@ hfc_fill_dfifo(struct IsdnCardState *cs)
         }
         count = GetFreeFifoBytes_D(cs);
         if (cs->debug & L1_DEB_ISAC)
-                debugl1(cs, "hfc_fill_Dfifo count(%ld/%d)",
+                debugl1(cs, "hfc_fill_Dfifo count(%u/%d)",
                         cs->tx_skb->len, count);
         if (count < cs->tx_skb->len) {
                 if (cs->debug & L1_DEB_ISAC)
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index b1f6481e1193..626f85df302b 100644
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -282,7 +282,7 @@ hfc_fill_fifo(struct BCState *bcs)
             count += cs->hw.hfc.fifosize; 
         } /* L1_MODE_TRANS */
         if (cs->debug & L1_DEB_HSCX)
-                debugl1(cs, "hfc_fill_fifo %d count(%ld/%d)",
+                debugl1(cs, "hfc_fill_fifo %d count(%u/%d)",
                         bcs->channel, bcs->tx_skb->len,
                         count);
         if (count < bcs->tx_skb->len) {
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 917cc84065bd..3147020d188b 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -550,7 +550,7 @@ hfcpci_fill_dfifo(struct IsdnCardState *cs)
                 count += D_FIFO_SIZE;   /* count now contains available bytes */
 
         if (cs->debug & L1_DEB_ISAC)
-                debugl1(cs, "hfcpci_fill_Dfifo count(%ld/%d)",
+                debugl1(cs, "hfcpci_fill_Dfifo count(%u/%d)",
                         cs->tx_skb->len, count);
         if (count < cs->tx_skb->len) {
                 if (cs->debug & L1_DEB_ISAC)
@@ -681,7 +681,7 @@ hfcpci_fill_fifo(struct BCState *bcs)
                 count += B_FIFO_SIZE;   /* count now contains available bytes */
 
         if (cs->debug & L1_DEB_HSCX)
-                debugl1(cs, "hfcpci_fill_fifo %d count(%ld/%d),%lx",
+                debugl1(cs, "hfcpci_fill_fifo %d count(%u/%d),%lx",
                         bcs->channel, bcs->tx_skb->len,
                         count, current->state);
 
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index 5aa138eb0b3c..1235b7131ae1 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -179,7 +179,7 @@ write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u_char fifo, int trans
           count += fifo_size;   /* count now contains available bytes */
 
         if (cs->debug & L1_DEB_ISAC_FIFO)
-          debugl1(cs, "hfcsx_write_fifo %d count(%ld/%d)",
+          debugl1(cs, "hfcsx_write_fifo %d count(%u/%d)",
                   fifo, skb->len, count);
         if (count < skb->len) {
           if (cs->debug & L1_DEB_ISAC_FIFO)
@@ -265,7 +265,7 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max)
           count++;
 
           if (cs->debug & L1_DEB_ISAC_FIFO)
-            debugl1(cs, "hfcsx_read_fifo %d count %ld)",
+            debugl1(cs, "hfcsx_read_fifo %d count %u)",
                     fifo, count);
 
           if ((count > fifo_size) || (count < 4)) {
@@ -986,7 +986,7 @@ HFCSX_l1hw(struct PStack *st, int pr, void *arg)
                                 default:
                                         spin_unlock_irqrestore(&cs->lock, flags);
                                         if (cs->debug & L1_DEB_WARN)
-                                                debugl1(cs, "hfcsx_l1hw loop invalid %4lx", arg);
+                                                debugl1(cs, "hfcsx_l1hw loop invalid %4lx", (unsigned long)arg);
                                         return;
                         }
                         cs->hw.hfcsx.trm |= 0x80;       /* enable IOM-loop */
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 32ab3924aa73..de1c669c7b13 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -1286,7 +1286,9 @@ int jiftime(char *s, long mark);
 
 int HiSax_command(isdn_ctrl * ic);
 int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb);
+__attribute__((format(printf, 3, 4)))
 void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...);
+__attribute__((format(printf, 3, 0)))
 void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args);
 void HiSax_reportcard(int cardnr, int sel);
 int QuickHex(char *txt, u_char * p, int cnt);
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index 751b25f2ff58..332104103e18 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -717,7 +717,7 @@ bch_mode(struct BCState *bcs, int mode, int bc)
 
         bc = bc ? 1 : 0;  // in case bc is greater than 1
         if (cs->debug & L1_DEB_HSCX)
-                debugl1(cs, "mode_bch() switch B-% mode %d chan %d", hscx, mode, bc);
+                debugl1(cs, "mode_bch() switch B-%d mode %d chan %d", hscx, mode, bc);
         bcs->mode = mode;
         bcs->channel = bc;
   
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index 2e72227bd071..d4cce337add2 100644
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -189,7 +189,7 @@ ISARVersion(struct IsdnCardState *cs, char *s)
 static int
 isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf)
 {
-        int ret, size, cnt, debug;
+        int cfu_ret, ret, size, cnt, debug;
         u_char len, nom, noc;
         u_short sadr, left, *sp;
         u_char __user *p = buf;
@@ -212,9 +212,10 @@ isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf)
         cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO);
 #endif
         
-        if ((ret = copy_from_user(&size, p, sizeof(int)))) {
-                printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret);
-                return ret;
+        cfu_ret = copy_from_user(&size, p, sizeof(int));
+        if (cfu_ret) {
+                printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", cfu_ret);
+                return -EFAULT;
         }
         p += sizeof(int);
         printk(KERN_DEBUG"isar_load_firmware size: %d\n", size);
@@ -953,7 +954,7 @@ isar_pump_statev_modem(struct BCState *bcs, u_char devt) {
                         break;
                 case PSEV_GSTN_CLR:
                         if (cs->debug & L1_DEB_HSCX)
-                                debugl1(cs, "pump stev GSTN CLEAR", devt);
+                                debugl1(cs, "pump stev GSTN CLEAR");
                         break;
                 default:
                         if (cs->debug & L1_DEB_HSCX)
@@ -1268,7 +1269,7 @@ isar_int_main(struct IsdnCardState *cs)
 static void
 ftimer_handler(struct BCState *bcs) {
         if (bcs->cs->debug)
-                debugl1(bcs->cs, "ftimer flags %04x",
+                debugl1(bcs->cs, "ftimer flags %04lx",
                         bcs->Flag);
         test_and_clear_bit(BC_FLG_FTI_RUN, &bcs->Flag);
         if (test_and_clear_bit(BC_FLG_LL_CONN, &bcs->Flag)) {
@@ -1748,7 +1749,7 @@ isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
         struct BCState *bcs;
 
         if (cs->debug & L1_DEB_HSCX)
-                debugl1(cs, "isar_auxcmd cmd/ch %x/%d", ic->command, ic->arg);
+                debugl1(cs, "isar_auxcmd cmd/ch %x/%ld", ic->command, ic->arg);
         switch (ic->command) {
                 case (ISDN_CMD_FAXCMD):
                         bcs = cs->channel[ic->arg].bcs;
diff --git a/drivers/isdn/hisax/isdnl1.h b/drivers/isdn/hisax/isdnl1.h
index 172ad4c8c961..425d86116f2b 100644
--- a/drivers/isdn/hisax/isdnl1.h
+++ b/drivers/isdn/hisax/isdnl1.h
@@ -21,6 +21,7 @@
 #define B_XMTBUFREADY   1
 #define B_ACKPENDING    2
 
+__attribute__((format(printf, 2, 3)))
 void debugl1(struct IsdnCardState *cs, char *fmt, ...);
 void DChannel_proc_xmt(struct IsdnCardState *cs);
 void DChannel_proc_rcv(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
index fd0b643ab740..ad291f21b201 100644
--- a/drivers/isdn/hisax/isdnl3.c
+++ b/drivers/isdn/hisax/isdnl3.c
@@ -66,7 +66,7 @@ static char *strL3Event[] =
         "EV_TIMEOUT",
 };
 
-static void
+static __attribute__((format(printf, 2, 3))) void
 l3m_debug(struct FsmInst *fi, char *fmt, ...)
 {
         va_list args;
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 5d7f0f2ff9b9..644891efc26f 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -254,7 +254,7 @@ static int make_raw_data(struct BCState *bcs) {
                 val >>= 1;
         }
         if (bcs->cs->debug & L1_DEB_HSCX)
-                debugl1(bcs->cs,"tiger make_raw: in %ld out %d.%d",
+                debugl1(bcs->cs,"tiger make_raw: in %u out %d.%d",
                         bcs->tx_skb->len, s_cnt, bitcnt);
         if (bitcnt) {
                 while (8>bitcnt++) {
@@ -361,7 +361,7 @@ static int make_raw_data_56k(struct BCState *bcs) {
                 val >>= 1;
         }
         if (bcs->cs->debug & L1_DEB_HSCX)
-                debugl1(bcs->cs,"tiger make_raw_56k: in %ld out %d.%d",
+                debugl1(bcs->cs,"tiger make_raw_56k: in %u out %d.%d",
                         bcs->tx_skb->len, s_cnt, bitcnt);
         if (bitcnt) {
                 while (8>bitcnt++) {
@@ -612,7 +612,7 @@ void netjet_fill_dma(struct BCState *bcs)
         if (!bcs->tx_skb)
                 return;
         if (bcs->cs->debug & L1_DEB_HSCX)
-                debugl1(bcs->cs,"tiger fill_dma1: c%d %4x", bcs->channel,
+                debugl1(bcs->cs,"tiger fill_dma1: c%d %4lx", bcs->channel,
                         bcs->Flag);
         if (test_and_set_bit(BC_FLG_BUSY, &bcs->Flag))
                 return;
@@ -625,7 +625,7 @@ void netjet_fill_dma(struct BCState *bcs)
                         return;         
         };
         if (bcs->cs->debug & L1_DEB_HSCX)
-                debugl1(bcs->cs,"tiger fill_dma2: c%d %4x", bcs->channel,
+                debugl1(bcs->cs,"tiger fill_dma2: c%d %4lx", bcs->channel,
                         bcs->Flag);
         if (test_and_clear_bit(BC_FLG_NOFRAME, &bcs->Flag)) {
                 write_raw(bcs, bcs->hw.tiger.sendp, bcs->hw.tiger.free);
@@ -667,7 +667,7 @@ void netjet_fill_dma(struct BCState *bcs)
                 write_raw(bcs, p, cnt);
         }
         if (bcs->cs->debug & L1_DEB_HSCX)
-                debugl1(bcs->cs,"tiger fill_dma3: c%d %4x", bcs->channel,
+                debugl1(bcs->cs,"tiger fill_dma3: c%d %4lx", bcs->channel,
                         bcs->Flag);
 }
 
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index b7876b19fe73..44082637a09f 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -167,7 +167,8 @@ static struct FsmNode L1FnList[] __initdata =
         {ST_L1_F8, EV_IND_RSY,           l1_ignore},
 };
 
-static void l1m_debug(struct FsmInst *fi, char *fmt, ...)
+static __attribute__((format(printf, 2, 3)))
+void l1m_debug(struct FsmInst *fi, char *fmt, ...)
 {
         va_list args;
         char buf[256];
@@ -269,7 +270,8 @@ static char *strDoutEvent[] =
         "EV_DOUT_UNDERRUN",
 };
 
-static void dout_debug(struct FsmInst *fi, char *fmt, ...)
+static __attribute__((format(printf, 2, 3)))
+void dout_debug(struct FsmInst *fi, char *fmt, ...)
 {
         va_list args;
         char buf[256];
diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
index 46048e55f241..d568689669f8 100644
--- a/drivers/isdn/i4l/isdn_concap.c
+++ b/drivers/isdn/i4l/isdn_concap.c
@@ -61,7 +61,7 @@ static int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *
 static int isdn_concap_dl_connect_req(struct concap_proto *concap)
 {
         struct net_device *ndev = concap -> net_dev;
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
+        isdn_net_local *lp = netdev_priv(ndev);
         int ret;
         IX25DEBUG( "isdn_concap_dl_connect_req: %s \n", ndev -> name);
 
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 26d44c3ca1d8..afeede7ee295 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -827,7 +827,7 @@ isdn_net_dial(void)
 void
 isdn_net_hangup(struct net_device *d)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(d);
+        isdn_net_local *lp = netdev_priv(d);
         isdn_ctrl cmd;
 #ifdef CONFIG_ISDN_X25
         struct concap_proto *cprot = lp->netdev->cprot;
@@ -1052,7 +1052,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
 {
         isdn_net_dev *nd;
         isdn_net_local *slp;
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
+        isdn_net_local *lp = netdev_priv(ndev);
         int retv = NETDEV_TX_OK;
 
         if (((isdn_net_local *) netdev_priv(ndev))->master) {
@@ -1116,7 +1116,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
 static void
 isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+        isdn_net_local *lp = netdev_priv(dev);
         if (!skb)
                 return;
         if (lp->p_encap == ISDN_NET_ENCAP_ETHER) {
@@ -1131,7 +1131,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
 
 static void isdn_net_tx_timeout(struct net_device * ndev)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
+        isdn_net_local *lp = netdev_priv(ndev);
 
         printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ndev->name, lp->dialstate);
         if (!lp->dialstate){
@@ -1165,7 +1165,7 @@ static void isdn_net_tx_timeout(struct net_device * ndev)
 static netdev_tx_t
 isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
+        isdn_net_local *lp = netdev_priv(ndev);
 #ifdef CONFIG_ISDN_X25
         struct concap_proto * cprot = lp -> netdev -> cprot;
 /* At this point hard_start_xmit() passes control to the encapsulation
@@ -1347,7 +1347,7 @@ isdn_net_close(struct net_device *dev)
 static struct net_device_stats *
 isdn_net_get_stats(struct net_device *dev)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+        isdn_net_local *lp = netdev_priv(dev);
         return &lp->stats;
 }
 
@@ -1426,7 +1426,7 @@ isdn_net_ciscohdlck_alloc_skb(isdn_net_local *lp, int len)
 static int
 isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+        isdn_net_local *lp = netdev_priv(dev);
         unsigned long len = 0;
         unsigned long expires = 0;
         int tmp = 0;
@@ -1493,7 +1493,7 @@ isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static int isdn_net_ioctl(struct net_device *dev,
                           struct ifreq *ifr, int cmd)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+        isdn_net_local *lp = netdev_priv(dev);
 
         switch (lp->p_encap) {
 #ifdef CONFIG_ISDN_PPP
@@ -1786,7 +1786,7 @@ isdn_net_ciscohdlck_receive(isdn_net_local *lp, struct sk_buff *skb)
 static void
 isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
 {
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
+        isdn_net_local *lp = netdev_priv(ndev);
         isdn_net_local *olp = lp;       /* original 'lp' */
 #ifdef CONFIG_ISDN_X25
         struct concap_proto *cprot = lp -> netdev -> cprot;
@@ -1800,7 +1800,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
                  * handle master's statistics and hangup-timeout
                  */
                 ndev = lp->master;
-                lp = (isdn_net_local *) netdev_priv(ndev);
+                lp = netdev_priv(ndev);
                 lp->stats.rx_packets++;
                 lp->stats.rx_bytes += skb->len;
         }
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index fe824e0cbb25..9e8162c80bb0 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -1147,15 +1147,14 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
         }
 
         if (is->pass_filter
-            && sk_run_filter(skb, is->pass_filter, is->pass_len) == 0) {
+            && sk_run_filter(skb, is->pass_filter) == 0) {
                 if (is->debug & 0x2)
                         printk(KERN_DEBUG "IPPP: inbound frame filtered.\n");
                 kfree_skb(skb);
                 return;
         }
         if (!(is->active_filter
-              && sk_run_filter(skb, is->active_filter,
-                               is->active_len) == 0)) {
+              && sk_run_filter(skb, is->active_filter) == 0)) {
                 if (is->debug & 0x2)
                         printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n");
                 lp->huptimer = 0;
@@ -1221,7 +1220,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
         struct ippp_struct *ipt,*ipts;
         int slot, retval = NETDEV_TX_OK;
 
-        mlp = (isdn_net_local *) netdev_priv(netdev);
+        mlp = netdev_priv(netdev);
         nd = mlp->netdev;       /* get master lp */
 
         slot = mlp->ppp_slot;
@@ -1294,15 +1293,14 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
         }
 
         if (ipt->pass_filter
-            && sk_run_filter(skb, ipt->pass_filter, ipt->pass_len) == 0) {
+            && sk_run_filter(skb, ipt->pass_filter) == 0) {
                 if (ipt->debug & 0x4)
                         printk(KERN_DEBUG "IPPP: outbound frame filtered.\n");
                 kfree_skb(skb);
                 goto unlock;
         }
         if (!(ipt->active_filter
-              && sk_run_filter(skb, ipt->active_filter,
-                               ipt->active_len) == 0)) {
+              && sk_run_filter(skb, ipt->active_filter) == 0)) {
                 if (ipt->debug & 0x4)
                         printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n");
                 lp->huptimer = 0;
@@ -1492,9 +1490,9 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp)
         }
         
         drop |= is->pass_filter
-                && sk_run_filter(skb, is->pass_filter, is->pass_len) == 0;
+                && sk_run_filter(skb, is->pass_filter) == 0;
         drop |= is->active_filter
-                && sk_run_filter(skb, is->active_filter, is->active_len) == 0;
+                && sk_run_filter(skb, is->active_filter) == 0;
         
         skb_push(skb, IPPP_MAX_HEADER - 4);
         return drop;
@@ -1985,7 +1983,7 @@ isdn_ppp_dev_ioctl_stats(int slot, struct ifreq *ifr, struct net_device *dev)
 {
         struct ppp_stats __user *res = ifr->ifr_data;
         struct ppp_stats t;
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+        isdn_net_local *lp = netdev_priv(dev);
 
         if (!access_ok(VERIFY_WRITE, res, sizeof(struct ppp_stats)))
                 return -EFAULT;
@@ -2024,7 +2022,7 @@ isdn_ppp_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         int error=0;
         int len;
-        isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+        isdn_net_local *lp = netdev_priv(dev);
 
 
         if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP)
@@ -2091,7 +2089,7 @@ isdn_ppp_dial_slave(char *name)
 
         sdev = lp->slave;
         while (sdev) {
-                isdn_net_local *mlp = (isdn_net_local *) netdev_priv(sdev);
+                isdn_net_local *mlp = netdev_priv(sdev);
                 if (!(mlp->flags & ISDN_NET_CONNECTED))
                         break;
                 sdev = mlp->slave;
@@ -2099,7 +2097,7 @@ isdn_ppp_dial_slave(char *name)
         if (!sdev)
                 return 2;
 
-        isdn_net_dial_req((isdn_net_local *) netdev_priv(sdev));
+        isdn_net_dial_req(netdev_priv(sdev));
         return 0;
 #else
         return -1;
@@ -2122,7 +2120,7 @@ isdn_ppp_hangup_slave(char *name)
 
         sdev = lp->slave;
         while (sdev) {
-                isdn_net_local *mlp = (isdn_net_local *) netdev_priv(sdev);
+                isdn_net_local *mlp = netdev_priv(sdev);
 
                 if (mlp->slave) { /* find last connected link in chain */
                         isdn_net_local *nlp = ISDN_SLAVE_PRIV(mlp);
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index 307bd6e8988b..199f374cf9da 100644
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch)
         }
         skb_queue_purge(&ch->squeue);
         skb_queue_purge(&ch->rqueue);
-        flush_scheduled_work();
+        flush_work_sync(&ch->workq);
         return 0;
 }
 EXPORT_SYMBOL(mISDN_freedchannel);
@@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch)
         mISDN_clear_bchannel(ch);
         skb_queue_purge(&ch->rqueue);
         ch->rcount = 0;
-        flush_scheduled_work();
+        flush_work_sync(&ch->workq);
         return 0;
 }
 EXPORT_SYMBOL(mISDN_freebchannel);
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 5b59796ed250..bd526f664a39 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc)
         if (timer_pending(&hc->timeout_tl))
                 del_timer(&hc->timeout_tl);
 
+        cancel_work_sync(&hc->workq);
+
         if (hc->socket_thread)
                 l1oip_socket_close(hc);
 
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c
index ac4aa18c632b..5cc7c001c523 100644
--- a/drivers/isdn/mISDN/layer1.c
+++ b/drivers/isdn/mISDN/layer1.c
@@ -99,12 +99,16 @@ static void
 l1m_debug(struct FsmInst *fi, char *fmt, ...)
 {
         struct layer1 *l1 = fi->userdata;
+        struct va_format vaf;
         va_list va;
 
         va_start(va, fmt);
-        printk(KERN_DEBUG "%s: ", dev_name(&l1->dch->dev.dev));
-        vprintk(fmt, va);
-        printk("\n");
+
+        vaf.fmt = fmt;
+        vaf.va = &va;
+
+        printk(KERN_DEBUG "%s: %pV\n", dev_name(&l1->dch->dev.dev), &vaf);
+
         va_end(va);
 }
 
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index c97371788764..4ae75053c9d2 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -95,14 +95,20 @@ static void
 l2m_debug(struct FsmInst *fi, char *fmt, ...)
 {
         struct layer2 *l2 = fi->userdata;
+        struct va_format vaf;
         va_list va;
 
         if (!(*debug & DEBUG_L2_FSM))
                 return;
+
         va_start(va, fmt);
-        printk(KERN_DEBUG "l2 (sapi %d tei %d): ", l2->sapi, l2->tei);
-        vprintk(fmt, va);
-        printk("\n");
+
+        vaf.fmt = fmt;
+        vaf.va = &va;
+
+        printk(KERN_DEBUG "l2 (sapi %d tei %d): %pV\n",
+               l2->sapi, l2->tei, &vaf);
+
         va_end(va);
 }
 
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 1b85d9d27496..687c9b6264ab 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -79,14 +79,19 @@ static void
 da_debug(struct FsmInst *fi, char *fmt, ...)
 {
         struct manager  *mgr = fi->userdata;
+        struct va_format vaf;
         va_list va;
 
         if (!(*debug & DEBUG_L2_TEIFSM))
                 return;
+
         va_start(va, fmt);
-        printk(KERN_DEBUG "mgr(%d): ", mgr->ch.st->dev->id);
-        vprintk(fmt, va);
-        printk("\n");
+
+        vaf.fmt = fmt;
+        vaf.va = &va;
+
+        printk(KERN_DEBUG "mgr(%d): %pV\n", mgr->ch.st->dev->id, &vaf);
+
         va_end(va);
 }
 
@@ -223,14 +228,20 @@ static void
 tei_debug(struct FsmInst *fi, char *fmt, ...)
 {
         struct teimgr   *tm = fi->userdata;
+        struct va_format vaf;
         va_list va;
 
         if (!(*debug & DEBUG_L2_TEIFSM))
                 return;
+
         va_start(va, fmt);
-        printk(KERN_DEBUG "sapi(%d) tei(%d): ", tm->l2->sapi, tm->l2->tei);
-        vprintk(fmt, va);
-        printk("\n");
+
+        vaf.fmt = fmt;
+        vaf.va = &va;
+
+        printk(KERN_DEBUG "sapi(%d) tei(%d): %pV\n",
+               tm->l2->sapi, tm->l2->tei, &vaf);
+
         va_end(va);
 }