100 files changed, 682 insertions, 1449 deletions
diff --git a/drivers/isdn/act2000/act2000.h b/drivers/isdn/act2000/act2000.h
index d4c50512a1ff..88c9423500d8 100644
--- a/drivers/isdn/act2000/act2000.h
+++ b/drivers/isdn/act2000/act2000.h
@@ -141,9 +141,9 @@ typedef struct irq_data_isa {
        __u8            rcvhdr[8];
 } irq_data_isa;
-typedef union irq_data {
+typedef union act2000_irq_data {
        irq_data_isa isa;
-} irq_data;
+} act2000_irq_data;
 /*
 * Per card driver data
@@ -176,7 +176,7 @@ typedef struct act2000_card {
        char   *status_buf_read;
        char   *status_buf_write;
        char   *status_buf_end;
-        irq_data idat;                  /* Data used for IRQ handler        */
+        act2000_irq_data idat;          /* Data used for IRQ handler        */
        isdn_if interface;              /* Interface to upper layer         */
        char regname[35];               /* Name used for request_region     */
 } act2000_card;
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index a168e8a891be..15c3ffd9d860 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -33,21 +33,6 @@ config ISDN_CAPI_CAPI20
          standardized libcapi20 to access this functionality.  You should say
          Y/M here.
-config ISDN_CAPI_CAPIFS_BOOL
-        bool "CAPI2.0 filesystem support (DEPRECATED)"
-        depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-        help
-          This option provides a special file system, similar to /dev/pts with
-          device nodes for the special ttys established by using the
-          middleware extension above.
-          You no longer need this, udev fully replaces it. This feature is
-          scheduled for removal.
-config ISDN_CAPI_CAPIFS
-        tristate
-        depends on ISDN_CAPI_CAPIFS_BOOL
-        default ISDN_CAPI_CAPI20
 config ISDN_CAPI_CAPIDRV
        tristate "CAPI2.0 capidrv interface support"
        depends on ISDN_I4L
diff --git a/drivers/isdn/capi/Makefile b/drivers/isdn/capi/Makefile
index 57123e3e4978..4d5b4b71db1e 100644
--- a/drivers/isdn/capi/Makefile
+++ b/drivers/isdn/capi/Makefile
@@ -7,7 +7,6 @@
 obj-$(CONFIG_ISDN_CAPI)                 += kernelcapi.o
 obj-$(CONFIG_ISDN_CAPI_CAPI20)          += capi.o 
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)         += capidrv.o
-obj-$(CONFIG_ISDN_CAPI_CAPIFS)          += capifs.o
 # Multipart objects.
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index f80a7c48a35f..e44933d58790 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -38,15 +38,10 @@
 #include <linux/isdn/capiutil.h>
 #include <linux/isdn/capicmd.h>
-#include "capifs.h"
 MODULE_DESCRIPTION("CAPI4Linux: Userspace /dev/capi20 interface");
 MODULE_AUTHOR("Carsten Paeth");
 MODULE_LICENSE("GPL");
-#undef _DEBUG_TTYFUNCS          /* call to tty_driver */
-#undef _DEBUG_DATAFLOW          /* data flow */
 /* -------- driver information -------------------------------------- */
 static DEFINE_MUTEX(capi_mutex);
@@ -85,7 +80,6 @@ struct capiminor {
        struct kref kref;
        unsigned int      minor;
-        struct dentry *capifs_dentry;
        struct capi20_appl      *ap;
        u32                     ncci;
@@ -300,17 +294,8 @@ static void capiminor_free(struct capiminor *mp)
 static void capincci_alloc_minor(struct capidev *cdev, struct capincci *np)
 {
-        struct capiminor *mp;
+        if (cdev->userflags & CAPIFLAG_HIGHJACKING)
-        dev_t device;
+                np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
-        if (!(cdev->userflags & CAPIFLAG_HIGHJACKING))
-                return;
-        mp = np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
-        if (mp) {
-                device = MKDEV(capinc_tty_driver->major, mp->minor);
-                mp->capifs_dentry = capifs_new_ncci(mp->minor, device);
-        }
 }
 static void capincci_free_minor(struct capincci *np)
@@ -319,8 +304,6 @@ static void capincci_free_minor(struct capincci *np)
        struct tty_struct *tty;
        if (mp) {
-                capifs_free_ncci(mp->capifs_dentry);
                tty = tty_port_tty_get(&mp->port);
                if (tty) {
                        tty_vhangup(tty);
@@ -432,9 +415,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
        tty = tty_port_tty_get(&mp->port);
        if (!tty) {
-#ifdef _DEBUG_DATAFLOW
+                pr_debug("capi: currently no receiver\n");
-                printk(KERN_DEBUG "capi: currently no receiver\n");
-#endif
                return -1;
        }
        
@@ -447,23 +428,17 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
        }
        if (ld->ops->receive_buf == NULL) {
-#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
+                pr_debug("capi: ldisc has no receive_buf function\n");
-                printk(KERN_DEBUG "capi: ldisc has no receive_buf function\n");
-#endif
                /* fatal error, do not requeue */
                goto free_skb;
        }
        if (mp->ttyinstop) {
-#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
+                pr_debug("capi: recv tty throttled\n");
-                printk(KERN_DEBUG "capi: recv tty throttled\n");
-#endif
                goto deref_ldisc;
        }
        if (tty->receive_room < datalen) {
-#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
+                pr_debug("capi: no room in tty\n");
-                printk(KERN_DEBUG "capi: no room in tty\n");
-#endif
                goto deref_ldisc;
        }
@@ -479,10 +454,8 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
        if (errcode == CAPI_NOERROR) {
                skb_pull(skb, CAPIMSG_LEN(skb->data));
-#ifdef _DEBUG_DATAFLOW
+                pr_debug("capi: DATA_B3_RESP %u len=%d => ldisc\n",
-                printk(KERN_DEBUG "capi: DATA_B3_RESP %u len=%d => ldisc\n",
+                         datahandle, skb->len);
-                                        datahandle, skb->len);
-#endif
                ld->ops->receive_buf(tty, skb->data, NULL, skb->len);
        } else {
                printk(KERN_ERR "capi: send DATA_B3_RESP failed=%x\n",
@@ -529,9 +502,7 @@ static void handle_minor_send(struct capiminor *mp)
                return;
        if (mp->ttyoutstop) {
-#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
+                pr_debug("capi: send: tty stopped\n");
-                printk(KERN_DEBUG "capi: send: tty stopped\n");
-#endif
                tty_kref_put(tty);
                return;
        }
@@ -573,10 +544,8 @@ static void handle_minor_send(struct capiminor *mp)
                }
                errcode = capi20_put_message(mp->ap, skb);
                if (errcode == CAPI_NOERROR) {
-#ifdef _DEBUG_DATAFLOW
+                        pr_debug("capi: DATA_B3_REQ %u len=%u\n",
-                        printk(KERN_DEBUG "capi: DATA_B3_REQ %u len=%u\n",
+                                 datahandle, len);
-                                                        datahandle, len);
-#endif
                        continue;
                }
                capiminor_del_ack(mp, datahandle);
@@ -650,10 +619,8 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
        }
        if (CAPIMSG_SUBCOMMAND(skb->data) == CAPI_IND) {
                datahandle = CAPIMSG_U16(skb->data, CAPIMSG_BASELEN+4+4+2);
-#ifdef _DEBUG_DATAFLOW
+                pr_debug("capi_signal: DATA_B3_IND %u len=%d\n",
-                printk(KERN_DEBUG "capi_signal: DATA_B3_IND %u len=%d\n",
+                         datahandle, skb->len-CAPIMSG_LEN(skb->data));
-                                datahandle, skb->len-CAPIMSG_LEN(skb->data));
-#endif
                skb_queue_tail(&mp->inqueue, skb);
                handle_minor_recv(mp);
@@ -661,11 +628,9 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
        } else if (CAPIMSG_SUBCOMMAND(skb->data) == CAPI_CONF) {
                datahandle = CAPIMSG_U16(skb->data, CAPIMSG_BASELEN+4);
-#ifdef _DEBUG_DATAFLOW
+                pr_debug("capi_signal: DATA_B3_CONF %u 0x%x\n",
-                printk(KERN_DEBUG "capi_signal: DATA_B3_CONF %u 0x%x\n",
+                         datahandle,
-                                datahandle,
+                         CAPIMSG_U16(skb->data, CAPIMSG_BASELEN+4+2));
-                                CAPIMSG_U16(skb->data, CAPIMSG_BASELEN+4+2));
-#endif
                kfree_skb(skb);
                capiminor_del_ack(mp, datahandle);
                tty = tty_port_tty_get(&mp->port);
@@ -1095,9 +1060,7 @@ static int capinc_tty_write(struct tty_struct *tty,
        struct capiminor *mp = tty->driver_data;
        struct sk_buff *skb;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_write(count=%d)\n", count);
-        printk(KERN_DEBUG "capinc_tty_write(count=%d)\n", count);
-#endif
        spin_lock_bh(&mp->outlock);
        skb = mp->outskb;
@@ -1133,9 +1096,7 @@ static int capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
        struct sk_buff *skb;
        int ret = 1;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_put_char(%u)\n", ch);
-        printk(KERN_DEBUG "capinc_put_char(%u)\n", ch);
-#endif
        spin_lock_bh(&mp->outlock);
        skb = mp->outskb;
@@ -1174,9 +1135,7 @@ static void capinc_tty_flush_chars(struct tty_struct *tty)
        struct capiminor *mp = tty->driver_data;
        struct sk_buff *skb;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_flush_chars\n");
-        printk(KERN_DEBUG "capinc_tty_flush_chars\n");
-#endif
        spin_lock_bh(&mp->outlock);
        skb = mp->outskb;
@@ -1200,9 +1159,7 @@ static int capinc_tty_write_room(struct tty_struct *tty)
        room = CAPINC_MAX_SENDQUEUE-skb_queue_len(&mp->outqueue);
        room *= CAPI_MAX_BLKSIZE;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_write_room = %d\n", room);
-        printk(KERN_DEBUG "capinc_tty_write_room = %d\n", room);
-#endif
        return room;
 }
@@ -1210,40 +1167,28 @@ static int capinc_tty_chars_in_buffer(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_chars_in_buffer = %d nack=%d sq=%d rq=%d\n",
-        printk(KERN_DEBUG "capinc_tty_chars_in_buffer = %d nack=%d sq=%d rq=%d\n",
+                 mp->outbytes, mp->nack,
-                        mp->outbytes, mp->nack,
+                 skb_queue_len(&mp->outqueue),
-                        skb_queue_len(&mp->outqueue),
+                 skb_queue_len(&mp->inqueue));
-                        skb_queue_len(&mp->inqueue));
-#endif
        return mp->outbytes;
 }
-static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
+static int capinc_tty_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
-        int error = 0;
+        return -ENOIOCTLCMD;
-        switch (cmd) {
-        default:
-                error = n_tty_ioctl_helper(tty, file, cmd, arg);
-                break;
-        }
-        return error;
 }
 static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios * old)
 {
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_set_termios\n");
-        printk(KERN_DEBUG "capinc_tty_set_termios\n");
-#endif
 }
 static void capinc_tty_throttle(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_throttle\n");
-        printk(KERN_DEBUG "capinc_tty_throttle\n");
-#endif
        mp->ttyinstop = 1;
 }
@@ -1251,9 +1196,7 @@ static void capinc_tty_unthrottle(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_unthrottle\n");
-        printk(KERN_DEBUG "capinc_tty_unthrottle\n");
-#endif
        mp->ttyinstop = 0;
        handle_minor_recv(mp);
 }
@@ -1262,9 +1205,7 @@ static void capinc_tty_stop(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_stop\n");
-        printk(KERN_DEBUG "capinc_tty_stop\n");
-#endif
        mp->ttyoutstop = 1;
 }
@@ -1272,9 +1213,7 @@ static void capinc_tty_start(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_start\n");
-        printk(KERN_DEBUG "capinc_tty_start\n");
-#endif
        mp->ttyoutstop = 0;
        handle_minor_send(mp);
 }
@@ -1283,39 +1222,29 @@ static void capinc_tty_hangup(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_hangup\n");
-        printk(KERN_DEBUG "capinc_tty_hangup\n");
-#endif
        tty_port_hangup(&mp->port);
 }
 static int capinc_tty_break_ctl(struct tty_struct *tty, int state)
 {
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_break_ctl(%d)\n", state);
-        printk(KERN_DEBUG "capinc_tty_break_ctl(%d)\n", state);
-#endif
        return 0;
 }
 static void capinc_tty_flush_buffer(struct tty_struct *tty)
 {
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_flush_buffer\n");
-        printk(KERN_DEBUG "capinc_tty_flush_buffer\n");
-#endif
 }
 static void capinc_tty_set_ldisc(struct tty_struct *tty)
 {
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_set_ldisc\n");
-        printk(KERN_DEBUG "capinc_tty_set_ldisc\n");
-#endif
 }
 static void capinc_tty_send_xchar(struct tty_struct *tty, char ch)
 {
-#ifdef _DEBUG_TTYFUNCS
+        pr_debug("capinc_tty_send_xchar(%d)\n", ch);
-        printk(KERN_DEBUG "capinc_tty_send_xchar(%d)\n", ch);
-#endif
 }
 static const struct tty_operations capinc_ops = {
@@ -1520,10 +1449,8 @@ static int __init capi_init(void)
        proc_init();
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
+#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-        compileinfo = " (middleware+capifs)";
+        compileinfo = " (middleware)";
-#elif defined(CONFIG_ISDN_CAPI_MIDDLEWARE)
-        compileinfo = " (no capifs)";
 #else
        compileinfo = " (no middleware)";
 #endif
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 2978bdaa6b88..92607ed25e2e 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1515,8 +1515,13 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep)
        while (*s) {
                int digit1 = 0;
                int digit2 = 0;
-                if (!isdigit(*s)) return -3;
+                char *endp;
-                while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; }
+                digit1 = simple_strtoul(s, &endp, 10);
+                if (s == endp)
+                        return -3;
+                s = endp;
                if (digit1 <= 0 || digit1 > 30) return -4;
                if (*s == 0 || *s == ',' || *s == ' ') {
                        bmask |= (1 << digit1);
@@ -1526,8 +1531,12 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep)
                }
                if (*s != '-') return -5;
                s++;
-                if (!isdigit(*s)) return -3;
-                while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; }
+                digit2 = simple_strtoul(s, &endp, 10);
+                if (s == endp)
+                        return -3;
+                s = endp;
                if (digit2 <= 0 || digit2 > 30) return -4;
                if (*s == 0 || *s == ',' || *s == ' ') {
                        if (digit1 > digit2)
@@ -2288,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/capifs.c b/drivers/isdn/capi/capifs.c
deleted file mode 100644
index 2b83850997c3..000000000000
--- a/drivers/isdn/capi/capifs.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* $Id: capifs.c,v 1.1.2.3 2004/01/16 21:09:26 keil Exp $
- * 
- * Copyright 2000 by Carsten Paeth <calle@calle.de>
- *
- * Heavily based on devpts filesystem from H. Peter Anvin
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-#include <linux/fs.h>
-#include <linux/mount.h>
-#include <linux/slab.h>
-#include <linux/namei.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/ctype.h>
-#include <linux/sched.h>        /* current */
-#include "capifs.h"
-MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem");
-MODULE_AUTHOR("Carsten Paeth");
-MODULE_LICENSE("GPL");
-/* ------------------------------------------------------------------ */
-#define CAPIFS_SUPER_MAGIC (('C'<<8)|'N')
-static struct vfsmount *capifs_mnt;
-static int capifs_mnt_count;
-static struct {
-        int setuid;
-        int setgid;
-        uid_t   uid;
-        gid_t   gid;
-        umode_t mode;
-} config = {.mode = 0600};
-/* ------------------------------------------------------------------ */
-static int capifs_remount(struct super_block *s, int *flags, char *data)
-{
-        int setuid = 0;
-        int setgid = 0;
-        uid_t uid = 0;
-        gid_t gid = 0;
-        umode_t mode = 0600;
-        char *this_char;
-        char *new_opt = kstrdup(data, GFP_KERNEL);
-        this_char = NULL;
-        while ((this_char = strsep(&data, ",")) != NULL) {
-                int n;
-                char dummy;
-                if (!*this_char)
-                        continue;
-                if (sscanf(this_char, "uid=%i%c", &n, &dummy) == 1) {
-                        setuid = 1;
-                        uid = n;
-                } else if (sscanf(this_char, "gid=%i%c", &n, &dummy) == 1) {
-                        setgid = 1;
-                        gid = n;
-                } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1)
-                        mode = n & ~S_IFMT;
-                else {
-                        kfree(new_opt);
-                        printk("capifs: called with bogus options\n");
-                        return -EINVAL;
-                }
-        }
-        mutex_lock(&s->s_root->d_inode->i_mutex);
-        replace_mount_options(s, new_opt);
-        config.setuid  = setuid;
-        config.setgid  = setgid;
-        config.uid     = uid;
-        config.gid     = gid;
-        config.mode    = mode;
-        mutex_unlock(&s->s_root->d_inode->i_mutex);
-        return 0;
-}
-static const struct super_operations capifs_sops =
-{
-        .statfs         = simple_statfs,
-        .remount_fs     = capifs_remount,
-        .show_options   = generic_show_options,
-};
-static int
-capifs_fill_super(struct super_block *s, void *data, int silent)
-{
-        struct inode * inode;
-        s->s_blocksize = 1024;
-        s->s_blocksize_bits = 10;
-        s->s_magic = CAPIFS_SUPER_MAGIC;
-        s->s_op = &capifs_sops;
-        s->s_time_gran = 1;
-        inode = new_inode(s);
-        if (!inode)
-                goto fail;
-        inode->i_ino = 1;
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-        inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
-        inode->i_op = &simple_dir_inode_operations;
-        inode->i_fop = &simple_dir_operations;
-        inode->i_nlink = 2;
-        s->s_root = d_alloc_root(inode);
-        if (s->s_root)
-                return 0;
-        
-        printk("capifs: get root dentry failed\n");
-        iput(inode);
-fail:
-        return -ENOMEM;
-}
-static int capifs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data, struct vfsmount *mnt)
-{
-        return get_sb_single(fs_type, flags, data, capifs_fill_super, mnt);
-}
-static struct file_system_type capifs_fs_type = {
-        .owner          = THIS_MODULE,
-        .name           = "capifs",
-        .get_sb         = capifs_get_sb,
-        .kill_sb        = kill_anon_super,
-};
-static struct dentry *new_ncci(unsigned int number, dev_t device)
-{
-        struct super_block *s = capifs_mnt->mnt_sb;
-        struct dentry *root = s->s_root;
-        struct dentry *dentry;
-        struct inode *inode;
-        char name[10];
-        int namelen;
-        mutex_lock(&root->d_inode->i_mutex);
-        namelen = sprintf(name, "%d", number);
-        dentry = lookup_one_len(name, root, namelen);
-        if (IS_ERR(dentry)) {
-                dentry = NULL;
-                goto unlock_out;
-        }
-        if (dentry->d_inode) {
-                dput(dentry);
-                dentry = NULL;
-                goto unlock_out;
-        }
-        inode = new_inode(s);
-        if (!inode) {
-                dput(dentry);
-                dentry = NULL;
-                goto unlock_out;
-        }
-        /* config contents is protected by root's i_mutex */
-        inode->i_uid = config.setuid ? config.uid : current_fsuid();
-        inode->i_gid = config.setgid ? config.gid : current_fsgid();
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-        inode->i_ino = number + 2;
-        init_special_inode(inode, S_IFCHR|config.mode, device);
-        d_instantiate(dentry, inode);
-        dget(dentry);
-unlock_out:
-        mutex_unlock(&root->d_inode->i_mutex);
-        return dentry;
-}
-struct dentry *capifs_new_ncci(unsigned int number, dev_t device)
-{
-        struct dentry *dentry;
-        if (simple_pin_fs(&capifs_fs_type, &capifs_mnt, &capifs_mnt_count) < 0)
-                return NULL;
-        dentry = new_ncci(number, device);
-        if (!dentry)
-                simple_release_fs(&capifs_mnt, &capifs_mnt_count);
-        return dentry;
-}
-void capifs_free_ncci(struct dentry *dentry)
-{
-        struct dentry *root = capifs_mnt->mnt_sb->s_root;
-        struct inode *inode;
-        if (!dentry)
-                return;
-        mutex_lock(&root->d_inode->i_mutex);
-        inode = dentry->d_inode;
-        if (inode) {
-                drop_nlink(inode);
-                d_delete(dentry);
-                dput(dentry);
-        }
-        dput(dentry);
-        mutex_unlock(&root->d_inode->i_mutex);
-        simple_release_fs(&capifs_mnt, &capifs_mnt_count);
-}
-static int __init capifs_init(void)
-{
-        return register_filesystem(&capifs_fs_type);
-}
-static void __exit capifs_exit(void)
-{
-        unregister_filesystem(&capifs_fs_type);
-}
-EXPORT_SYMBOL(capifs_new_ncci);
-EXPORT_SYMBOL(capifs_free_ncci);
-module_init(capifs_init);
-module_exit(capifs_exit);
diff --git a/drivers/isdn/capi/capifs.h b/drivers/isdn/capi/capifs.h
deleted file mode 100644
index e193d1189531..000000000000
--- a/drivers/isdn/capi/capifs.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id: capifs.h,v 1.1.2.2 2004/01/16 21:09:26 keil Exp $
- * 
- * Copyright 2000 by Carsten Paeth <calle@calle.de>
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-#include <linux/dcache.h>
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-struct dentry *capifs_new_ncci(unsigned int num, dev_t device);
-void capifs_free_ncci(struct dentry *dentry);
-#else
-static inline struct dentry *capifs_new_ncci(unsigned int num, dev_t device)
-{
-        return NULL;
-}
-static inline void capifs_free_ncci(struct dentry *dentry)
-{
-}
-#endif
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index b054494df846..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");
@@ -98,6 +99,16 @@ static inline struct capi_ctr *get_capi_ctr_by_nr(u16 contr)
        return capi_controller[contr - 1];
 }
+static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid)
+{
+        lockdep_assert_held(&capi_controller_lock);
+        if (applid - 1 >= CAPI_MAXAPPL)
+                return NULL;
+        return capi_applications[applid - 1];
+}
 static inline struct capi20_appl *get_capi_appl_by_nr(u16 applid)
 {
        if (applid - 1 >= CAPI_MAXAPPL)
@@ -185,10 +196,9 @@ static void notify_up(u32 contr)
                ctr->state = CAPI_CTR_RUNNING;
                for (applid = 1; applid <= CAPI_MAXAPPL; applid++) {
-                        ap = get_capi_appl_by_nr(applid);
+                        ap = __get_capi_appl_by_nr(applid);
-                        if (!ap)
+                        if (ap)
-                                continue;
+                                register_appl(ctr, applid, &ap->rparam);
-                        register_appl(ctr, applid, &ap->rparam);
                }
                wake_up_interruptible_all(&ctr->state_wait_queue);
@@ -215,7 +225,7 @@ static void ctr_down(struct capi_ctr *ctr, int new_state)
        memset(ctr->serial, 0, sizeof(ctr->serial));
        for (applid = 1; applid <= CAPI_MAXAPPL; applid++) {
-                ap = get_capi_appl_by_nr(applid);
+                ap = __get_capi_appl_by_nr(applid);
                if (ap)
                        capi_ctr_put(ctr);
        }
@@ -282,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;
 }
@@ -399,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;
@@ -734,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) {
@@ -1276,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)
+        if (err) {
-                kcapi_proc_init();
+                unregister_capictr_notifier(&capictr_nb);
-        return err;
+                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 */
+        unregister_capictr_notifier(&capictr_nb);
-        flush_scheduled_work();
        cdebug_exit();
+        destroy_workqueue(kcapi_wq);
 }
 module_init(kcapi_init);
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index 70cf6bac7a5a..48e6d220f62c 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -77,7 +77,7 @@ static void deflect_timer_expire(ulong arg)
     case DEFLECT_ALERT:
       cs->ics.command = ISDN_CMD_REDIR; /* protocol */
-       strcpy(cs->ics.parm.setup.phone,cs->deflect_dest);
+       strlcpy(cs->ics.parm.setup.phone, cs->deflect_dest, sizeof(cs->ics.parm.setup.phone));
       strcpy(cs->ics.parm.setup.eazmsn,"Testtext delayed");
       divert_if.ll_cmd(&cs->ics);
       spin_lock_irqsave(&divert_lock, flags);
@@ -251,7 +251,7 @@ int deflect_extern_action(u_char cmd, ulong callid, char *to_nr)
     case 2: /* redir */
       del_timer(&cs->timer); 
-       strcpy(cs->ics.parm.setup.phone, to_nr);
+       strlcpy(cs->ics.parm.setup.phone, to_nr, sizeof(cs->ics.parm.setup.phone));
       strcpy(cs->ics.parm.setup.eazmsn, "Testtext manual");
       ic.command = ISDN_CMD_REDIR;
       if ((i = divert_if.ll_cmd(&ic)))
@@ -480,7 +480,7 @@ static int isdn_divert_icall(isdn_ctrl *ic)
               if (!cs->timer.expires)
                 { strcpy(ic->parm.setup.eazmsn,"Testtext direct");
                   ic->parm.setup.screen = dv->rule.screen;
-                   strcpy(ic->parm.setup.phone,dv->rule.to_nr);
+                   strlcpy(ic->parm.setup.phone, dv->rule.to_nr, sizeof(ic->parm.setup.phone));
                   cs->akt_state = DEFLECT_AUTODEL; /* delete after timeout */
                   cs->timer.expires = jiffies + (HZ * AUTODEL_TIME);
                   retval = 5; 
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 707d9c94cf9e..3913f47ef86d 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -109,6 +109,9 @@ struct bas_cardstate {
        struct urb              *urb_int_in;    /* URB for interrupt pipe */
        unsigned char           *int_in_buf;
+        struct work_struct      int_in_wq;      /* for usb_clear_halt() */
+        struct timer_list       timer_int_in;   /* int read retry delay */
+        int                     retry_int_in;
        spinlock_t              lock;           /* locks all following */
        int                     basstate;       /* bitmap (BS_*) */
@@ -169,7 +172,7 @@ static char *get_usb_rcmsg(int rc)
        case -EAGAIN:
                return "start frame too early or too much scheduled";
        case -EFBIG:
-                return "too many isochronous frames requested";
+                return "too many isoc frames requested";
        case -EPIPE:
                return "endpoint stalled";
        case -EMSGSIZE:
@@ -200,13 +203,13 @@ static char *get_usb_statmsg(int status)
        case -ENOENT:
                return "unlinked (sync)";
        case -EINPROGRESS:
-                return "pending";
+                return "URB still pending";
        case -EPROTO:
-                return "bit stuffing error, timeout, or unknown USB error";
+                return "bitstuff error, timeout, or unknown USB error";
        case -EILSEQ:
                return "CRC mismatch, timeout, or unknown USB error";
        case -ETIME:
-                return "timed out";
+                return "USB response timeout";
        case -EPIPE:
                return "endpoint stalled";
        case -ECOMM:
@@ -214,15 +217,15 @@ static char *get_usb_statmsg(int status)
        case -ENOSR:
                return "OUT buffer underrun";
        case -EOVERFLOW:
-                return "too much data";
+                return "endpoint babble";
        case -EREMOTEIO:
-                return "short packet detected";
+                return "short packet";
        case -ENODEV:
                return "device removed";
        case -EXDEV:
-                return "partial isochronous transfer";
+                return "partial isoc transfer";
        case -EINVAL:
-                return "invalid argument";
+                return "ISO madness";
        case -ECONNRESET:
                return "unlinked (async)";
        case -ESHUTDOWN:
@@ -350,7 +353,7 @@ static inline void error_hangup(struct bc_state *bcs)
 * reset Gigaset device because of an unrecoverable error
 * This function may be called from any context, and takes care of
 * scheduling the necessary actions for execution outside of interrupt context.
- * cs->lock must not be held.
+ * cs->hw.bas->lock must not be held.
 * argument:
 *      controller state structure
 */
@@ -358,7 +361,9 @@ static inline void error_reset(struct cardstate *cs)
 {
        /* reset interrupt pipe to recover (ignore errors) */
        update_basstate(cs->hw.bas, BS_RESETTING, 0);
-        req_submit(cs->bcs, HD_RESET_INTERRUPT_PIPE, 0, BAS_TIMEOUT);
+        if (req_submit(cs->bcs, HD_RESET_INTERRUPT_PIPE, 0, BAS_TIMEOUT))
+                /* submission failed, escalate to USB port reset */
+                usb_queue_reset_device(cs->hw.bas->interface);
 }
 /* check_pending
@@ -438,23 +443,27 @@ static void cmd_in_timeout(unsigned long data)
                return;
        }
-        if (ucs->retry_cmd_in++ < BAS_RETRY) {
+        if (ucs->retry_cmd_in++ >= BAS_RETRY) {
-                dev_notice(cs->dev, "control read: timeout, retry %d\n",
-                           ucs->retry_cmd_in);
-                rc = atread_submit(cs, BAS_TIMEOUT);
-                if (rc >= 0 || rc == -ENODEV)
-                        /* resubmitted or disconnected */
-                        /* - bypass regular exit block */
-                        return;
-        } else {
                dev_err(cs->dev,
                        "control read: timeout, giving up after %d tries\n",
                        ucs->retry_cmd_in);
+                kfree(ucs->rcvbuf);
+                ucs->rcvbuf = NULL;
+                ucs->rcvbuf_size = 0;
+                error_reset(cs);
+                return;
+        }
+        gig_dbg(DEBUG_USBREQ, "%s: timeout, retry %d",
+                __func__, ucs->retry_cmd_in);
+        rc = atread_submit(cs, BAS_TIMEOUT);
+        if (rc < 0) {
+                kfree(ucs->rcvbuf);
+                ucs->rcvbuf = NULL;
+                ucs->rcvbuf_size = 0;
+                if (rc != -ENODEV)
+                        error_reset(cs);
        }
-        kfree(ucs->rcvbuf);
-        ucs->rcvbuf = NULL;
-        ucs->rcvbuf_size = 0;
-        error_reset(cs);
 }
 /* read_ctrl_callback
@@ -470,18 +479,11 @@ static void read_ctrl_callback(struct urb *urb)
        struct cardstate *cs = inbuf->cs;
        struct bas_cardstate *ucs = cs->hw.bas;
        int status = urb->status;
-        int have_data = 0;
        unsigned numbytes;
        int rc;
        update_basstate(ucs, 0, BS_ATRDPEND);
        wake_up(&ucs->waitqueue);
-        if (!ucs->rcvbuf_size) {
-                dev_warn(cs->dev, "%s: no receive in progress\n", __func__);
-                return;
-        }
        del_timer(&ucs->timer_cmd_in);
        switch (status) {
@@ -495,19 +497,10 @@ static void read_ctrl_callback(struct urb *urb)
                                numbytes = ucs->rcvbuf_size;
                }
-                /* copy received bytes to inbuf */
+                /* copy received bytes to inbuf, notify event layer */
-                have_data = gigaset_fill_inbuf(inbuf, ucs->rcvbuf, numbytes);
+                if (gigaset_fill_inbuf(inbuf, ucs->rcvbuf, numbytes)) {
+                        gig_dbg(DEBUG_INTR, "%s-->BH", __func__);
-                if (unlikely(numbytes < ucs->rcvbuf_size)) {
+                        gigaset_schedule_event(cs);
-                        /* incomplete - resubmit for remaining bytes */
-                        ucs->rcvbuf_size -= numbytes;
-                        ucs->retry_cmd_in = 0;
-                        rc = atread_submit(cs, BAS_TIMEOUT);
-                        if (rc >= 0 || rc == -ENODEV)
-                                /* resubmitted or disconnected */
-                                /* - bypass regular exit block */
-                                return;
-                        error_reset(cs);
                }
                break;
@@ -516,37 +509,32 @@ static void read_ctrl_callback(struct urb *urb)
        case -EINPROGRESS:              /* pending */
        case -ENODEV:                   /* device removed */
        case -ESHUTDOWN:                /* device shut down */
-                /* no action necessary */
+                /* no further action necessary */
                gig_dbg(DEBUG_USBREQ, "%s: %s",
                        __func__, get_usb_statmsg(status));
                break;
-        default:                        /* severe trouble */
+        default:                        /* other errors: retry */
-                dev_warn(cs->dev, "control read: %s\n",
-                         get_usb_statmsg(status));
                if (ucs->retry_cmd_in++ < BAS_RETRY) {
-                        dev_notice(cs->dev, "control read: retry %d\n",
+                        gig_dbg(DEBUG_USBREQ, "%s: %s, retry %d", __func__,
-                                   ucs->retry_cmd_in);
+                                get_usb_statmsg(status), ucs->retry_cmd_in);
                        rc = atread_submit(cs, BAS_TIMEOUT);
-                        if (rc >= 0 || rc == -ENODEV)
+                        if (rc >= 0)
-                                /* resubmitted or disconnected */
+                                /* successfully resubmitted, skip freeing */
-                                /* - bypass regular exit block */
                                return;
-                } else {
+                        if (rc == -ENODEV)
-                        dev_err(cs->dev,
+                                /* disconnect, no further action necessary */
-                                "control read: giving up after %d tries\n",
+                                break;
-                                ucs->retry_cmd_in);
                }
+                dev_err(cs->dev, "control read: %s, giving up after %d tries\n",
+                        get_usb_statmsg(status), ucs->retry_cmd_in);
                error_reset(cs);
        }
+        /* read finished, free buffer */
        kfree(ucs->rcvbuf);
        ucs->rcvbuf = NULL;
        ucs->rcvbuf_size = 0;
-        if (have_data) {
-                gig_dbg(DEBUG_INTR, "%s-->BH", __func__);
-                gigaset_schedule_event(cs);
-        }
 }
 /* atread_submit
@@ -605,14 +593,67 @@ static int atread_submit(struct cardstate *cs, int timeout)
        if (timeout > 0) {
                gig_dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
-                ucs->timer_cmd_in.expires = jiffies + timeout * HZ / 10;
+                mod_timer(&ucs->timer_cmd_in, jiffies + timeout * HZ / 10);
-                ucs->timer_cmd_in.data = (unsigned long) cs;
-                ucs->timer_cmd_in.function = cmd_in_timeout;
-                add_timer(&ucs->timer_cmd_in);
        }
        return 0;
 }
+/* int_in_work
+ * workqueue routine to clear halt on interrupt in endpoint
+ */
+static void int_in_work(struct work_struct *work)
+{
+        struct bas_cardstate *ucs =
+                container_of(work, struct bas_cardstate, int_in_wq);
+        struct urb *urb = ucs->urb_int_in;
+        struct cardstate *cs = urb->context;
+        int rc;
+        /* clear halt condition */
+        rc = usb_clear_halt(ucs->udev, urb->pipe);
+        gig_dbg(DEBUG_USBREQ, "clear_halt: %s", get_usb_rcmsg(rc));
+        if (rc == 0)
+                /* success, resubmit interrupt read URB */
+                rc = usb_submit_urb(urb, GFP_ATOMIC);
+        if (rc != 0 && rc != -ENODEV) {
+                dev_err(cs->dev, "clear halt failed: %s\n", get_usb_rcmsg(rc));
+                rc = usb_lock_device_for_reset(ucs->udev, ucs->interface);
+                if (rc == 0) {
+                        rc = usb_reset_device(ucs->udev);
+                        usb_unlock_device(ucs->udev);
+                }
+        }
+        ucs->retry_int_in = 0;
+}
+/* int_in_resubmit
+ * timer routine for interrupt read delayed resubmit
+ * argument:
+ *      controller state structure
+ */
+static void int_in_resubmit(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+        struct bas_cardstate *ucs = cs->hw.bas;
+        int rc;
+        if (ucs->retry_int_in++ >= BAS_RETRY) {
+                dev_err(cs->dev, "interrupt read: giving up after %d tries\n",
+                        ucs->retry_int_in);
+                usb_queue_reset_device(ucs->interface);
+                return;
+        }
+        gig_dbg(DEBUG_USBREQ, "%s: retry %d", __func__, ucs->retry_int_in);
+        rc = usb_submit_urb(ucs->urb_int_in, GFP_ATOMIC);
+        if (rc != 0 && rc != -ENODEV) {
+                dev_err(cs->dev, "could not resubmit interrupt URB: %s\n",
+                        get_usb_rcmsg(rc));
+                usb_queue_reset_device(ucs->interface);
+        }
+}
 /* read_int_callback
 * USB completion handler for interrupt pipe input
 * called by the USB subsystem in interrupt context
@@ -633,19 +674,29 @@ static void read_int_callback(struct urb *urb)
        switch (status) {
        case 0:                 /* success */
+                ucs->retry_int_in = 0;
                break;
+        case -EPIPE:                    /* endpoint stalled */
+                schedule_work(&ucs->int_in_wq);
+                /* fall through */
        case -ENOENT:                   /* cancelled */
        case -ECONNRESET:               /* cancelled (async) */
        case -EINPROGRESS:              /* pending */
-                /* ignore silently */
+        case -ENODEV:                   /* device removed */
+        case -ESHUTDOWN:                /* device shut down */
+                /* no further action necessary */
                gig_dbg(DEBUG_USBREQ, "%s: %s",
                        __func__, get_usb_statmsg(status));
                return;
-        case -ENODEV:                   /* device removed */
+        case -EPROTO:                   /* protocol error or unplug */
-        case -ESHUTDOWN:                /* device shut down */
+        case -EILSEQ:
-                gig_dbg(DEBUG_USBREQ, "%s: device disconnected", __func__);
+        case -ETIME:
+                /* resubmit after delay */
+                gig_dbg(DEBUG_USBREQ, "%s: %s",
+                        __func__, get_usb_statmsg(status));
+                mod_timer(&ucs->timer_int_in, jiffies + HZ / 10);
                return;
-        default:                /* severe trouble */
+        default:                /* other errors: just resubmit */
                dev_warn(cs->dev, "interrupt read: %s\n",
                         get_usb_statmsg(status));
                goto resubmit;
@@ -723,6 +774,13 @@ static void read_int_callback(struct urb *urb)
                        break;
                }
                spin_lock_irqsave(&cs->lock, flags);
+                if (ucs->basstate & BS_ATRDPEND) {
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        dev_warn(cs->dev,
+        "HD_RECEIVEATDATA_ACK(%d) during HD_READ_ATMESSAGE(%d) ignored\n",
+                                 l, ucs->rcvbuf_size);
+                        break;
+                }
                if (ucs->rcvbuf_size) {
                        /* throw away previous buffer - we have no queue */
                        dev_err(cs->dev,
@@ -735,7 +793,6 @@ static void read_int_callback(struct urb *urb)
                if (ucs->rcvbuf == NULL) {
                        spin_unlock_irqrestore(&cs->lock, flags);
                        dev_err(cs->dev, "out of memory receiving AT data\n");
-                        error_reset(cs);
                        break;
                }
                ucs->rcvbuf_size = l;
@@ -745,13 +802,10 @@ static void read_int_callback(struct urb *urb)
                        kfree(ucs->rcvbuf);
                        ucs->rcvbuf = NULL;
                        ucs->rcvbuf_size = 0;
-                        if (rc != -ENODEV) {
-                                spin_unlock_irqrestore(&cs->lock, flags);
-                                error_reset(cs);
-                                break;
-                        }
                }
                spin_unlock_irqrestore(&cs->lock, flags);
+                if (rc < 0 && rc != -ENODEV)
+                        error_reset(cs);
                break;
        case HD_RESET_INTERRUPT_PIPE_ACK:
@@ -818,6 +872,7 @@ static void read_iso_callback(struct urb *urb)
                tasklet_hi_schedule(&ubc->rcvd_tasklet);
        } else {
                /* tasklet still busy, drop data and resubmit URB */
+                gig_dbg(DEBUG_ISO, "%s: overrun", __func__);
                ubc->loststatus = status;
                for (i = 0; i < BAS_NUMFRAMES; i++) {
                        ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
@@ -833,13 +888,11 @@ static void read_iso_callback(struct urb *urb)
                        urb->dev = bcs->cs->hw.bas->udev;
                        urb->transfer_flags = URB_ISO_ASAP;
                        urb->number_of_packets = BAS_NUMFRAMES;
-                        gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit",
-                                __func__);
                        rc = usb_submit_urb(urb, GFP_ATOMIC);
                        if (unlikely(rc != 0 && rc != -ENODEV)) {
                                dev_err(bcs->cs->dev,
-                                        "could not resubmit isochronous read "
+                                       "could not resubmit isoc read URB: %s\n",
-                                        "URB: %s\n", get_usb_rcmsg(rc));
+                                        get_usb_rcmsg(rc));
                                dump_urb(DEBUG_ISO, "isoc read", urb);
                                error_hangup(bcs);
                        }
@@ -1081,7 +1134,7 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
                        gig_dbg(DEBUG_ISO, "%s: disconnected", __func__);
                else
                        dev_err(ucx->bcs->cs->dev,
-                                "could not submit isochronous write URB: %s\n",
+                                "could not submit isoc write URB: %s\n",
                                get_usb_rcmsg(rc));
                return rc;
        }
@@ -1104,7 +1157,6 @@ static void write_iso_tasklet(unsigned long data)
        struct urb *urb;
        int status;
        struct usb_iso_packet_descriptor *ifd;
-        int offset;
        unsigned long flags;
        int i;
        struct sk_buff *skb;
@@ -1126,7 +1178,7 @@ static void write_iso_tasklet(unsigned long data)
                ubc->isooutovfl = NULL;
                spin_unlock_irqrestore(&ubc->isooutlock, flags);
                if (ovfl) {
-                        dev_err(cs->dev, "isochronous write buffer underrun\n");
+                        dev_err(cs->dev, "isoc write underrun\n");
                        error_hangup(bcs);
                        break;
                }
@@ -1151,7 +1203,7 @@ static void write_iso_tasklet(unsigned long data)
                                if (next) {
                                        /* couldn't put it back */
                                        dev_err(cs->dev,
-                                              "losing isochronous write URB\n");
+                                                "losing isoc write URB\n");
                                        error_hangup(bcs);
                                }
                        }
@@ -1172,29 +1224,25 @@ static void write_iso_tasklet(unsigned long data)
                         *   successfully sent
                         * - all following frames are not sent at all
                         */
-                        offset = done->limit;   /* default (no error) */
                        for (i = 0; i < BAS_NUMFRAMES; i++) {
                                ifd = &urb->iso_frame_desc[i];
                                if (ifd->status ||
                                    ifd->actual_length != ifd->length) {
                                        dev_warn(cs->dev,
-                                             "isochronous write: frame %d: %s, "
+                                            "isoc write: frame %d[%d/%d]: %s\n",
-                                             "only %d of %d bytes sent\n",
+                                                 i, ifd->actual_length,
-                                             i, get_usb_statmsg(ifd->status),
+                                                 ifd->length,
-                                             ifd->actual_length, ifd->length);
+                                                 get_usb_statmsg(ifd->status));
-                                        offset = (ifd->offset +
-                                                  ifd->actual_length)
-                                                 % BAS_OUTBUFSIZE;
                                        break;
                                }
                        }
                        break;
                case -EPIPE:                    /* stall - probably underrun */
-                        dev_err(cs->dev, "isochronous write stalled\n");
+                        dev_err(cs->dev, "isoc write: stalled\n");
                        error_hangup(bcs);
                        break;
-                default:                        /* severe trouble */
+                default:                        /* other errors */
-                        dev_warn(cs->dev, "isochronous write: %s\n",
+                        dev_warn(cs->dev, "isoc write: %s\n",
                                 get_usb_statmsg(status));
                }
@@ -1250,6 +1298,7 @@ static void read_iso_tasklet(unsigned long data)
        struct cardstate *cs = bcs->cs;
        struct urb *urb;
        int status;
+        struct usb_iso_packet_descriptor *ifd;
        char *rcvbuf;
        unsigned long flags;
        int totleft, numbytes, offset, frame, rc;
@@ -1267,8 +1316,7 @@ static void read_iso_tasklet(unsigned long data)
                ubc->isoindone = NULL;
                if (unlikely(ubc->loststatus != -EINPROGRESS)) {
                        dev_warn(cs->dev,
-                                 "isochronous read overrun, "
+                "isoc read overrun, URB dropped (status: %s, %d bytes)\n",
-                                 "dropped URB with status: %s, %d bytes lost\n",
                                 get_usb_statmsg(ubc->loststatus),
                                 ubc->isoinlost);
                        ubc->loststatus = -EINPROGRESS;
@@ -1298,11 +1346,11 @@ static void read_iso_tasklet(unsigned long data)
                                __func__, get_usb_statmsg(status));
                        continue;               /* -> skip */
                case -EPIPE:
-                        dev_err(cs->dev, "isochronous read stalled\n");
+                        dev_err(cs->dev, "isoc read: stalled\n");
                        error_hangup(bcs);
                        continue;               /* -> skip */
-                default:                        /* severe trouble */
+                default:                        /* other error */
-                        dev_warn(cs->dev, "isochronous read: %s\n",
+                        dev_warn(cs->dev, "isoc read: %s\n",
                                 get_usb_statmsg(status));
                        goto error;
                }
@@ -1310,40 +1358,52 @@ static void read_iso_tasklet(unsigned long data)
                rcvbuf = urb->transfer_buffer;
                totleft = urb->actual_length;
                for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) {
-                        numbytes = urb->iso_frame_desc[frame].actual_length;
+                        ifd = &urb->iso_frame_desc[frame];
-                        if (unlikely(urb->iso_frame_desc[frame].status))
+                        numbytes = ifd->actual_length;
+                        switch (ifd->status) {
+                        case 0:                 /* success */
+                                break;
+                        case -EPROTO:           /* protocol error or unplug */
+                        case -EILSEQ:
+                        case -ETIME:
+                                /* probably just disconnected, ignore */
+                                gig_dbg(DEBUG_ISO,
+                                        "isoc read: frame %d[%d]: %s\n",
+                                        frame, numbytes,
+                                        get_usb_statmsg(ifd->status));
+                                break;
+                        default:                /* other error */
+                                /* report, assume transferred bytes are ok */
                                dev_warn(cs->dev,
-                                         "isochronous read: frame %d[%d]: %s\n",
+                                         "isoc read: frame %d[%d]: %s\n",
                                         frame, numbytes,
-                                         get_usb_statmsg(
+                                         get_usb_statmsg(ifd->status));
-                                            urb->iso_frame_desc[frame].status));
+                        }
                        if (unlikely(numbytes > BAS_MAXFRAME))
                                dev_warn(cs->dev,
-                                         "isochronous read: frame %d: "
+                                         "isoc read: frame %d[%d]: %s\n",
-                                         "numbytes (%d) > BAS_MAXFRAME\n",
+                                         frame, numbytes,
-                                         frame, numbytes);
+                                         "exceeds max frame size");
                        if (unlikely(numbytes > totleft)) {
                                dev_warn(cs->dev,
-                                         "isochronous read: frame %d: "
+                                         "isoc read: frame %d[%d]: %s\n",
-                                         "numbytes (%d) > totleft (%d)\n",
+                                         frame, numbytes,
-                                         frame, numbytes, totleft);
+                                         "exceeds total transfer length");
                                numbytes = totleft;
                        }
-                        offset = urb->iso_frame_desc[frame].offset;
+                        offset = ifd->offset;
                        if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
                                dev_warn(cs->dev,
-                                         "isochronous read: frame %d: "
+                                         "isoc read: frame %d[%d]: %s\n",
-                                         "offset (%d) + numbytes (%d) "
+                                         frame, numbytes,
-                                         "> BAS_INBUFSIZE\n",
+                                         "exceeds end of buffer");
-                                         frame, offset, numbytes);
                                numbytes = BAS_INBUFSIZE - offset;
                        }
                        gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);
                        totleft -= numbytes;
                }
                if (unlikely(totleft > 0))
-                        dev_warn(cs->dev,
+                        dev_warn(cs->dev, "isoc read: %d data bytes missing\n",
-                                 "isochronous read: %d data bytes missing\n",
                                 totleft);
 error:
@@ -1359,9 +1419,9 @@ error:
                rc = usb_submit_urb(urb, GFP_ATOMIC);
                if (unlikely(rc != 0 && rc != -ENODEV)) {
                        dev_err(cs->dev,
-                                "could not resubmit isochronous read URB: %s\n",
+                                "could not resubmit isoc read URB: %s\n",
                                get_usb_rcmsg(rc));
-                        dump_urb(DEBUG_ISO, "resubmit iso read", urb);
+                        dump_urb(DEBUG_ISO, "resubmit isoc read", urb);
                        error_hangup(bcs);
                }
        }
@@ -1373,12 +1433,12 @@ error:
 /* req_timeout
 * timeout routine for control output request
 * argument:
- *      B channel control structure
+ *      controller state structure
 */
 static void req_timeout(unsigned long data)
 {
-        struct bc_state *bcs = (struct bc_state *) data;
+        struct cardstate *cs = (struct cardstate *) data;
-        struct bas_cardstate *ucs = bcs->cs->hw.bas;
+        struct bas_cardstate *ucs = cs->hw.bas;
        int pending;
        unsigned long flags;
@@ -1395,38 +1455,44 @@ static void req_timeout(unsigned long data)
                break;
        case HD_OPEN_ATCHANNEL:
-                dev_err(bcs->cs->dev, "timeout opening AT channel\n");
+                dev_err(cs->dev, "timeout opening AT channel\n");
-                error_reset(bcs->cs);
+                error_reset(cs);
                break;
-        case HD_OPEN_B2CHANNEL:
        case HD_OPEN_B1CHANNEL:
-                dev_err(bcs->cs->dev, "timeout opening channel %d\n",
+                dev_err(cs->dev, "timeout opening channel 1\n");
-                        bcs->channel + 1);
+                error_hangup(&cs->bcs[0]);
-                error_hangup(bcs);
+                break;
+        case HD_OPEN_B2CHANNEL:
+                dev_err(cs->dev, "timeout opening channel 2\n");
+                error_hangup(&cs->bcs[1]);
                break;
        case HD_CLOSE_ATCHANNEL:
-                dev_err(bcs->cs->dev, "timeout closing AT channel\n");
+                dev_err(cs->dev, "timeout closing AT channel\n");
-                error_reset(bcs->cs);
+                error_reset(cs);
                break;
-        case HD_CLOSE_B2CHANNEL:
        case HD_CLOSE_B1CHANNEL:
-                dev_err(bcs->cs->dev, "timeout closing channel %d\n",
+                dev_err(cs->dev, "timeout closing channel 1\n");
-                        bcs->channel + 1);
+                error_reset(cs);
-                error_reset(bcs->cs);
+                break;
+        case HD_CLOSE_B2CHANNEL:
+                dev_err(cs->dev, "timeout closing channel 2\n");
+                error_reset(cs);
                break;
        case HD_RESET_INTERRUPT_PIPE:
                /* error recovery escalation */
-                dev_err(bcs->cs->dev,
+                dev_err(cs->dev,
                        "reset interrupt pipe timeout, attempting USB reset\n");
-                usb_queue_reset_device(bcs->cs->hw.bas->interface);
+                usb_queue_reset_device(ucs->interface);
                break;
        default:
-                dev_warn(bcs->cs->dev, "request 0x%02x timed out, clearing\n",
+                dev_warn(cs->dev, "request 0x%02x timed out, clearing\n",
                         pending);
        }
@@ -1557,10 +1623,7 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
        if (timeout > 0) {
                gig_dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
-                ucs->timer_ctrl.expires = jiffies + timeout * HZ / 10;
+                mod_timer(&ucs->timer_ctrl, jiffies + timeout * HZ / 10);
-                ucs->timer_ctrl.data = (unsigned long) bcs;
-                ucs->timer_ctrl.function = req_timeout;
-                add_timer(&ucs->timer_ctrl);
        }
        spin_unlock_irqrestore(&ucs->lock, flags);
@@ -1590,21 +1653,20 @@ static int gigaset_init_bchannel(struct bc_state *bcs)
        if (cs->hw.bas->basstate & BS_SUSPEND) {
                dev_notice(cs->dev,
-                           "not starting isochronous I/O, "
+                           "not starting isoc I/O, suspend in progress\n");
-                           "suspend in progress\n");
                spin_unlock_irqrestore(&cs->lock, flags);
                return -EHOSTUNREACH;
        }
        ret = starturbs(bcs);
        if (ret < 0) {
+                spin_unlock_irqrestore(&cs->lock, flags);
                dev_err(cs->dev,
-                        "could not start isochronous I/O for channel B%d: %s\n",
+                        "could not start isoc I/O for channel B%d: %s\n",
                        bcs->channel + 1,
                        ret == -EFAULT ? "null URB" : get_usb_rcmsg(ret));
                if (ret != -ENODEV)
                        error_hangup(bcs);
-                spin_unlock_irqrestore(&cs->lock, flags);
                return ret;
        }
@@ -1614,11 +1676,11 @@ static int gigaset_init_bchannel(struct bc_state *bcs)
                dev_err(cs->dev, "could not open channel B%d\n",
                        bcs->channel + 1);
                stopurbs(bcs->hw.bas);
-                if (ret != -ENODEV)
-                        error_hangup(bcs);
        }
        spin_unlock_irqrestore(&cs->lock, flags);
+        if (ret < 0 && ret != -ENODEV)
+                error_hangup(bcs);
        return ret;
 }
@@ -1826,10 +1888,7 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
        if (!(update_basstate(ucs, BS_ATTIMER, BS_ATREADY) & BS_ATTIMER)) {
                gig_dbg(DEBUG_OUTPUT, "setting ATREADY timeout of %d/10 secs",
                        ATRDY_TIMEOUT);
-                ucs->timer_atrdy.expires = jiffies + ATRDY_TIMEOUT * HZ / 10;
+                mod_timer(&ucs->timer_atrdy, jiffies + ATRDY_TIMEOUT * HZ / 10);
-                ucs->timer_atrdy.data = (unsigned long) cs;
-                ucs->timer_atrdy.function = atrdy_timeout;
-                add_timer(&ucs->timer_atrdy);
        }
        return 0;
 }
@@ -1914,6 +1973,28 @@ static int gigaset_write_cmd(struct cardstate *cs, struct cmdbuf_t *cb)
         * The next command will reopen the AT channel automatically.
         */
        if (cb->len == 3 && !memcmp(cb->buf, "+++", 3)) {
+                /* If an HD_RECEIVEATDATA_ACK message remains unhandled
+                 * because of an error, the base never sends another one.
+                 * The response channel is thus effectively blocked.
+                 * Closing and reopening the AT channel does *not* clear
+                 * this condition.
+                 * As a stopgap measure, submit a zero-length AT read
+                 * before closing the AT channel. This has the undocumented
+                 * effect of triggering a new HD_RECEIVEATDATA_ACK message
+                 * from the base if necessary.
+                 * The subsequent AT channel close then discards any pending
+                 * messages.
+                 */
+                spin_lock_irqsave(&cs->lock, flags);
+                if (!(cs->hw.bas->basstate & BS_ATRDPEND)) {
+                        kfree(cs->hw.bas->rcvbuf);
+                        cs->hw.bas->rcvbuf = NULL;
+                        cs->hw.bas->rcvbuf_size = 0;
+                        cs->hw.bas->retry_cmd_in = 0;
+                        atread_submit(cs, 0);
+                }
+                spin_unlock_irqrestore(&cs->lock, flags);
                rc = req_submit(cs->bcs, HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT);
                if (cb->wake_tasklet)
                        tasklet_schedule(cb->wake_tasklet);
@@ -2010,7 +2091,7 @@ static int gigaset_freebcshw(struct bc_state *bcs)
        /* kill URBs and tasklets before freeing - better safe than sorry */
        ubc->running = 0;
-        gig_dbg(DEBUG_INIT, "%s: killing iso URBs", __func__);
+        gig_dbg(DEBUG_INIT, "%s: killing isoc URBs", __func__);
        for (i = 0; i < BAS_OUTURBS; ++i) {
                usb_kill_urb(ubc->isoouturbs[i].urb);
                usb_free_urb(ubc->isoouturbs[i].urb);
@@ -2131,10 +2212,12 @@ static int gigaset_initcshw(struct cardstate *cs)
        ucs->pending = 0;
        ucs->basstate = 0;
-        init_timer(&ucs->timer_ctrl);
+        setup_timer(&ucs->timer_ctrl, req_timeout, (unsigned long) cs);
-        init_timer(&ucs->timer_atrdy);
+        setup_timer(&ucs->timer_atrdy, atrdy_timeout, (unsigned long) cs);
-        init_timer(&ucs->timer_cmd_in);
+        setup_timer(&ucs->timer_cmd_in, cmd_in_timeout, (unsigned long) cs);
+        setup_timer(&ucs->timer_int_in, int_in_resubmit, (unsigned long) cs);
        init_waitqueue_head(&ucs->waitqueue);
+        INIT_WORK(&ucs->int_in_wq, int_in_work);
        return 1;
 }
@@ -2230,7 +2313,7 @@ static int gigaset_probe(struct usb_interface *interface,
                 __func__, le16_to_cpu(udev->descriptor.idVendor),
                 le16_to_cpu(udev->descriptor.idProduct));
-        /* allocate memory for our device state and intialize it */
+        /* allocate memory for our device state and initialize it */
        cs = gigaset_initcs(driver, BAS_CHANNELS, 0, 0, cidmode,
                            GIGASET_MODULENAME);
        if (!cs)
@@ -2282,6 +2365,7 @@ static int gigaset_probe(struct usb_interface *interface,
                        get_usb_rcmsg(rc));
                goto error;
        }
+        ucs->retry_int_in = 0;
        /* tell the device that the driver is ready */
        rc = req_submit(cs->bcs, HD_DEVICE_INIT_ACK, 0, 0);
@@ -2334,10 +2418,12 @@ static void gigaset_disconnect(struct usb_interface *interface)
        /* stop driver (common part) */
        gigaset_stop(cs);
-        /* stop timers and URBs, free ressources */
+        /* stop delayed work and URBs, free ressources */
        del_timer_sync(&ucs->timer_ctrl);
        del_timer_sync(&ucs->timer_atrdy);
        del_timer_sync(&ucs->timer_cmd_in);
+        del_timer_sync(&ucs->timer_int_in);
+        cancel_work_sync(&ucs->int_in_wq);
        freeurbs(cs);
        usb_set_intfdata(interface, NULL);
        kfree(ucs->rcvbuf);
@@ -2400,10 +2486,14 @@ static int gigaset_suspend(struct usb_interface *intf, pm_message_t message)
                /* in case of timeout, proceed anyway */
        }
-        /* kill all URBs and timers that might still be pending */
+        /* kill all URBs and delayed work that might still be pending */
        usb_kill_urb(ucs->urb_ctrl);
        usb_kill_urb(ucs->urb_int_in);
        del_timer_sync(&ucs->timer_ctrl);
+        del_timer_sync(&ucs->timer_atrdy);
+        del_timer_sync(&ucs->timer_cmd_in);
+        del_timer_sync(&ucs->timer_int_in);
+        cancel_work_sync(&ucs->int_in_wq);
        gig_dbg(DEBUG_SUSPEND, "suspend complete");
        return 0;
@@ -2425,6 +2515,7 @@ static int gigaset_resume(struct usb_interface *intf)
                        get_usb_rcmsg(rc));
                return rc;
        }
+        ucs->retry_int_in = 0;
        /* clear suspend flag to reallow activity */
        update_basstate(ucs, 0, BS_SUSPEND);
@@ -2480,7 +2571,7 @@ static int __init bas_gigaset_init(void)
 {
        int result;
-        /* allocate memory for our driver state and intialize it */
+        /* allocate memory for our driver state and initialize it */
        driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                    GIGASET_MODULENAME, GIGASET_DEVNAME,
                                    &gigops, THIS_MODULE);
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/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 3ca561eccd9f..db621db67f61 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -1026,32 +1026,6 @@ struct cardstate *gigaset_get_cs_by_id(int id)
        return ret;
 }
-void gigaset_debugdrivers(void)
-{
-        unsigned long flags;
-        static struct cardstate *cs;
-        struct gigaset_driver *drv;
-        unsigned i;
-        spin_lock_irqsave(&driver_lock, flags);
-        list_for_each_entry(drv, &drivers, list) {
-                gig_dbg(DEBUG_DRIVER, "driver %p", drv);
-                spin_lock(&drv->lock);
-                for (i = 0; i < drv->minors; ++i) {
-                        gig_dbg(DEBUG_DRIVER, "  index %u", i);
-                        cs = drv->cs + i;
-                        gig_dbg(DEBUG_DRIVER, "    cardstate %p", cs);
-                        gig_dbg(DEBUG_DRIVER, "    flags 0x%02x", cs->flags);
-                        gig_dbg(DEBUG_DRIVER, "    minor_index %u",
-                                cs->minor_index);
-                        gig_dbg(DEBUG_DRIVER, "    driver %p", cs->driver);
-                        gig_dbg(DEBUG_DRIVER, "    i4l id %d", cs->myid);
-                }
-                spin_unlock(&drv->lock);
-        }
-        spin_unlock_irqrestore(&driver_lock, flags);
-}
 static struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
 {
        unsigned long flags;
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index a14187605f5e..ba74646cf0e4 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -390,12 +390,12 @@ static const struct zsau_resp_t {
 */
 static int cid_of_response(char *s)
 {
-        unsigned long cid;
+        int cid;
        int rc;
        if (s[-1] != ';')
                return 0;       /* no CID separator */
-        rc = strict_strtoul(s, 10, &cid);
+        rc = kstrtoint(s, 10, &cid);
        if (rc)
                return 0;       /* CID not numeric */
        if (cid < 1 || cid > 65535)
@@ -566,27 +566,19 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                case RT_ZCAU:
                        event->parameter = -1;
                        if (curarg + 1 < params) {
-                                unsigned long type, value;
+                                u8 type, value;
-                                i = strict_strtoul(argv[curarg++], 16, &type);
-                                j = strict_strtoul(argv[curarg++], 16, &value);
-                                if (i == 0 && type < 256 &&
+                                i = kstrtou8(argv[curarg++], 16, &type);
-                                    j == 0 && value < 256)
+                                j = kstrtou8(argv[curarg++], 16, &value);
+                                if (i == 0 && j == 0)
                                        event->parameter = (type << 8) | value;
                        } else
                                curarg = params - 1;
                        break;
                case RT_NUMBER:
-                        event->parameter = -1;
+                        if (curarg >= params ||
-                        if (curarg < params) {
+                            kstrtoint(argv[curarg++], 10, &event->parameter))
-                                unsigned long res;
+                                event->parameter = -1;
-                                int rc;
-                                rc = strict_strtoul(argv[curarg++], 10, &res);
-                                if (rc == 0)
-                                        event->parameter = res;
-                        }
                        gig_dbg(DEBUG_EVENT, "parameter==%d", event->parameter);
                        break;
                }
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index a69512fb1195..6dd360734cfd 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -70,7 +70,6 @@ enum debuglevel {
        DEBUG_STREAM_DUMP = 0x00080, /* application data stream content */
        DEBUG_LLDATA      = 0x00100, /* sent/received LL data */
        DEBUG_EVENT       = 0x00200, /* event processing */
-        DEBUG_DRIVER      = 0x00400, /* driver structure */
        DEBUG_HDLC        = 0x00800, /* M10x HDLC processing */
        DEBUG_CHANNEL     = 0x01000, /* channel allocation/deallocation */
        DEBUG_TRANSCMD    = 0x02000, /* AT-COMMANDS+RESPONSES */
@@ -727,7 +726,7 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
 /* Deallocate driver structure. */
 void gigaset_freedriver(struct gigaset_driver *drv);
-void gigaset_debugdrivers(void);
 struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty);
 struct cardstate *gigaset_get_cs_by_id(int id);
 void gigaset_blockdriver(struct gigaset_driver *drv);
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 34bca37d65b9..9bec8b969964 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -201,8 +201,6 @@ static int command_from_LL(isdn_ctrl *cntrl)
        int i;
        size_t l;
-        gigaset_debugdrivers();
        gig_dbg(DEBUG_CMD, "driver: %d, command: %d, arg: 0x%lx",
                cntrl->driver, cntrl->command, cntrl->arg);
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index bb710d16a526..e35058bcd7b9 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -115,15 +115,15 @@ static int if_config(struct cardstate *cs, int *arg)
 static int  if_open(struct tty_struct *tty, struct file *filp);
 static void if_close(struct tty_struct *tty, struct file *filp);
-static int  if_ioctl(struct tty_struct *tty, struct file *file,
+static int  if_ioctl(struct tty_struct *tty,
                     unsigned int cmd, unsigned long arg);
 static int  if_write_room(struct tty_struct *tty);
 static int  if_chars_in_buffer(struct tty_struct *tty);
 static void if_throttle(struct tty_struct *tty);
 static void if_unthrottle(struct tty_struct *tty);
 static void if_set_termios(struct tty_struct *tty, struct ktermios *old);
-static int  if_tiocmget(struct tty_struct *tty, struct file *file);
+static int  if_tiocmget(struct tty_struct *tty);
-static int  if_tiocmset(struct tty_struct *tty, struct file *file,
+static int  if_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 static int  if_write(struct tty_struct *tty,
                     const unsigned char *buf, int count);
@@ -156,8 +156,10 @@ static int if_open(struct tty_struct *tty, struct file *filp)
        if (!cs || !try_module_get(cs->driver->owner))
                return -ENODEV;
-        if (mutex_lock_interruptible(&cs->mutex))
+        if (mutex_lock_interruptible(&cs->mutex)) {
+                module_put(cs->driver->owner);
                return -ERESTARTSYS;
+        }
        tty->driver_data = cs;
        ++cs->open_count;
@@ -205,7 +207,7 @@ static void if_close(struct tty_struct *tty, struct file *filp)
        module_put(cs->driver->owner);
 }
-static int if_ioctl(struct tty_struct *tty, struct file *file,
+static int if_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct cardstate *cs;
@@ -280,7 +282,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
        return retval;
 }
-static int if_tiocmget(struct tty_struct *tty, struct file *file)
+static int if_tiocmget(struct tty_struct *tty)
 {
        struct cardstate *cs;
        int retval;
@@ -303,7 +305,7 @@ static int if_tiocmget(struct tty_struct *tty, struct file *file)
        return retval;
 }
-static int if_tiocmset(struct tty_struct *tty, struct file *file,
+static int if_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
        struct cardstate *cs;
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 2dfd346fc889..f39ccdf87a17 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -842,13 +842,14 @@ static inline void trans_receive(unsigned char *src, unsigned count,
        if (unlikely(bcs->ignore)) {
                bcs->ignore--;
-                hdlc_flush(bcs);
                return;
        }
        skb = bcs->rx_skb;
-        if (skb == NULL)
+        if (skb == NULL) {
                skb = gigaset_new_rx_skb(bcs);
-        bcs->hw.bas->goodbytes += skb->len;
+                if (skb == NULL)
+                        return;
+        }
        dobytes = bcs->rx_bufsize - skb->len;
        while (count > 0) {
                dst = skb_put(skb, count < dobytes ? count : dobytes);
@@ -860,6 +861,7 @@ static inline void trans_receive(unsigned char *src, unsigned count,
                if (dobytes == 0) {
                        dump_bytes(DEBUG_STREAM_DUMP,
                                   "rcv data", skb->data, skb->len);
+                        bcs->hw.bas->goodbytes += skb->len;
                        gigaset_skb_rcvd(bcs, skb);
                        skb = gigaset_new_rx_skb(bcs);
                        if (skb == NULL)
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index d151dcbf770d..86a5c4f7775e 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -440,7 +440,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
        if (!set && !clear)
                return 0;
        gig_dbg(DEBUG_IF, "tiocmset set %x clear %x", set, clear);
-        return tty->ops->tiocmset(tty, NULL, set, clear);
+        return tty->ops->tiocmset(tty, set, clear);
 }
 static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
@@ -513,7 +513,7 @@ gigaset_tty_open(struct tty_struct *tty)
                return -ENODEV;
        }
-        /* allocate memory for our device state and intialize it */
+        /* allocate memory for our device state and initialize it */
        cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME);
        if (!cs)
                goto error;
@@ -771,7 +771,7 @@ static int __init ser_gigaset_init(void)
                return rc;
        }
-        /* allocate memory for our driver state and intialize it */
+        /* allocate memory for our driver state and initialize it */
        driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                          GIGASET_MODULENAME, GIGASET_DEVNAME,
                                          &ops, THIS_MODULE);
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 4a66338f4e7d..5e3300d8a2a5 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -695,7 +695,7 @@ static int gigaset_probe(struct usb_interface *interface,
        dev_info(&udev->dev, "%s: Device matched ... !\n", __func__);
-        /* allocate memory for our device state and intialize it */
+        /* allocate memory for our device state and initialize it */
        cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME);
        if (!cs)
                return -ENODEV;
@@ -894,7 +894,7 @@ static int __init usb_gigaset_init(void)
 {
        int result;
-        /* allocate memory for our driver state and intialize it */
+        /* allocate memory for our driver state and initialize it */
        driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                    GIGASET_MODULENAME, GIGASET_DEVNAME,
                                    &ops, THIS_MODULE);
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 09b1795516f4..61f516f376dc 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -20,7 +20,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
 #include <pcmcia/ds.h>
@@ -39,87 +38,32 @@ MODULE_LICENSE("GPL");
 /*====================================================================*/
-/*
-   The event() function is this driver's Card Services event handler.
-   It will be called by Card Services when an appropriate card status
-   event is received.  The config() and release() entry points are
-   used to configure or release a socket, in response to card insertion
-   and ejection events.  They are invoked from the skeleton event
-   handler.
-*/
 static int avmcs_config(struct pcmcia_device *link);
 static void avmcs_release(struct pcmcia_device *link);
-/*
-   The attach() and detach() entry points are used to create and destroy
-   "instances" of the driver, where each instance represents everything
-   needed to manage one actual PCMCIA card.
-*/
 static void avmcs_detach(struct pcmcia_device *p_dev);
-/*======================================================================
-    avmcs_attach() creates an "instance" of the driver, allocating
-    local data structures for one device.  The device is registered
-    with Card Services.
-    The dev_link structure is initialized, but we don't actually
-    configure the card at this point -- we wait until we receive a
-    card insertion event.
-    
-======================================================================*/
 static int avmcs_probe(struct pcmcia_device *p_dev)
 {
-    /* The io structure describes IO port mapping */
-    p_dev->resource[0]->end = 16;
-    p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
    /* General socket configuration */
-    p_dev->conf.Attributes = CONF_ENABLE_IRQ;
+    p_dev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
-    p_dev->conf.IntType = INT_MEMORY_AND_IO;
+    p_dev->config_index = 1;
-    p_dev->conf.ConfigIndex = 1;
+    p_dev->config_regs = PRESENT_OPTION;
-    p_dev->conf.Present = PRESENT_OPTION;
    return avmcs_config(p_dev);
 } /* avmcs_attach */
-/*======================================================================
-    This deletes a driver "instance".  The device is de-registered
-    with Card Services.  If it has been released, all local data
-    structures are freed.  Otherwise, the structures will be freed
-    when the device is released.
-======================================================================*/
 static void avmcs_detach(struct pcmcia_device *link)
 {
        avmcs_release(link);
 } /* avmcs_detach */
-/*======================================================================
+static int avmcs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
-    avmcs_config() is scheduled to run after a CARD_INSERTION event
-    is received, to configure the PCMCIA socket, and to make the
-    ethernet device available to the system.
-    
-======================================================================*/
-static int avmcs_configcheck(struct pcmcia_device *p_dev,
-                             cistpl_cftable_entry_t *cf,
-                             cistpl_cftable_entry_t *dflt,
-                             unsigned int vcc,
-                             void *priv_data)
 {
-        if (cf->io.nwin <= 0)
+        p_dev->resource[0]->end = 16;
-                return -ENODEV;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->resource[0]->start = cf->io.win[0].base;
-        p_dev->resource[0]->end = cf->io.win[0].len;
        return pcmcia_request_io(p_dev);
 }
@@ -150,7 +94,7 @@ static int avmcs_config(struct pcmcia_device *link)
        /*
         * configure the PCMCIA socket
          */
-        i = pcmcia_request_configuration(link, &link->conf);
+        i = pcmcia_enable_device(link);
        if (i != 0) {
            pcmcia_disable_device(link);
            break;
@@ -197,13 +141,6 @@ static int avmcs_config(struct pcmcia_device *link)
 } /* avmcs_config */
-/*======================================================================
-    After a card is removed, avmcs_release() will unregister the net
-    device, and release the PCMCIA configuration.  If the device is
-    still open, this will be postponed until it is closed.
-    
-======================================================================*/
 static void avmcs_release(struct pcmcia_device *link)
 {
@@ -212,7 +149,7 @@ static void avmcs_release(struct pcmcia_device *link)
 } /* avmcs_release */
-static struct pcmcia_device_id avmcs_ids[] = {
+static const struct pcmcia_device_id avmcs_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN-Controller B1", 0x95d42008, 0x845dc335),
        PCMCIA_DEVICE_PROD_ID12("AVM", "Mobile ISDN-Controller M1", 0x95d42008, 0x81e10430),
        PCMCIA_DEVICE_PROD_ID12("AVM", "Mobile ISDN-Controller M2", 0x95d42008, 0x18e8558a),
@@ -222,9 +159,7 @@ MODULE_DEVICE_TABLE(pcmcia, avmcs_ids);
 static struct pcmcia_driver avmcs_driver = {
        .owner  = THIS_MODULE,
-        .drv    = {
+        .name           = "avm_cs",
-                .name   = "avm_cs",
-        },
        .probe = avmcs_probe,
        .remove = avmcs_detach,
        .id_table = avmcs_ids,
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c
index 33ce89eed65b..7a9894cb4557 100644
--- a/drivers/isdn/hardware/eicon/debug.c
+++ b/drivers/isdn/hardware/eicon/debug.c
@@ -861,8 +861,8 @@ static int diva_get_idi_adapter_info (IDI_CALL request, dword* serial, dword* lo
 void diva_mnt_add_xdi_adapter (const DESCRIPTOR* d) {
  diva_os_spin_lock_magic_t old_irql, old_irql1;
  dword sec, usec, logical, serial, org_mask;
-  int id, best_id = 0, free_id = -1;
+  int id, free_id = -1;
-  char tmp[256];
+  char tmp[128];
  diva_dbg_entry_head_t* pmsg = NULL;
  int len;
  word size;
@@ -906,7 +906,6 @@ void diva_mnt_add_xdi_adapter (const DESCRIPTOR* d) {
        and slot is still free - reuse it
        */
      free_id = id;
-      best_id = 1;
      break;
    }
  }
diff --git a/drivers/isdn/hardware/eicon/debuglib.h b/drivers/isdn/hardware/eicon/debuglib.h
index 8ea587783e14..02eed6b4354c 100644
--- a/drivers/isdn/hardware/eicon/debuglib.h
+++ b/drivers/isdn/hardware/eicon/debuglib.h
@@ -249,7 +249,7 @@ typedef struct _DbgHandle_
 }     regTime ;  /* timestamp for registration       */
 void               *pIrp ;   /* ptr to pending i/o request       */
 unsigned long       dbgMask ;  /* current debug mask               */
- char                drvName[16] ; /* ASCII name of registered driver  */
+ char                drvName[128] ; /* ASCII name of registered driver  */
 char                drvTag[64] ; /* revision string     */
 DbgEnd              dbg_end ;  /* function for debug closing       */
 DbgLog              dbg_prt ;  /* function for debug appending     */
diff --git a/drivers/isdn/hardware/eicon/divacapi.h b/drivers/isdn/hardware/eicon/divacapi.h
index 9f5b68037a26..e330da0c5fc0 100644
--- a/drivers/isdn/hardware/eicon/divacapi.h
+++ b/drivers/isdn/hardware/eicon/divacapi.h
@@ -673,7 +673,7 @@ struct async_s {
 /*------------------------------------------------------------------*/
-/* auxilliary states for supplementary services                     */
+/* auxiliary states for supplementary services                     */
 /*------------------------------------------------------------------*/
 #define IDLE                0
diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c
index d36a4c09e25d..0bbee7824d78 100644
--- a/drivers/isdn/hardware/eicon/divasfunc.c
+++ b/drivers/isdn/hardware/eicon/divasfunc.c
@@ -113,9 +113,8 @@ void diva_xdi_didd_remove_adapter(int card)
 static void start_dbg(void)
 {
        DbgRegister("DIVAS", DRIVERRELEASE_DIVAS, (debugmask) ? debugmask : DBG_DEFAULT);
-        DBG_LOG(("DIVA ISDNXDI BUILD (%s[%s]-%s-%s)",
+        DBG_LOG(("DIVA ISDNXDI BUILD (%s[%s])",
-                 DIVA_BUILD, diva_xdi_common_code_build, __DATE__,
+                 DIVA_BUILD, diva_xdi_common_code_build))
-                 __TIME__))
 }
 /*
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index ed9c55506797..f332b60eff6b 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -15,7 +15,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
-#include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
@@ -546,7 +545,6 @@ void diva_os_remove_soft_isr(diva_os_soft_isr_t * psoft_isr)
                void *mem;
                tasklet_kill(&pdpc->divas_task);
-                flush_scheduled_work();
                mem = psoft_isr->object;
                psoft_isr->object = NULL;
                diva_os_free(0, mem);
diff --git a/drivers/isdn/hardware/eicon/io.h b/drivers/isdn/hardware/eicon/io.h
index 0c6c650d76bb..a6f175596364 100644
--- a/drivers/isdn/hardware/eicon/io.h
+++ b/drivers/isdn/hardware/eicon/io.h
@@ -60,7 +60,7 @@ typedef struct _diva_xdi_capi_cfg {
  -------------------------------------------------------------------------- */
 struct _ISDN_ADAPTER {
 void             (* DIRequest)(PISDN_ADAPTER, ENTITY *) ;
- int                 State ; /* from NT4 1.srv, a good idea, but  a poor achievment */
+ int                 State ; /* from NT4 1.srv, a good idea, but  a poor achievement */
 int                 Initialized ;
 int         RegisteredWithDidd ;
 int                 Unavailable ;  /* callback function possible? */
diff --git a/drivers/isdn/hardware/eicon/istream.c b/drivers/isdn/hardware/eicon/istream.c
index 18f8798442fa..7bd5baa547be 100644
--- a/drivers/isdn/hardware/eicon/istream.c
+++ b/drivers/isdn/hardware/eicon/istream.c
@@ -62,7 +62,7 @@ void diva_xdi_provide_istream_info (ADAPTER* a,
  stream interface.
  If synchronous service was requested, then function
  does return amount of data written to stream.
-  'final' does indicate that pice of data to be written is
+  'final' does indicate that piece of data to be written is
  final part of frame (necessary only by structured datatransfer)
  return  0 if zero lengh packet was written
  return -1 if stream is full
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index 341ef17c22ac..a3395986df3d 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -1198,7 +1198,6 @@ static byte connect_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
  word ch;
  word i;
  word Info;
-  word CIP;
  byte LinkLayer;
  API_PARSE * ai;
  API_PARSE * bp;
@@ -1340,7 +1339,6 @@ static byte connect_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
        add_s(plci,BC,&parms[6]);
        add_s(plci,LLC,&parms[7]);
        add_s(plci,HLC,&parms[8]);
-        CIP = GET_WORD(parms[0].info);
        if (a->Info_Mask[appl->Id-1] & 0x200)
        {
          /* early B3 connect (CIP mask bit 9) no release after a disc */
@@ -2639,7 +2637,7 @@ static byte connect_b3_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
    }
    else
    {
-      /* local reply if assign unsuccessfull
+      /* local reply if assign unsuccessful
         or B3 protocol allows only one layer 3 connection
           and already connected
             or B2 protocol not any LAPD
@@ -4830,7 +4828,6 @@ static void sig_ind(PLCI *plci)
  dword x_Id;
  dword Id;
  dword rId;
-  word Number = 0;
  word i;
  word cip;
  dword cip_mask;
@@ -5106,7 +5103,7 @@ static void sig_ind(PLCI *plci)
    }
  }
-  if(plci->appl) Number = plci->appl->Number++;
+  if(plci->appl) plci->appl->Number++;
  switch(plci->Sig.Ind) {
  /* Response to Get_Supported_Services request */
@@ -5894,7 +5891,6 @@ static void sig_ind(PLCI *plci)
    break;
  case TEL_CTRL:
-    Number = 0;
    ie = multi_fac_parms[0]; /* inspect the facility hook indications */
    if(plci->State==ADVANCED_VOICE_SIG && ie[0]){
      switch (ie[1]&0x91) {
@@ -8189,7 +8185,7 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
      dlc[ 0] = 15;
      if(b2_config->length >= 8) { /* PIAFS control abilities */
        dlc[ 7] = 10; 
-        dlc[16] = 2; /* Length of PIAFS extention */
+        dlc[16] = 2; /* Length of PIAFS extension */
        dlc[17] = PIAFS_UDATA_ABILITIES; /* control (UDATA) ability */
        dlc[18] = b2_config_parms[4].info[0]; /* value */
        dlc[ 0] = 18;
@@ -10119,14 +10115,12 @@ static byte dtmf_request (dword Id, word Number, DIVA_CAPI_ADAPTER   *a, PLCI
 static void dtmf_confirmation (dword Id, PLCI   *plci)
 {
-  word Info;
  word i;
    byte result[4];
  dbug (1, dprintf ("[%06lx] %s,%d: dtmf_confirmation",
    UnMapId (Id), (char   *)(FILE_), __LINE__));
-  Info = GOOD;
  result[0] = 2;
  PUT_WORD (&result[1], DTMF_SUCCESS);
  if (plci->dtmf_send_requests != 0)
@@ -11520,13 +11514,12 @@ static word mixer_restore_config (dword Id, PLCI   *plci, byte Rc)
 static void mixer_command (dword Id, PLCI   *plci, byte Rc)
 {
  DIVA_CAPI_ADAPTER   *a;
-  word i, internal_command, Info;
+  word i, internal_command;
  dbug (1, dprintf ("[%06lx] %s,%d: mixer_command %02x %04x %04x",
    UnMapId (Id), (char   *)(FILE_), __LINE__, Rc, plci->internal_command,
    plci->li_cmd));
-  Info = GOOD;
  a = plci->adapter;
  internal_command = plci->internal_command;
  plci->internal_command = 0;
@@ -11550,7 +11543,6 @@ static void mixer_command (dword Id, PLCI   *plci, byte Rc)
        {
          dbug (1, dprintf ("[%06lx] %s,%d: Load mixer failed",
            UnMapId (Id), (char   *)(FILE_), __LINE__));
-          Info = _FACILITY_NOT_SUPPORTED;
          break;
        }
        if (plci->internal_command)
@@ -11592,7 +11584,6 @@ static void mixer_command (dword Id, PLCI   *plci, byte Rc)
            } while ((plci->li_plci_b_write_pos != plci->li_plci_b_req_pos)
              && !(plci->li_plci_b_queue[i] & LI_PLCI_B_LAST_FLAG));
          }
-          Info = _FACILITY_NOT_SUPPORTED;
          break;
        }
        if (plci->internal_command)
@@ -11610,7 +11601,6 @@ static void mixer_command (dword Id, PLCI   *plci, byte Rc)
        {
          dbug (1, dprintf ("[%06lx] %s,%d: Unload mixer failed",
            UnMapId (Id), (char   *)(FILE_), __LINE__));
-          Info = _FACILITY_NOT_SUPPORTED;
          break;
        }
        if (plci->internal_command)
@@ -12448,13 +12438,11 @@ static byte mixer_request (dword Id, word Number, DIVA_CAPI_ADAPTER   *a, PLCI
 static void mixer_indication_coefs_set (dword Id, PLCI   *plci)
 {
  dword d;
-  DIVA_CAPI_ADAPTER   *a;
    byte result[12];
  dbug (1, dprintf ("[%06lx] %s,%d: mixer_indication_coefs_set",
    UnMapId (Id), (char   *)(FILE_), __LINE__));
-  a = plci->adapter;
  if (plci->li_plci_b_read_pos != plci->li_plci_b_req_pos)
  {
    do
@@ -14111,13 +14099,11 @@ static void select_b_command (dword Id, PLCI   *plci, byte Rc)
 static void fax_connect_ack_command (dword Id, PLCI   *plci, byte Rc)
 {
-  word Info;
  word internal_command;
  dbug (1, dprintf ("[%06lx] %s,%d: fax_connect_ack_command %02x %04x",
    UnMapId (Id), (char   *)(FILE_), __LINE__, Rc, plci->internal_command));
-  Info = GOOD;
  internal_command = plci->internal_command;
  plci->internal_command = 0;
  switch (internal_command)
@@ -14160,13 +14146,11 @@ static void fax_connect_ack_command (dword Id, PLCI   *plci, byte Rc)
 static void fax_edata_ack_command (dword Id, PLCI   *plci, byte Rc)
 {
-  word Info;
  word internal_command;
  dbug (1, dprintf ("[%06lx] %s,%d: fax_edata_ack_command %02x %04x",
    UnMapId (Id), (char   *)(FILE_), __LINE__, Rc, plci->internal_command));
-  Info = GOOD;
  internal_command = plci->internal_command;
  plci->internal_command = 0;
  switch (internal_command)
@@ -14395,13 +14379,11 @@ static void rtp_connect_b3_req_command (dword Id, PLCI   *plci, byte Rc)
 static void rtp_connect_b3_res_command (dword Id, PLCI   *plci, byte Rc)
 {
-  word Info;
  word internal_command;
  dbug (1, dprintf ("[%06lx] %s,%d: rtp_connect_b3_res_command %02x %04x",
    UnMapId (Id), (char   *)(FILE_), __LINE__, Rc, plci->internal_command));
-  Info = GOOD;
  internal_command = plci->internal_command;
  plci->internal_command = 0;
  switch (internal_command)
@@ -14423,7 +14405,6 @@ static void rtp_connect_b3_res_command (dword Id, PLCI   *plci, byte Rc)
    {
      dbug (1, dprintf ("[%06lx] %s,%d: RTP setting connect resp info failed %02x",
        UnMapId (Id), (char   *)(FILE_), __LINE__, Rc));
-      Info = _WRONG_STATE;
      break;
    }
    if (plci_nl_busy (plci))
diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h
index 1c6945768a35..bf6b01812400 100644
--- a/drivers/isdn/hardware/eicon/pc.h
+++ b/drivers/isdn/hardware/eicon/pc.h
@@ -701,7 +701,7 @@ Byte | 8 7 6 5 4 3 2 1
 #define PROTCAP_FREE12    0x1000  /* not used                            */
 #define PROTCAP_FREE13    0x2000  /* not used                            */
 #define PROTCAP_FREE14    0x4000  /* not used                            */
-#define PROTCAP_EXTENSION 0x8000  /* used for future extentions          */
+#define PROTCAP_EXTENSION 0x8000  /* used for future extensions          */
 /* -----------------------------------------------------------* */
 /* Onhook data transmission ETS30065901 */
 /* Message Type */
diff --git a/drivers/isdn/hardware/eicon/um_idi.c b/drivers/isdn/hardware/eicon/um_idi.c
index 6563db998d06..ac0bdd1f23fa 100644
--- a/drivers/isdn/hardware/eicon/um_idi.c
+++ b/drivers/isdn/hardware/eicon/um_idi.c
@@ -363,7 +363,7 @@ int diva_um_idi_read(void *entity,
                if ((ret = (*cp_fn) (os_handle, dst, data, length)) >= 0) {
                        /*
-                           Acknowledge only if read was successfull
+                           Acknowledge only if read was successful
                         */
                        diva_data_q_ack_segment4read(q);
                }
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 4e3780d78ac7..f6f3c87cc7c2 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -118,7 +118,7 @@
 *      -> See hfc_multi.h for HFC_IO_MODE_* values
 *      By default, the IO mode is pci memory IO (MEMIO).
 *      Some cards require specific IO mode, so it cannot be changed.
- *      It may be usefull to set IO mode to register io (REGIO) to solve
+ *      It may be useful to set IO mode to register io (REGIO) to solve
 *      PCI bridge problems.
 *      If unsure, don't give this parameter.
 *
@@ -903,7 +903,7 @@ vpm_echocan_off(struct hfc_multi *hc, int ch)
 /*
 * Speech Design resync feature
 * NOTE: This is called sometimes outside interrupt handler.
- * We must lock irqsave, so no other interrupt (other card) will occurr!
+ * We must lock irqsave, so no other interrupt (other card) will occur!
 * Also multiple interrupts may nest, so must lock each access (lists, card)!
 */
 static inline void
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 15d323b8be60..b01a7be1300f 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -272,7 +272,7 @@ reset_hfcpci(struct hfc_pci *hc)
         * D- and monitor/CI channel are not enabled
         * STIO1 is used as output for data, B1+B2 from ST->IOM+HFC
         * STIO2 is used as data input, B1+B2 from IOM->ST
-         * ST B-channel send disabled -> continous 1s
+         * ST B-channel send disabled -> continuous 1s
         * The IOM slots are always enabled
         */
        if (test_bit(HFC_CFG_PCM, &hc->cfg)) {
@@ -405,7 +405,7 @@ hfcpci_empty_bfifo(struct bchannel *bch, struct bzfifo *bz,
    u_char *bdata, int count)
 {
        u_char          *ptr, *ptr1, new_f2;
-        int             total, maxlen, new_z2;
+        int             maxlen, new_z2;
        struct zt       *zp;
        if ((bch->debug & DEBUG_HW_BCHANNEL) && !(bch->debug & DEBUG_HW_BFIFO))
@@ -431,7 +431,6 @@ hfcpci_empty_bfifo(struct bchannel *bch, struct bzfifo *bz,
                        printk(KERN_WARNING "HFCPCI: receive out of memory\n");
                        return;
                }
-                total = count;
                count -= 3;
                ptr = skb_put(bch->rx_skb, count);
@@ -968,7 +967,6 @@ static void
 ph_state_nt(struct dchannel *dch)
 {
        struct hfc_pci  *hc = dch->hw;
-        u_char  val;
        if (dch->debug)
                printk(KERN_DEBUG "%s: NT newstate %x\n",
@@ -982,7 +980,7 @@ ph_state_nt(struct dchannel *dch)
                        hc->hw.int_m1 &= ~HFCPCI_INTS_TIMER;
                        Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
                        /* Clear already pending ints */
-                        val = Read_hfc(hc, HFCPCI_INT_S1);
+                        (void) Read_hfc(hc, HFCPCI_INT_S1);
                        Write_hfc(hc, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE);
                        udelay(10);
                        Write_hfc(hc, HFCPCI_STATES, 4);
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 8700474747e8..71a8eb6ef71e 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -118,14 +118,12 @@ static void
 ctrl_complete(struct urb *urb)
 {
        struct hfcsusb *hw = (struct hfcsusb *) urb->context;
-        struct ctrl_buf *buf;
        if (debug & DBG_HFC_CALL_TRACE)
                printk(KERN_DEBUG "%s: %s\n", hw->name, __func__);
        urb->dev = hw->dev;
        if (hw->ctrl_cnt) {
-                buf = &hw->ctrl_buff[hw->ctrl_out_idx];
                hw->ctrl_cnt--; /* decrement actual count */
                if (++hw->ctrl_out_idx >= HFC_CTRL_BUFSIZE)
                        hw->ctrl_out_idx = 0;   /* pointer wrap */
@@ -285,6 +283,7 @@ hfcsusb_ph_info(struct hfcsusb *hw)
        _queue_data(&dch->dev.D, MPH_INFORMATION_IND, MISDN_ID_ANY,
                sizeof(struct ph_info_dch) + dch->dev.nrbchan *
                sizeof(struct ph_info_ch), phi, GFP_ATOMIC);
+        kfree(phi);
 }
 /*
@@ -1726,7 +1725,6 @@ hfcsusb_stop_endpoint(struct hfcsusb *hw, int channel)
 static int
 setup_hfcsusb(struct hfcsusb *hw)
 {
-        int err;
        u_char b;
        if (debug & DBG_HFC_CALL_TRACE)
@@ -1745,7 +1743,7 @@ setup_hfcsusb(struct hfcsusb *hw)
        }
        /* first set the needed config, interface and alternate */
-        err = usb_set_interface(hw->dev, hw->if_used, hw->alt_used);
+        (void) usb_set_interface(hw->dev, hw->if_used, hw->alt_used);
        hw->led_state = 0;
diff --git a/drivers/isdn/hardware/mISDN/ipac.h b/drivers/isdn/hardware/mISDN/ipac.h
index 74a6ccf9065c..8121e046b739 100644
--- a/drivers/isdn/hardware/mISDN/ipac.h
+++ b/drivers/isdn/hardware/mISDN/ipac.h
@@ -29,7 +29,7 @@ struct isac_hw {
        u32                     type;
        u32                     off;            /* offset to isac regs */
        char                    *name;
-        spinlock_t              *hwlock;        /* lock HW acccess */
+        spinlock_t              *hwlock;        /* lock HW access */
        read_reg_func           *read_reg;
        write_reg_func          *write_reg;
        fifo_func               *read_fifo;
@@ -70,7 +70,7 @@ struct ipac_hw {
        struct hscx_hw          hscx[2];
        char                    *name;
        void                    *hw;
-        spinlock_t              *hwlock;        /* lock HW acccess */
+        spinlock_t              *hwlock;        /* lock HW access */
        struct module           *owner;
        u32                     type;
        read_reg_func           *read_reg;
diff --git a/drivers/isdn/hardware/mISDN/isar.h b/drivers/isdn/hardware/mISDN/isar.h
index 4a134acd44d0..9962bdf699c7 100644
--- a/drivers/isdn/hardware/mISDN/isar.h
+++ b/drivers/isdn/hardware/mISDN/isar.h
@@ -44,7 +44,7 @@ struct isar_ch {
 struct isar_hw {
        struct  isar_ch ch[2];
        void            *hw;
-        spinlock_t      *hwlock;        /* lock HW acccess */
+        spinlock_t      *hwlock;        /* lock HW access */
        char            *name;
        struct module   *owner;
        read_reg_func   *read_reg;
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index af25e1f3efd4..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:
@@ -563,7 +563,7 @@ reset_inf(struct inf_hw *hw)
                mdelay(10);
                hw->ipac.isac.adf2 = 0x87;
                hw->ipac.hscx[0].slot = 0x1f;
-                hw->ipac.hscx[0].slot = 0x23;
+                hw->ipac.hscx[1].slot = 0x23;
                break;
        case INF_GAZEL_R753:
                val = inl((u32)hw->cfg.start + GAZEL_CNTRL);
@@ -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/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index 54ae71a907f9..db25b6b2ae39 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -1072,6 +1072,12 @@ nj_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                return -ENODEV;
        }
+        if (pdev->subsystem_vendor == 0xb100 &&
+            pdev->subsystem_device == 0x0003 ) {
+                pr_notice("Netjet: Digium TDM400P not handled yet\n");
+                return -ENODEV;
+        }
        card = kzalloc(sizeof(struct tiger_hw), GFP_ATOMIC);
        if (!card) {
                pr_info("No kmem for Netjet\n");
diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
index ab638b083df9..646368fe41c9 100644
--- a/drivers/isdn/hisax/Makefile
+++ b/drivers/isdn/hisax/Makefile
@@ -4,7 +4,7 @@
 # Define maximum number of cards
-EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
+ccflags-y      := -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
 obj-$(CONFIG_ISDN_DRV_HISAX)            += hisax.o
 obj-$(CONFIG_HISAX_SEDLBAUER_CS)        += sedlbauer_cs.o
diff --git a/drivers/isdn/hisax/arcofi.c b/drivers/isdn/hisax/arcofi.c
index 85a8fd8dd0b7..21cbbe1d5563 100644
--- a/drivers/isdn/hisax/arcofi.c
+++ b/drivers/isdn/hisax/arcofi.c
@@ -30,8 +30,6 @@ add_arcofi_timer(struct IsdnCardState *cs) {
 static void
 send_arcofi(struct IsdnCardState *cs) {
-        u_char val;
-        
        add_arcofi_timer(cs);
        cs->dc.isac.mon_txp = 0;
        cs->dc.isac.mon_txc = cs->dc.isac.arcofi_list->len;
@@ -45,7 +43,7 @@ send_arcofi(struct IsdnCardState *cs) {
        cs->dc.isac.mocr &= 0x0f;
        cs->dc.isac.mocr |= 0xa0;
        cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr);
-        val = cs->readisac(cs, ISAC_MOSR);
+        (void) cs->readisac(cs, ISAC_MOSR);
        cs->writeisac(cs, ISAC_MOX1, cs->dc.isac.mon_tx[cs->dc.isac.mon_txp++]);
        cs->dc.isac.mocr |= 0x10;
        cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr);
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/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 94263c22b874..8f0ad2a52e87 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -20,7 +20,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #include "hisax_cfg.h"
@@ -40,67 +39,22 @@ module_param(isdnprot, int, 0);
 /*====================================================================*/
-/*
-   The event() function is this driver's Card Services event handler.
-   It will be called by Card Services when an appropriate card status
-   event is received.  The config() and release() entry points are
-   used to configure or release a socket, in response to card insertion
-   and ejection events.  They are invoked from the skeleton event
-   handler.
-*/
 static int avma1cs_config(struct pcmcia_device *link) __devinit ;
 static void avma1cs_release(struct pcmcia_device *link);
-/*
-   The attach() and detach() entry points are used to create and destroy
-   "instances" of the driver, where each instance represents everything
-   needed to manage one actual PCMCIA card.
-*/
 static void avma1cs_detach(struct pcmcia_device *p_dev) __devexit ;
-/*======================================================================
-    avma1cs_attach() creates an "instance" of the driver, allocating
-    local data structures for one device.  The device is registered
-    with Card Services.
-    The dev_link structure is initialized, but we don't actually
-    configure the card at this point -- we wait until we receive a
-    card insertion event.
-    
-======================================================================*/
 static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
 {
    dev_dbg(&p_dev->dev, "avma1cs_attach()\n");
-    /* The io structure describes IO port mapping */
-    p_dev->resource[0]->end = 16;
-    p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-    p_dev->resource[1]->end = 16;
-    p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
    /* General socket configuration */
-    p_dev->conf.Attributes = CONF_ENABLE_IRQ;
+    p_dev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
-    p_dev->conf.IntType = INT_MEMORY_AND_IO;
+    p_dev->config_index = 1;
-    p_dev->conf.ConfigIndex = 1;
+    p_dev->config_regs = PRESENT_OPTION;
-    p_dev->conf.Present = PRESENT_OPTION;
    return avma1cs_config(p_dev);
 } /* avma1cs_attach */
-/*======================================================================
-    This deletes a driver "instance".  The device is de-registered
-    with Card Services.  If it has been released, all local data
-    structures are freed.  Otherwise, the structures will be freed
-    when the device is released.
-======================================================================*/
 static void __devexit avma1cs_detach(struct pcmcia_device *link)
 {
        dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link);
@@ -108,26 +62,13 @@ static void __devexit avma1cs_detach(struct pcmcia_device *link)
        kfree(link->priv);
 } /* avma1cs_detach */
-/*======================================================================
+static int avma1cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
-    avma1cs_config() is scheduled to run after a CARD_INSERTION event
-    is received, to configure the PCMCIA socket, and to make the
-    ethernet device available to the system.
-    
-======================================================================*/
-static int avma1cs_configcheck(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cf,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
 {
-        if (cf->io.nwin <= 0)
+        p_dev->resource[0]->end = 16;
-                return -ENODEV;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->resource[0]->start = cf->io.win[0].base;
-        p_dev->resource[0]->end = cf->io.win[0].len;
        p_dev->io_lines = 5;
        return pcmcia_request_io(p_dev);
 }
@@ -161,7 +102,7 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
        /*
         * configure the PCMCIA socket
         */
-        i = pcmcia_request_configuration(link, &link->conf);
+        i = pcmcia_enable_device(link);
        if (i != 0) {
            pcmcia_disable_device(link);
            break;
@@ -175,9 +116,6 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
        return -ENODEV;
    }
-    printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
-                (unsigned int) link->resource[0]->start, link->irq);
    icard.para[0] = link->irq;
    icard.para[1] = link->resource[0]->start;
    icard.protocol = isdnprot;
@@ -196,14 +134,6 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
    return 0;
 } /* avma1cs_config */
-/*======================================================================
-    After a card is removed, avma1cs_release() will unregister the net
-    device, and release the PCMCIA configuration.  If the device is
-    still open, this will be postponed until it is closed.
-    
-======================================================================*/
 static void avma1cs_release(struct pcmcia_device *link)
 {
        unsigned long minor = (unsigned long) link->priv;
@@ -216,8 +146,7 @@ static void avma1cs_release(struct pcmcia_device *link)
        pcmcia_disable_device(link);
 } /* avma1cs_release */
+static const struct pcmcia_device_id avma1cs_ids[] = {
-static struct pcmcia_device_id avma1cs_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb),
        PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b),
        PCMCIA_DEVICE_NULL
@@ -226,19 +155,15 @@ MODULE_DEVICE_TABLE(pcmcia, avma1cs_ids);
 static struct pcmcia_driver avma1cs_driver = {
        .owner          = THIS_MODULE,
-        .drv            = {
+        .name           = "avma1_cs",
-                .name   = "avma1_cs",
-        },
        .probe          = avma1cs_probe,
        .remove         = __devexit_p(avma1cs_detach),
        .id_table       = avma1cs_ids,
 };
-/*====================================================================*/
 static int __init init_avma1_cs(void)
 {
-        return(pcmcia_register_driver(&avma1cs_driver));
+        return pcmcia_register_driver(&avma1cs_driver);
 }
 static void __exit exit_avma1_cs(void)
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 6f9afcd5ca4e..c110f8679bab 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -801,6 +801,16 @@ static void closecard(int cardnr)
        ll_unload(csta);
 }
+static irqreturn_t card_irq(int intno, void *dev_id)
+{
+        struct IsdnCardState *cs = dev_id;
+        irqreturn_t ret = cs->irq_func(intno, cs);
+        if (ret == IRQ_HANDLED)
+                cs->irq_cnt++;
+        return ret;
+}
 static int init_card(struct IsdnCardState *cs)
 {
        int     irq_cnt, cnt = 3, ret;
@@ -809,10 +819,10 @@ static int init_card(struct IsdnCardState *cs)
                ret = cs->cardmsg(cs, CARD_INIT, NULL);
                return(ret);
        }
-        irq_cnt = kstat_irqs(cs->irq);
+        irq_cnt = cs->irq_cnt = 0;
        printk(KERN_INFO "%s: IRQ %d count %d\n", CardType[cs->typ],
               cs->irq, irq_cnt);
-        if (request_irq(cs->irq, cs->irq_func, cs->irq_flags, "HiSax", cs)) {
+        if (request_irq(cs->irq, card_irq, cs->irq_flags, "HiSax", cs)) {
                printk(KERN_WARNING "HiSax: couldn't get interrupt %d\n",
                       cs->irq);
                return 1;
@@ -822,8 +832,8 @@ static int init_card(struct IsdnCardState *cs)
                /* Timeout 10ms */
                msleep(10);
                printk(KERN_INFO "%s: IRQ %d count %d\n",
-                       CardType[cs->typ], cs->irq, kstat_irqs(cs->irq));
+                       CardType[cs->typ], cs->irq, cs->irq_cnt);
-                if (kstat_irqs(cs->irq) == irq_cnt) {
+                if (cs->irq_cnt == irq_cnt) {
                        printk(KERN_WARNING
                               "%s: IRQ(%d) getting no interrupts during init %d\n",
                               CardType[cs->typ], cs->irq, 4 - cnt);
@@ -1907,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/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index b3c08aaf41c4..f0b6c0ef99bb 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -46,7 +46,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -64,26 +63,8 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int protocol = 2;        /* EURO-ISDN Default */
 module_param(protocol, int, 0);
-/*====================================================================*/
-/*
-   The event() function is this driver's Card Services event handler.
-   It will be called by Card Services when an appropriate card status
-   event is received.  The config() and release() entry points are
-   used to configure or release a socket, in response to card insertion
-   and ejection events.  They are invoked from the elsa_cs event
-   handler.
-*/
 static int elsa_cs_config(struct pcmcia_device *link) __devinit ;
 static void elsa_cs_release(struct pcmcia_device *link);
-/*
-   The attach() and detach() entry points are used to create and destroy
-   "instances" of the driver, where each instance represents everything
-   needed to manage one actual PCMCIA card.
-*/
 static void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit;
 typedef struct local_info_t {
@@ -92,18 +73,6 @@ typedef struct local_info_t {
    int                 cardnr;
 } local_info_t;
-/*======================================================================
-    elsa_cs_attach() creates an "instance" of the driver, allocatingx
-    local data structures for one device.  The device is registered
-    with Card Services.
-    The dev_link structure is initialized, but we don't actually
-    configure the card at this point -- we wait until we receive a
-    card insertion event.
-======================================================================*/
 static int __devinit elsa_cs_probe(struct pcmcia_device *link)
 {
    local_info_t *local;
@@ -119,31 +88,9 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
    local->cardnr = -1;
-    /*
-      General socket configuration defaults can go here.  In this
-      client, we assume very little, and rely on the CIS for almost
-      everything.  In most clients, many details (i.e., number, sizes,
-      and attributes of IO windows) are fixed by the nature of the
-      device, and can be hard-wired here.
-    */
-    link->resource[0]->end = 8;
-    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-    link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
    return elsa_cs_config(link);
 } /* elsa_cs_attach */
-/*======================================================================
-    This deletes a driver "instance".  The device is de-registered
-    with Card Services.  If it has been released, all local data
-    structures are freed.  Otherwise, the structures will be freed
-    when the device is released.
-======================================================================*/
 static void __devexit elsa_cs_detach(struct pcmcia_device *link)
 {
        local_info_t *info = link->priv;
@@ -156,27 +103,17 @@ static void __devexit elsa_cs_detach(struct pcmcia_device *link)
        kfree(info);
 } /* elsa_cs_detach */
-/*======================================================================
+static int elsa_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
-    elsa_cs_config() is scheduled to run after a CARD_INSERTION event
-    is received, to configure the PCMCIA socket, and to make the
-    device available to the system.
-======================================================================*/
-static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cf,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
 {
        int j;
        p_dev->io_lines = 3;
+        p_dev->resource[0]->end = 8;
+        p_dev->resource[0]->flags &= IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        if ((cf->io.nwin > 0) && cf->io.win[0].base) {
+        if ((p_dev->resource[0]->end) && p_dev->resource[0]->start) {
                printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
-                p_dev->resource[0]->start = cf->io.win[0].base;
                if (!pcmcia_request_io(p_dev))
                        return 0;
        } else {
@@ -192,12 +129,12 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
 static int __devinit elsa_cs_config(struct pcmcia_device *link)
 {
-    local_info_t *dev;
    int i;
    IsdnCard_t icard;
    dev_dbg(&link->dev, "elsa_config(0x%p)\n", link);
-    dev = link->priv;
+    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
    i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL);
    if (i != 0)
@@ -206,21 +143,10 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
    if (!link->irq)
        goto failed;
-    i = pcmcia_request_configuration(link, &link->conf);
+    i = pcmcia_enable_device(link);
    if (i != 0)
        goto failed;
-    /* Finally, report what we've done */
-    dev_info(&link->dev, "index 0x%02x: ",
-            link->conf.ConfigIndex);
-    if (link->conf.Attributes & CONF_ENABLE_IRQ)
-        printk(", irq %d", link->irq);
-    if (link->resource[0])
-        printk(" & %pR", link->resource[0]);
-    if (link->resource[1])
-        printk(" & %pR", link->resource[1]);
-    printk("\n");
    icard.para[0] = link->irq;
    icard.para[1] = link->resource[0]->start;
    icard.protocol = protocol;
@@ -240,14 +166,6 @@ failed:
    return -ENODEV;
 } /* elsa_cs_config */
-/*======================================================================
-    After a card is removed, elsa_cs_release() will unregister the net
-    device, and release the PCMCIA configuration.  If the device is
-    still open, this will be postponed until it is closed.
-======================================================================*/
 static void elsa_cs_release(struct pcmcia_device *link)
 {
    local_info_t *local = link->priv;
@@ -282,7 +200,7 @@ static int elsa_resume(struct pcmcia_device *link)
        return 0;
 }
-static struct pcmcia_device_id elsa_ids[] = {
+static const struct pcmcia_device_id elsa_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("ELSA AG (Aachen, Germany)", "MicroLink ISDN/MC ", 0x983de2c4, 0x333ba257),
        PCMCIA_DEVICE_PROD_ID12("ELSA GmbH, Aachen", "MicroLink ISDN/MC ", 0x639e5718, 0x333ba257),
        PCMCIA_DEVICE_NULL
@@ -291,9 +209,7 @@ MODULE_DEVICE_TABLE(pcmcia, elsa_ids);
 static struct pcmcia_driver elsa_cs_driver = {
        .owner          = THIS_MODULE,
-        .drv            = {
+        .name           = "elsa_cs",
-                .name   = "elsa_cs",
-        },
        .probe          = elsa_cs_probe,
        .remove         = __devexit_p(elsa_cs_detach),
        .id_table       = elsa_ids,
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
index cbda3790a10d..3fa9f6171095 100644
--- a/drivers/isdn/hisax/elsa_ser.c
+++ b/drivers/isdn/hisax/elsa_ser.c
@@ -109,11 +109,10 @@ static void change_speed(struct IsdnCardState *cs, int baud)
 {
        int     quot = 0, baud_base;
        unsigned cval, fcr = 0;
-        int     bits;
        /* byte size and parity */
-        cval = 0x03; bits = 10;
+        cval = 0x03;
        /* Determine divisor based on baud rate */
        baud_base = BASE_BAUD;
        quot = baud_base / baud;
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..0cb0546ead88 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -146,7 +146,7 @@ reset_hfcpci(struct IsdnCardState *cs)
        /* D- and monitor/CI channel are not enabled */
        /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */
        /* STIO2 is used as data input, B1+B2 from IOM->ST */
-        /* ST B-channel send disabled -> continous 1s */
+        /* ST B-channel send disabled -> continuous 1s */
        /* The IOM slots are always enabled */
        cs->hw.hfcpci.conn = 0x36;      /* set data flow directions */
        Write_hfc(cs, HFCPCI_CONNECT, cs->hw.hfcpci.conn);
@@ -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 be5faf4aa868..156d7c63d944 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)
@@ -234,13 +234,14 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max)
          count++;
          if (count > trans_max) 
            count = trans_max; /* limit length */
-            if ((skb = dev_alloc_skb(count))) {
+          skb = dev_alloc_skb(count);
-              dst = skb_put(skb, count);
+          if (skb) {
-              while (count--) 
+            dst = skb_put(skb, count);
+            while (count--)
                *dst++ = Read_hfc(cs, HFCSX_FIF_DRD);
-              return(skb);
+            return skb;
-            }
+          } else
-            else return(NULL); /* no memory */
+                return NULL; /* no memory */
        }
        do {
@@ -264,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)) {
@@ -398,7 +399,7 @@ reset_hfcsx(struct IsdnCardState *cs)
        /* D- and monitor/CI channel are not enabled */
        /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */
        /* STIO2 is used as data input, B1+B2 from IOM->ST */
-        /* ST B-channel send disabled -> continous 1s */
+        /* ST B-channel send disabled -> continuous 1s */
        /* The IOM slots are always enabled */
        cs->hw.hfcsx.conn = 0x36;       /* set data flow directions */
        Write_hfc(cs, HFCSX_CONNECT, cs->hw.hfcsx.conn);
@@ -985,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/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index ed9527aa5f2c..f407de0e006d 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -258,11 +258,9 @@ static void
 ctrl_complete(struct urb *urb)
 {
        hfcusb_data *hfc = (hfcusb_data *) urb->context;
-        ctrl_buft *buf;
        urb->dev = hfc->dev;
        if (hfc->ctrl_cnt) {
-                buf = &hfc->ctrl_buff[hfc->ctrl_out_idx];
                hfc->ctrl_cnt--;        /* decrement actual count */
                if (++hfc->ctrl_out_idx >= HFC_CTRL_BUFSIZE)
                        hfc->ctrl_out_idx = 0;  /* pointer wrap */
@@ -1097,7 +1095,7 @@ static int
 hfc_usb_init(hfcusb_data * hfc)
 {
        usb_fifo *fifo;
-        int i, err;
+        int i;
        u_char b;
        struct hisax_b_if *p_b_if[2];
@@ -1112,7 +1110,7 @@ hfc_usb_init(hfcusb_data * hfc)
        }
        /* first set the needed config, interface and alternate */
-        err = usb_set_interface(hfc->dev, hfc->if_used, hfc->alt_used);
+        usb_set_interface(hfc->dev, hfc->if_used, hfc->alt_used);
        /* do Chip reset */
        write_usb(hfc, HFCUSB_CIRM, 8);
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index e79f56568d30..2f581c0b4693 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -126,7 +126,7 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
 /*
- * device dependant information to support different
+ * device dependent information to support different
 * ISDN Ta's using the HFC-S USB chip
 */
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 832a87855ffb..de1c669c7b13 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -959,6 +959,7 @@ struct IsdnCardState {
        u_long          event;
        struct work_struct tqueue;
        struct timer_list dbusytimer;
+        unsigned int    irq_cnt;
 #ifdef ERROR_STATISTIC
        int             err_crc;
        int             err_tx;
@@ -1285,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..690840444184 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -96,7 +96,7 @@ dch_l2l1(struct PStack *st, int pr, void *arg)
 {
        struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware;
        struct sk_buff *skb = arg;
-  u_char cda1_cr, cda2_cr;
+        u_char cda1_cr;
        switch (pr) {
                case (PH_DATA |REQUEST):
@@ -163,7 +163,7 @@ dch_l2l1(struct PStack *st, int pr, void *arg)
      cs->writeisac(cs, IPACX_CDA_TSDP10, 0x80); // Timeslot 0 is B1
      cs->writeisac(cs, IPACX_CDA_TSDP11, 0x81); // Timeslot 0 is B1
      cda1_cr = cs->readisac(cs, IPACX_CDA1_CR);
-      cda2_cr = cs->readisac(cs, IPACX_CDA2_CR);
+      (void) cs->readisac(cs, IPACX_CDA2_CR);
                        if ((long)arg &1) { // loop B1
        cs->writeisac(cs, IPACX_CDA1_CR, cda1_cr |0x0a); 
      }
@@ -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 40b914bded8c..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)))) {
+        cfu_ret = copy_from_user(&size, p, sizeof(int));
-                printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret);
+        if (cfu_ret) {
-                return 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)) {
@@ -1427,8 +1428,8 @@ modeisar(struct BCState *bcs, int mode, int bc)
                                        &bcs->hw.isar.reg->Flags))
                                        bcs->hw.isar.dpath = 1;
                                else {
-                                        printk(KERN_WARNING"isar modeisar analog funktions only with DP1\n");
+                                        printk(KERN_WARNING"isar modeisar analog functions only with DP1\n");
-                                        debugl1(cs, "isar modeisar analog funktions only with DP1");
+                                        debugl1(cs, "isar modeisar analog functions only with DP1");
                                        return(1);
                                }
                                break;
@@ -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/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index 0858791978d8..cfff0c41d298 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -1247,10 +1247,10 @@ static void
 l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
-        struct sk_buff *skb, *oskb;
+        struct sk_buff *skb;
        struct Layer2 *l2 = &st->l2;
        u_char header[MAX_HEADER_LEN];
-        int i;
+        int i, hdr_space_needed;
        int unsigned p1;
        u_long flags;
@@ -1261,6 +1261,16 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
        if (!skb)
                return;
+        hdr_space_needed = l2headersize(l2, 0);
+        if (hdr_space_needed > skb_headroom(skb)) {
+                struct sk_buff *orig_skb = skb;
+                skb = skb_realloc_headroom(skb, hdr_space_needed);
+                if (!skb) {
+                        dev_kfree_skb(orig_skb);
+                        return;
+                }
+        }
        spin_lock_irqsave(&l2->lock, flags);
        if(test_bit(FLG_MOD128, &l2->flag))
                p1 = (l2->vs - l2->va) % 128;
@@ -1285,19 +1295,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                l2->vs = (l2->vs + 1) % 8;
        }
        spin_unlock_irqrestore(&l2->lock, flags);
-        p1 = skb->data - skb->head;
+        memcpy(skb_push(skb, i), header, i);
-        if (p1 >= i)
-                memcpy(skb_push(skb, i), header, i);
-        else {
-                printk(KERN_WARNING
-                "isdl2 pull_iqueue skb header(%d/%d) too short\n", i, p1);
-                oskb = skb;
-                skb = alloc_skb(oskb->len + i, GFP_ATOMIC);
-                memcpy(skb_put(skb, i), header, i);
-                skb_copy_from_linear_data(oskb,
-                                          skb_put(skb, oskb->len), oskb->len);
-                dev_kfree_skb(oskb);
-        }
        st->l2.l2l1(st, PH_PULL | INDICATION, skb);
        test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
        if (!test_and_set_bit(FLG_T200_RUN, &st->l2.flag)) {
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/jade.c b/drivers/isdn/hisax/jade.c
index ea8f840871d0..a06cea09158b 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -23,10 +23,9 @@
 int
 JadeVersion(struct IsdnCardState *cs, char *s)
 {
-    int ver,i;
+    int ver;
    int to = 50;
    cs->BC_Write_Reg(cs, -1, 0x50, 0x19);
-    i=0;
    while (to) {
        udelay(1);
        ver = cs->BC_Read_Reg(cs, -1, 0x60);
diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
index b0554f80bfb3..ee4dae1382e0 100644
--- a/drivers/isdn/hisax/l3_1tr6.c
+++ b/drivers/isdn/hisax/l3_1tr6.c
@@ -164,11 +164,9 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg)
        char tmp[80];
        struct sk_buff *skb = arg;
-        p = skb->data;
        /* Channel Identification */
-        p = skb->data;
+        p = findie(skb->data, skb->len, WE0_chanID, 0);
-        if ((p = findie(p, skb->len, WE0_chanID, 0))) {
+        if (p) {
                if (p[1] != 1) {
                        l3_1tr6_error(pc, "setup wrong chanID len", skb);
                        return;
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
index cc6ee2d39880..b0d9ab1f21c0 100644
--- a/drivers/isdn/hisax/l3dss1.c
+++ b/drivers/isdn/hisax/l3dss1.c
@@ -1595,7 +1595,7 @@ l3dss1_setup(struct l3_process *pc, u_char pr, void *arg)
         * Bearer Capabilities
         */
        p = skb->data;
-        /* only the first occurence 'll be detected ! */
+        /* only the first occurrence 'll be detected ! */
        if ((p = findie(p, skb->len, 0x04, 0))) {
                if ((p[1] < 2) || (p[1] > 11))
                        err = 1;
@@ -2161,7 +2161,7 @@ static void l3dss1_redir_req_early(struct l3_process *pc, u_char pr, void *arg)
 /***********************************************/
 /* handle special commands for this protocol.  */
-/* Examples are call independant services like */
+/* Examples are call independent services like */
 /* remote operations with dummy  callref.      */
 /***********************************************/
 static int l3dss1_cmd_global(struct PStack *st, isdn_ctrl *ic)
@@ -2943,7 +2943,7 @@ global_handler(struct PStack *st, int mt, struct sk_buff *skb)
 static void
 dss1up(struct PStack *st, int pr, void *arg)
 {
-        int i, mt, cr, cause, callState;
+        int i, mt, cr, callState;
        char *ptr;
        u_char *p;
        struct sk_buff *skb = arg;
@@ -3034,12 +3034,10 @@ dss1up(struct PStack *st, int pr, void *arg)
                                return;
                        }
                } else if (mt == MT_STATUS) {
-                        cause = 0;
                        if ((ptr = findie(skb->data, skb->len, IE_CAUSE, 0)) != NULL) {
                                ptr++;
                                if (*ptr++ == 2)
                                        ptr++;
-                                cause = *ptr & 0x7f;
                        }
                        callState = 0;
                        if ((ptr = findie(skb->data, skb->len, IE_CALL_STATE, 0)) != NULL) {
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c
index f9584491fe8e..092dcbb39d94 100644
--- a/drivers/isdn/hisax/l3ni1.c
+++ b/drivers/isdn/hisax/l3ni1.c
@@ -1449,7 +1449,7 @@ l3ni1_setup(struct l3_process *pc, u_char pr, void *arg)
         * Bearer Capabilities
         */
        p = skb->data;
-        /* only the first occurence 'll be detected ! */
+        /* only the first occurrence 'll be detected ! */
        if ((p = findie(p, skb->len, 0x04, 0))) {
                if ((p[1] < 2) || (p[1] > 11))
                        err = 1;
@@ -2017,7 +2017,7 @@ static void l3ni1_redir_req_early(struct l3_process *pc, u_char pr, void *arg)
 /***********************************************/
 /* handle special commands for this protocol.  */
-/* Examples are call independant services like */
+/* Examples are call independent services like */
 /* remote operations with dummy  callref.      */
 /***********************************************/
 static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic)
@@ -2883,7 +2883,7 @@ global_handler(struct PStack *st, int mt, struct sk_buff *skb)
 static void
 ni1up(struct PStack *st, int pr, void *arg)
 {
-        int i, mt, cr, cause, callState;
+        int i, mt, cr, callState;
        char *ptr;
        u_char *p;
        struct sk_buff *skb = arg;
@@ -2986,12 +2986,10 @@ ni1up(struct PStack *st, int pr, void *arg)
                                return;
                        }
                } else if (mt == MT_STATUS) {
-                        cause = 0;
                        if ((ptr = findie(skb->data, skb->len, IE_CAUSE, 0)) != NULL) {
                                ptr++;
                                if (*ptr++ == 2)
                                        ptr++;
-                                cause = *ptr & 0x7f;
                        }
                        callState = 0;
                        if ((ptr = findie(skb->data, skb->len, IE_CALL_STATE, 0)) != NULL) {
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/nj_s.c b/drivers/isdn/hisax/nj_s.c
index 2344e7b33448..a1b89524b505 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -167,7 +167,7 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
                return(0);
        }
        /* the TJ300 and TJ320 must be detected, the IRQ handling is different
-         * unfortunatly the chips use the same device ID, but the TJ320 has
+         * unfortunately the chips use the same device ID, but the TJ320 has
         * the bit20 in status PCI cfg register set
         */
        pci_read_config_dword(dev_netjet, 0x04, &cfg);
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index a024192b672a..06473f81f039 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -46,7 +46,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -64,26 +63,9 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int protocol = 2;        /* EURO-ISDN Default */
 module_param(protocol, int, 0);
-/*====================================================================*/
-/*
-   The event() function is this driver's Card Services event handler.
-   It will be called by Card Services when an appropriate card status
-   event is received.  The config() and release() entry points are
-   used to configure or release a socket, in response to card
-   insertion and ejection events.  They are invoked from the sedlbauer
-   event handler. 
-*/
 static int sedlbauer_config(struct pcmcia_device *link) __devinit ;
 static void sedlbauer_release(struct pcmcia_device *link);
-/*
-   The attach() and detach() entry points are used to create and destroy
-   "instances" of the driver, where each instance represents everything
-   needed to manage one actual PCMCIA card.
-*/
 static void sedlbauer_detach(struct pcmcia_device *p_dev) __devexit;
 typedef struct local_info_t {
@@ -92,18 +74,6 @@ typedef struct local_info_t {
    int                 cardnr;
 } local_info_t;
-/*======================================================================
-    sedlbauer_attach() creates an "instance" of the driver, allocating
-    local data structures for one device.  The device is registered
-    with Card Services.
-    The dev_link structure is initialized, but we don't actually
-    configure the card at this point -- we wait until we receive a
-    card insertion event.
-    
-======================================================================*/
 static int __devinit sedlbauer_probe(struct pcmcia_device *link)
 {
    local_info_t *local;
@@ -118,35 +88,9 @@ static int __devinit sedlbauer_probe(struct pcmcia_device *link)
    local->p_dev = link;
    link->priv = local;
-    /*
-      General socket configuration defaults can go here.  In this
-      client, we assume very little, and rely on the CIS for almost
-      everything.  In most clients, many details (i.e., number, sizes,
-      and attributes of IO windows) are fixed by the nature of the
-      device, and can be hard-wired here.
-    */
-    /* from old sedl_cs 
-    */
-    /* The io structure describes IO port mapping */
-    link->resource[0]->end = 8;
-    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-    link->conf.Attributes = 0;
-    link->conf.IntType = INT_MEMORY_AND_IO;
    return sedlbauer_config(link);
 } /* sedlbauer_attach */
-/*======================================================================
-    This deletes a driver "instance".  The device is de-registered
-    with Card Services.  If it has been released, all local data
-    structures are freed.  Otherwise, the structures will be freed
-    when the device is released.
-======================================================================*/
 static void __devexit sedlbauer_detach(struct pcmcia_device *link)
 {
        dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link);
@@ -158,70 +102,15 @@ static void __devexit sedlbauer_detach(struct pcmcia_device *link)
        kfree(link->priv);
 } /* sedlbauer_detach */
-/*======================================================================
+static int sedlbauer_config_check(struct pcmcia_device *p_dev, void *priv_data)
-    sedlbauer_config() is scheduled to run after a CARD_INSERTION event
-    is received, to configure the PCMCIA socket, and to make the
-    device available to the system.
-    
-======================================================================*/
-static int sedlbauer_config_check(struct pcmcia_device *p_dev,
-                                  cistpl_cftable_entry_t *cfg,
-                                  cistpl_cftable_entry_t *dflt,
-                                  unsigned int vcc,
-                                  void *priv_data)
 {
-        if (cfg->index == 0)
+        if (p_dev->config_index == 0)
-                return -ENODEV;
+                return -EINVAL;
-        /* Does this card need audio output? */
-        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
-                p_dev->conf.Status = CCSR_AUDIO_ENA;
-        }
-        /* Use power settings for Vcc and Vpp if present */
+        p_dev->io_lines = 3;
-        /*  Note that the CIS values need to be rescaled */
+        return pcmcia_request_io(p_dev);
-        if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
-                        return -ENODEV;
-        } else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
-                        return -ENODEV;
-        }
-        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
-        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
-        /* IO window settings */
-        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
-        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
-                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->resource[0]->start = io->win[0].base;
-                p_dev->resource[0]->end = io->win[0].len;
-                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                p_dev->resource[0]->flags |=
-                                        pcmcia_io_cfg_data_width(io->flags);
-                if (io->nwin > 1) {
-                        p_dev->resource[1]->flags = p_dev->resource[0]->flags;
-                        p_dev->resource[1]->start = io->win[1].base;
-                        p_dev->resource[1]->end = io->win[1].len;
-                }
-                /* This reserves IO space but doesn't actually enable it */
-                p_dev->io_lines = 3;
-                if (pcmcia_request_io(p_dev) != 0)
-                        return -ENODEV;
-        }
-        return 0;
 }
 static int __devinit sedlbauer_config(struct pcmcia_device *link)
 {
    int ret;
@@ -229,44 +118,17 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
    dev_dbg(&link->dev, "sedlbauer_config(0x%p)\n", link);
-    /*
+    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_CHECK_VCC |
-      In this loop, we scan the CIS for configuration table entries,
+            CONF_AUTO_SET_VPP | CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;
-      each of which describes a valid card configuration, including
-      voltage, IO window, memory window, and interrupt settings.
-      We make no assumptions about the card to be configured: we use
-      just the information available in the CIS.  In an ideal world,
-      this would work for any PCMCIA card, but it requires a complete
-      and accurate CIS.  In practice, a driver usually "knows" most of
-      these things without consulting the CIS, and most client drivers
-      will only use the CIS to fill in implementation-defined details.
-    */
    ret = pcmcia_loop_config(link, sedlbauer_config_check, NULL);
    if (ret)
            goto failed;
-    /*
+    ret = pcmcia_enable_device(link);
-       This actually configures the PCMCIA socket -- setting up
-       the I/O windows and the interrupt mapping, and putting the
-       card and host interface into "Memory and IO" mode.
-    */
-    ret = pcmcia_request_configuration(link, &link->conf);
    if (ret)
            goto failed;
-    /* Finally, report what we've done */
-    dev_info(&link->dev, "index 0x%02x:",
-           link->conf.ConfigIndex);
-    if (link->conf.Vpp)
-        printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
-    if (link->conf.Attributes & CONF_ENABLE_IRQ)
-        printk(", irq %d", link->irq);
-    if (link->resource[0])
-        printk(" & %pR", link->resource[0]);
-    if (link->resource[1])
-        printk(" & %pR", link->resource[1]);
-    printk("\n");
    icard.para[0] = link->irq;
    icard.para[1] = link->resource[0]->start;
    icard.protocol = protocol;
@@ -290,14 +152,6 @@ failed:
 } /* sedlbauer_config */
-/*======================================================================
-    After a card is removed, sedlbauer_release() will unregister the
-    device, and release the PCMCIA configuration.  If the device is
-    still open, this will be postponed until it is closed.
-    
-======================================================================*/
 static void sedlbauer_release(struct pcmcia_device *link)
 {
    local_info_t *local = link->priv;
@@ -332,7 +186,7 @@ static int sedlbauer_resume(struct pcmcia_device *link)
 }
-static struct pcmcia_device_id sedlbauer_ids[] = {
+static const struct pcmcia_device_id sedlbauer_ids[] = {
        PCMCIA_DEVICE_PROD_ID123("SEDLBAUER", "speed star II", "V 3.1", 0x81fb79f5, 0xf3612e1d, 0x6b95c78a),
        PCMCIA_DEVICE_PROD_ID123("SEDLBAUER", "ISDN-Adapter", "4D67", 0x81fb79f5, 0xe4e9bc12, 0x397b7e90),
        PCMCIA_DEVICE_PROD_ID123("SEDLBAUER", "ISDN-Adapter", "4D98", 0x81fb79f5, 0xe4e9bc12, 0x2e5c7fce),
@@ -346,9 +200,7 @@ MODULE_DEVICE_TABLE(pcmcia, sedlbauer_ids);
 static struct pcmcia_driver sedlbauer_driver = {
        .owner          = THIS_MODULE,
-        .drv            = {
+        .name           = "sedlbauer_cs",
-                .name   = "sedlbauer_cs",
-        },
        .probe          = sedlbauer_probe,
        .remove         = __devexit_p(sedlbauer_detach),
        .id_table       = sedlbauer_ids,
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 64f78a8c28c5..b9054cb7a0da 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -377,7 +377,6 @@ struct st5481_bcs {
 };
 struct st5481_adapter {
-        struct list_head list;
        int number_of_leds;
        struct usb_device *usb_dev;
        struct hisax_d_if hisax_d_if;
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index e56e5af889b6..ed4bc564dc63 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -124,7 +124,7 @@ static void usb_b_out(struct st5481_bcs *bcs,int buf_nr)
 }
 /*
- * Start transfering (flags or data) on the B channel, since
+ * Start transferring (flags or data) on the B channel, since
 * FIFO counters has been set to a non-zero value.
 */
 static void st5481B_start_xfer(void *context)
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/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c
index 13751237bfcd..9f7fd18ff773 100644
--- a/drivers/isdn/hisax/st5481_init.c
+++ b/drivers/isdn/hisax/st5481_init.c
@@ -46,8 +46,6 @@ module_param(debug, int, 0);
 #endif
 int st5481_debug;
-static LIST_HEAD(adapter_list);
 /* ======================================================================
 * registration/deregistration with the USB layer
 */
@@ -86,7 +84,6 @@ static int probe_st5481(struct usb_interface *intf,
                adapter->bcs[i].b_if.ifc.priv = &adapter->bcs[i];
                adapter->bcs[i].b_if.ifc.l2l1 = st5481_b_l2l1;
        }
-        list_add(&adapter->list, &adapter_list);
        retval = st5481_setup_usb(adapter);
        if (retval < 0)
@@ -125,6 +122,7 @@ static int probe_st5481(struct usb_interface *intf,
 err_usb:
        st5481_release_usb(adapter);
 err:
+        kfree(adapter);
        return -EIO;
 }
@@ -142,8 +140,6 @@ static void disconnect_st5481(struct usb_interface *intf)
        if (!adapter)
                return;
        
-        list_del(&adapter->list);
        st5481_stop(adapter);
        st5481_release_b(&adapter->bcs[1]);
        st5481_release_b(&adapter->bcs[0]);
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 10d41c5d73ed..159e8fa00fd6 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -470,7 +470,7 @@ void st5481_release_isocpipes(struct urb* urb[2])
 /*
 * Decode frames received on the B/D channel.
- * Note that this function will be called continously
+ * Note that this function will be called continuously
 * with 64Kbit/s / 16Kbit/s of data and hence it will be 
 * called 50 times per second with 20 ISOC descriptors. 
 * Called at interrupt.
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 7296102ca255..161a1938552e 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -9,7 +9,7 @@
    Also inspired by ELSA PCMCIA driver 
    by Klaus Lichtenwalder <Lichtenwalder@ACM.org>
    
-    Extentions to new hisax_pcmcia by Karsten Keil
+    Extensions to new hisax_pcmcia by Karsten Keil
    minor changes to be compatible with kernel 2.4.x
    by Jan.Schubert@GMX.li
@@ -27,7 +27,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -45,26 +44,8 @@ MODULE_LICENSE("GPL");
 static int protocol = 2;        /* EURO-ISDN Default */
 module_param(protocol, int, 0);
-/*====================================================================*/
-/*
-   The event() function is this driver's Card Services event handler.
-   It will be called by Card Services when an appropriate card status
-   event is received.  The config() and release() entry points are
-   used to configure or release a socket, in response to card insertion
-   and ejection events.  They are invoked from the teles_cs event
-   handler.
-*/
 static int teles_cs_config(struct pcmcia_device *link) __devinit ;
 static void teles_cs_release(struct pcmcia_device *link);
-/*
-   The attach() and detach() entry points are used to create and destroy
-   "instances" of the driver, where each instance represents everything
-   needed to manage one actual PCMCIA card.
-*/
 static void teles_detach(struct pcmcia_device *p_dev) __devexit ;
 typedef struct local_info_t {
@@ -73,18 +54,6 @@ typedef struct local_info_t {
    int                 cardnr;
 } local_info_t;
-/*======================================================================
-    teles_attach() creates an "instance" of the driver, allocatingx
-    local data structures for one device.  The device is registered
-    with Card Services.
-    The dev_link structure is initialized, but we don't actually
-    configure the card at this point -- we wait until we receive a
-    card insertion event.
-======================================================================*/
 static int __devinit teles_probe(struct pcmcia_device *link)
 {
    local_info_t *local;
@@ -99,31 +68,11 @@ static int __devinit teles_probe(struct pcmcia_device *link)
    local->p_dev = link;
    link->priv = local;
-    /*
+    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
-      General socket configuration defaults can go here.  In this
-      client, we assume very little, and rely on the CIS for almost
-      everything.  In most clients, many details (i.e., number, sizes,
-      and attributes of IO windows) are fixed by the nature of the
-      device, and can be hard-wired here.
-    */
-    link->resource[0]->end = 96;
-    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-    link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
    return teles_cs_config(link);
 } /* teles_attach */
-/*======================================================================
-    This deletes a driver "instance".  The device is de-registered
-    with Card Services.  If it has been released, all local data
-    structures are freed.  Otherwise, the structures will be freed
-    when the device is released.
-======================================================================*/
 static void __devexit teles_detach(struct pcmcia_device *link)
 {
        local_info_t *info = link->priv;
@@ -136,27 +85,17 @@ static void __devexit teles_detach(struct pcmcia_device *link)
        kfree(info);
 } /* teles_detach */
-/*======================================================================
+static int teles_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
-    teles_cs_config() is scheduled to run after a CARD_INSERTION event
-    is received, to configure the PCMCIA socket, and to make the
-    device available to the system.
-======================================================================*/
-static int teles_cs_configcheck(struct pcmcia_device *p_dev,
-                                cistpl_cftable_entry_t *cf,
-                                cistpl_cftable_entry_t *dflt,
-                                unsigned int vcc,
-                                void *priv_data)
 {
        int j;
        p_dev->io_lines = 5;
+        p_dev->resource[0]->end = 96;
+        p_dev->resource[0]->flags &= IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        if ((cf->io.nwin > 0) && cf->io.win[0].base) {
+        if ((p_dev->resource[0]->end) && p_dev->resource[0]->start) {
                printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
-                p_dev->resource[0]->start = cf->io.win[0].base;
                if (!pcmcia_request_io(p_dev))
                        return 0;
        } else {
@@ -172,12 +111,10 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev,
 static int __devinit teles_cs_config(struct pcmcia_device *link)
 {
-    local_info_t *dev;
    int i;
    IsdnCard_t icard;
    dev_dbg(&link->dev, "teles_config(0x%p)\n", link);
-    dev = link->priv;
    i = pcmcia_loop_config(link, teles_cs_configcheck, NULL);
    if (i != 0)
@@ -186,21 +123,10 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
    if (!link->irq)
        goto cs_failed;
-    i = pcmcia_request_configuration(link, &link->conf);
+    i = pcmcia_enable_device(link);
    if (i != 0)
      goto cs_failed;
-    /* Finally, report what we've done */
-    dev_info(&link->dev, "index 0x%02x:",
-            link->conf.ConfigIndex);
-    if (link->conf.Attributes & CONF_ENABLE_IRQ)
-            printk(", irq %d", link->irq);
-    if (link->resource[0])
-        printk(" & %pR", link->resource[0]);
-    if (link->resource[1])
-        printk(" & %pR", link->resource[1]);
-    printk("\n");
    icard.para[0] = link->irq;
    icard.para[1] = link->resource[0]->start;
    icard.protocol = protocol;
@@ -222,14 +148,6 @@ cs_failed:
    return -ENODEV;
 } /* teles_cs_config */
-/*======================================================================
-    After a card is removed, teles_cs_release() will unregister the net
-    device, and release the PCMCIA configuration.  If the device is
-    still open, this will be postponed until it is closed.
-======================================================================*/
 static void teles_cs_release(struct pcmcia_device *link)
 {
    local_info_t *local = link->priv;
@@ -265,7 +183,7 @@ static int teles_resume(struct pcmcia_device *link)
 }
-static struct pcmcia_device_id teles_ids[] = {
+static const struct pcmcia_device_id teles_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("TELES", "S0/PC", 0x67b50eae, 0xe9e70119),
        PCMCIA_DEVICE_NULL,
 };
@@ -273,9 +191,7 @@ MODULE_DEVICE_TABLE(pcmcia, teles_ids);
 static struct pcmcia_driver teles_cs_driver = {
        .owner          = THIS_MODULE,
-        .drv            = {
+        .name           = "teles_cs",
-                .name   = "teles_cs",
-        },
        .probe          = teles_probe,
        .remove         = __devexit_p(teles_detach),
        .id_table       = teles_ids,
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h
index 729df4089385..18b801ad97a4 100644
--- a/drivers/isdn/hysdn/hysdn_defs.h
+++ b/drivers/isdn/hysdn/hysdn_defs.h
@@ -227,7 +227,6 @@ extern hysdn_card *card_root;	/* pointer to first card */
 /*************************/
 /* im/exported functions */
 /*************************/
-extern char *hysdn_getrev(const char *);
 /* hysdn_procconf.c */
 extern int hysdn_procconf_init(void);   /* init proc config filesys */
@@ -259,7 +258,6 @@ extern int hysdn_tx_cfgline(hysdn_card *, unsigned char *,
 /* hysdn_net.c */
 extern unsigned int hynet_enable; 
-extern char *hysdn_net_revision;
 extern int hysdn_net_create(hysdn_card *);      /* create a new net device */
 extern int hysdn_net_release(hysdn_card *);     /* delete the device */
 extern char *hysdn_net_getname(hysdn_card *);   /* get name of net interface */
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
index b7cc5c2f08c6..0ab42ace1692 100644
--- a/drivers/isdn/hysdn/hysdn_init.c
+++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -36,7 +36,6 @@ MODULE_DESCRIPTION("ISDN4Linux: Driver for HYSDN cards");
 MODULE_AUTHOR("Werner Cornelius");
 MODULE_LICENSE("GPL");
-static char *hysdn_init_revision = "$Revision: 1.6.6.6 $";
 static int cardmax;             /* number of found cards */
 hysdn_card *card_root = NULL;   /* pointer to first card */
 static hysdn_card *card_last = NULL;    /* pointer to first card */
@@ -49,25 +48,6 @@ static hysdn_card *card_last = NULL;	/* pointer to first card */
 /* Additionally newer versions may be activated without rebooting.          */
 /****************************************************************************/
-/******************************************************/
-/* extract revision number from string for log output */
-/******************************************************/
-char *
-hysdn_getrev(const char *revision)
-{
-        char *rev;
-        char *p;
-        if ((p = strchr(revision, ':'))) {
-                rev = p + 2;
-                p = strchr(rev, '$');
-                *--p = 0;
-        } else
-                rev = "???";
-        return rev;
-}
 /****************************************************************************/
 /* init_module is called once when the module is loaded to do all necessary */
 /* things like autodetect...                                                */
@@ -175,13 +155,9 @@ static int hysdn_have_procfs;
 static int __init
 hysdn_init(void)
 {
-        char tmp[50];
        int rc;
-        strcpy(tmp, hysdn_init_revision);
+        printk(KERN_NOTICE "HYSDN: module loaded\n");
-        printk(KERN_NOTICE "HYSDN: module Rev: %s loaded\n", hysdn_getrev(tmp));
-        strcpy(tmp, hysdn_net_revision);
-        printk(KERN_NOTICE "HYSDN: network interface Rev: %s \n", hysdn_getrev(tmp));
        rc = pci_register_driver(&hysdn_pci_driver);
        if (rc)
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c
index feec8d89d719..11f2cce26005 100644
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -26,9 +26,6 @@
 unsigned int hynet_enable = 0xffffffff; 
 module_param(hynet_enable, uint, 0);
-/* store the actual version for log reporting */
-char *hysdn_net_revision = "$Revision: 1.8.6.4 $";
 #define MAX_SKB_BUFFERS 20      /* number of buffers for keeping TX-data */
 /****************************************************************************/
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 96b3e39c3356..5fe83bd42061 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -23,7 +23,6 @@
 #include "hysdn_defs.h"
 static DEFINE_MUTEX(hysdn_conf_mutex);
-static char *hysdn_procconf_revision = "$Revision: 1.8.6.4 $";
 #define INFO_OUT_LEN 80         /* length of info line including lf */
@@ -404,7 +403,7 @@ hysdn_procconf_init(void)
                card = card->next;      /* next entry */
        }
-        printk(KERN_NOTICE "HYSDN: procfs Rev. %s initialised\n", hysdn_getrev(hysdn_procconf_revision));
+        printk(KERN_NOTICE "HYSDN: procfs initialised\n");
        return (0);
 }                               /* hysdn_procconf_init */
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 2ee93d04b2dd..236cc7dadfd0 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -155,7 +155,6 @@ put_log_buffer(hysdn_card * card, char *cp)
 static ssize_t
 hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
-        unsigned long u = 0;
        int rc;
        unsigned char valbuf[128];
        hysdn_card *card = file->private_data;
@@ -167,12 +166,10 @@ hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t
        valbuf[count] = 0;      /* terminating 0 */
-        rc = strict_strtoul(valbuf, 0, &u);
+        rc = kstrtoul(valbuf, 0, &card->debug_flags);
+        if (rc < 0)
-        if (rc == 0) {
+                return rc;
-                card->debug_flags = u;  /* remember debug flags */
+        hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
-                hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
-        }
        return (count);
 }                               /* hysdn_log_write */
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c
index 81db4a190d41..3674d30d6a03 100644
--- a/drivers/isdn/hysdn/hysdn_sched.c
+++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -143,7 +143,7 @@ hysdn_sched_tx(hysdn_card *card, unsigned char *buf,
 /* send one config line to the card and return 0 if successful, otherwise a */
 /* negative error code.                                                      */
 /* The function works with timeouts perhaps not giving the greatest speed    */
-/* sending the line, but this should be meaningless beacuse only some lines  */
+/* sending the line, but this should be meaningless because only some lines  */
 /* are to be sent and this happens very seldom.                              */
 /*****************************************************************************/
 int
diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c
index 861bdf3421f2..d5013935ac62 100644
--- a/drivers/isdn/i4l/isdn_audio.c
+++ b/drivers/isdn/i4l/isdn_audio.c
@@ -439,7 +439,7 @@ isdn_audio_xlaw2adpcm(adpcm_state * s, int fmt, unsigned char *in,
 /*
 * Goertzel algorithm.
- * See http://ptolemy.eecs.berkeley.edu/~pino/Ptolemy/papers/96/dtmf_ict/
+ * See http://ptolemy.eecs.berkeley.edu/papers/96/dtmf_ict/ 
 * for more info.
 * Result is stored into an sk_buff and queued up for later
 * evaluation.
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 15632bd2f643..6ed82add6ffa 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -399,13 +399,8 @@ isdn_all_eaz(int di, int ch)
 #include <linux/isdn/capicmd.h>
 static int
-isdn_capi_rec_hl_msg(capi_msg *cm) {
+isdn_capi_rec_hl_msg(capi_msg *cm)
-        
+{
-        int di;
-        int ch;
-        
-        di = (cm->adr.Controller & 0x7f) -1;
-        ch = isdn_dc2minor(di, (cm->adr.Controller>>8)& 0x7f);
        switch(cm->Command) {
                case CAPI_FACILITY:
                        /* in the moment only handled in tty */
@@ -1278,7 +1273,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
        uint minor = iminor(file->f_path.dentry->d_inode);
        isdn_ctrl c;
        int drvidx;
-        int chidx;
        int ret;
        int i;
        char __user *p;
@@ -1340,7 +1334,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
                drvidx = isdn_minor2drv(minor);
                if (drvidx < 0)
                        return -ENODEV;
-                chidx = isdn_minor2chan(minor);
                if (!(dev->drv[drvidx]->flags & DRV_FLAG_RUNNING))
                        return -ENODEV;
                return 0;
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..97988111e45a 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
@@ -1530,7 +1530,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
                printk (KERN_WARNING
                                "UPDOWN: Line protocol on Interface %s,"
                                " changed state to down\n", lp->netdev->dev->name);
-                /* should stop routing higher-level data accross */
+                /* should stop routing higher-level data across */
        } else if ((!lp->cisco_line_state) &&
                (myseq_diff >= 0) && (myseq_diff <= 2)) {
                /* line down -> up */
@@ -1538,7 +1538,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
                printk (KERN_WARNING
                                "UPDOWN: Line protocol on Interface %s,"
                                " changed state to up\n", lp->netdev->dev->name);
-                /* restart routing higher-level data accross */
+                /* restart routing higher-level data across */
        }
        if (lp->cisco_debserint)
@@ -1678,7 +1678,6 @@ isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb)
        u32 your_seq;
        __be32 local;
        __be32 *addr, *mask;
-        u16 unused;
        if (skb->len < 14)
                return;
@@ -1722,7 +1721,6 @@ isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb)
                lp->cisco_last_slarp_in = jiffies;
                my_seq = be32_to_cpup((__be32 *)(p + 0));
                your_seq = be32_to_cpup((__be32 *)(p + 4));
-                unused = be16_to_cpup((__be16 *)(p + 8));
                p += 10;
                lp->cisco_yourseq = my_seq;
                lp->cisco_mineseen = your_seq;
@@ -1786,7 +1784,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 +1798,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..1b002b0002a4 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,
+              && sk_run_filter(skb, is->active_filter) == 0)) {
-                               is->active_len) == 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,
+              && sk_run_filter(skb, ipt->active_filter) == 0)) {
-                               ipt->active_len) == 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;
@@ -1516,7 +1514,7 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp)
 #define MP_LONGSEQ_MAXBIT       ((MP_LONGSEQ_MASK+1)>>1)
 #define MP_SHORTSEQ_MAXBIT      ((MP_SHORTSEQ_MASK+1)>>1)
-/* sequence-wrap safe comparisions (for long sequence)*/ 
+/* sequence-wrap safe comparisons (for long sequence)*/
 #define MP_LT(a,b)      ((a-b)&MP_LONGSEQ_MAXBIT)
 #define MP_LE(a,b)      !((b-a)&MP_LONGSEQ_MAXBIT)
 #define MP_GT(a,b)      ((b-a)&MP_LONGSEQ_MAXBIT)
@@ -1748,7 +1746,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                 * then next fragment should be the start of new reassembly
                 * if sequence is contiguous, but we haven't reassembled yet,
                 * keep going.
-                 * if sequence is not contiguous, either clear everyting
+                 * if sequence is not contiguous, either clear everything
                 * below low watermark and set start to the next frag or
                 * clear start ptr.
                 */ 
@@ -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/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 51dc60da333b..d8504279e502 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -14,7 +14,7 @@
 #include <linux/isdn.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include "isdn_common.h"
 #include "isdn_tty.h"
 #ifdef CONFIG_ISDN_AUDIO
@@ -28,6 +28,7 @@
 /* Prototypes */
+static DEFINE_MUTEX(modem_info_mutex);
 static int isdn_tty_edit_at(const char *, int, modem_info *);
 static void isdn_tty_check_esc(const u_char *, u_char, int, int *, u_long *);
 static void isdn_tty_modem_reset_regs(modem_info *, int);
@@ -791,7 +792,7 @@ isdn_tty_suspend(char *id, modem_info * info, atemu * m)
 }
 /* isdn_tty_resume() tries to resume a suspended call
- * setup of the lower levels before that. unfortunatly here is no
+ * setup of the lower levels before that. unfortunately here is no
 * checking for compatibility of used protocols implemented by Q931
 * It does the same things like isdn_tty_dial, the last command
 * is different, may be we can merge it.
@@ -997,7 +998,6 @@ isdn_tty_change_speed(modem_info * info)
 {
        uint cflag,
         cval,
-         fcr,
         quot;
        int i;
@@ -1036,7 +1036,6 @@ isdn_tty_change_speed(modem_info * info)
                cval |= UART_LCR_PARITY;
        if (!(cflag & PARODD))
                cval |= UART_LCR_EPAR;
-        fcr = 0;
        /* CTS flow control flag and modem status interrupts */
        if (cflag & CRTSCTS) {
@@ -1344,7 +1343,7 @@ isdn_tty_get_lsr_info(modem_info * info, uint __user * value)
 static int
-isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
+isdn_tty_tiocmget(struct tty_struct *tty)
 {
        modem_info *info = (modem_info *) tty->driver_data;
        u_char control, status;
@@ -1354,14 +1353,14 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
        if (tty->flags & (1 << TTY_IO_ERROR))
                return -EIO;
-        lock_kernel();
+        mutex_lock(&modem_info_mutex);
 #ifdef ISDN_DEBUG_MODEM_IOCTL
        printk(KERN_DEBUG "ttyI%d ioctl TIOCMGET\n", info->line);
 #endif
        control = info->mcr;
        status = info->msr;
-        unlock_kernel();
+        mutex_unlock(&modem_info_mutex);
        return ((control & UART_MCR_RTS) ? TIOCM_RTS : 0)
            | ((control & UART_MCR_DTR) ? TIOCM_DTR : 0)
            | ((status & UART_MSR_DCD) ? TIOCM_CAR : 0)
@@ -1371,7 +1370,7 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
 }
 static int
-isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
+isdn_tty_tiocmset(struct tty_struct *tty,
                unsigned int set, unsigned int clear)
 {
        modem_info *info = (modem_info *) tty->driver_data;
@@ -1385,7 +1384,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
        printk(KERN_DEBUG "ttyI%d ioctl TIOCMxxx: %x %x\n", info->line, set, clear);
 #endif
-        lock_kernel();
+        mutex_lock(&modem_info_mutex);
        if (set & TIOCM_RTS)
                info->mcr |= UART_MCR_RTS;
        if (set & TIOCM_DTR) {
@@ -1407,13 +1406,12 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
                        isdn_tty_modem_hup(info, 1);
                }
        }
-        unlock_kernel();
+        mutex_unlock(&modem_info_mutex);
        return 0;
 }
 static int
-isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
+isdn_tty_ioctl(struct tty_struct *tty, uint cmd, ulong arg)
-               uint cmd, ulong arg)
 {
        modem_info *info = (modem_info *) tty->driver_data;
        int retval;
@@ -3515,7 +3513,7 @@ isdn_tty_parse_at(modem_info * info)
 {
        atemu *m = &info->emu;
        char *p;
-        char ds[40];
+        char ds[ISDN_MSNLEN];
 #ifdef ISDN_DEBUG_AT
        printk(KERN_DEBUG "AT: '%s'\n", m->mdmcmd);
@@ -3594,7 +3592,7 @@ isdn_tty_parse_at(modem_info * info)
                                                break;
                                        case '3':
                                                p++;
-                                                sprintf(ds, "\r\n%d", info->emu.charge);
+                                                snprintf(ds, sizeof(ds), "\r\n%d", info->emu.charge);
                                                isdn_tty_at_cout(ds, info);
                                                break;
                                        default:;
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 2e847a90bad0..1f355bb85e54 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1627,7 +1627,7 @@ __setup("icn=", icn_setup);
 static int __init icn_init(void)
 {
        char *p;
-        char rev[10];
+        char rev[21];
        memset(&dev, 0, sizeof(icn_dev));
        dev.memaddr = (membase & 0x0ffc000);
@@ -1637,9 +1637,11 @@ static int __init icn_init(void)
        spin_lock_init(&dev.devlock);
        if ((p = strchr(revision, ':'))) {
-                strcpy(rev, p + 1);
+                strncpy(rev, p + 1, 20);
+                rev[20] = '\0';
                p = strchr(rev, '$');
-                *p = 0;
+                if (p)
+                        *p = 0;
        } else
                strcpy(rev, " ??? ");
        printk(KERN_NOTICE "ICN-ISDN-driver Rev%smem=0x%08lx\n", rev,
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index b8a1098b66ed..d497db0a26d0 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -954,7 +954,7 @@ isdnloop_parse_cmd(isdnloop_card * card)
 /*
 * Put command-strings into the of the 'card'. In reality, execute them
 * right in place by calling isdnloop_parse_cmd(). Also copy every
- * command to the read message ringbuffer, preceeding it with a '>'.
+ * command to the read message ringbuffer, preceding it with a '>'.
 * These mesagges can be read at /dev/isdnctrl.
 *
 * Parameter:
diff --git a/drivers/isdn/mISDN/dsp.h b/drivers/isdn/mISDN/dsp.h
index 18af86879c05..8549431430f0 100644
--- a/drivers/isdn/mISDN/dsp.h
+++ b/drivers/isdn/mISDN/dsp.h
@@ -21,7 +21,7 @@
 /* options may be:
 *
 * bit 0 = use ulaw instead of alaw
- * bit 1 = enable hfc hardware accelleration for all channels
+ * bit 1 = enable hfc hardware acceleration for all channels
 *
 */
 #define DSP_OPT_ULAW            (1<<0)
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 713ef2b805a2..4d395dea32f3 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -112,7 +112,7 @@
 * Disable rx-data:
 * If cmx is realized in hardware, rx data will be disabled if requested by
 * the upper layer. If dtmf decoding is done by software and enabled, rx data
- * will not be diabled but blocked to the upper layer.
+ * will not be disabled but blocked to the upper layer.
 *
 * HFC conference engine:
 * If it is possible to realize all features using hardware, hardware will be
@@ -1237,6 +1237,7 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb)
                        if (dsp->cmx_delay)
                                dsp->rx_W = (dsp->rx_R + dsp->cmx_delay)
                                        & CMX_BUFF_MASK;
+                        else
                                dsp->rx_W = (dsp->rx_R + (dsp_poll >> 1))
                                        & CMX_BUFF_MASK;
                } else {
@@ -1512,7 +1513,7 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
        /* -> if echo is NOT enabled */
        if (!dsp->echo.software) {
                /*
-                 * -> substract rx-data from conf-data,
+                 * -> subtract rx-data from conf-data,
                 * if tx-data is available, mix
                 */
                while (r != rr && t != tt) {
@@ -1571,7 +1572,7 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
 send_packet:
        /*
         * send tx-data if enabled - don't filter,
-         * becuase we want what we send, not what we filtered
+         * because we want what we send, not what we filtered
         */
        if (dsp->tx_data) {
                if (tx_data_only) {
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 6f5b54864283..2877291a9ed8 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -115,7 +115,7 @@
 *
 * The CMX has special functions for conferences with one, two and more
 * members. It will allow different types of data flow. Receive and transmit
- * data to/form upper layer may be swithed on/off individually without loosing
+ * data to/form upper layer may be swithed on/off individually without losing
 * features of CMX, Tones and DTMF.
 *
 * Echo Cancellation: Sometimes we like to cancel echo from the interface.
@@ -127,9 +127,9 @@
 *
 * If all used features can be realized in hardware, and if transmit and/or
 * receive data ist disabled, the card may not send/receive any data at all.
- * Not receiving is usefull if only announcements are played. Not sending is
+ * Not receiving is useful if only announcements are played. Not sending is
- * usefull if an answering machine records audio. Not sending and receiving is
+ * useful if an answering machine records audio. Not sending and receiving is
- * usefull during most states of the call. If supported by hardware, tones
+ * useful during most states of the call. If supported by hardware, tones
 * will be played without cpu load. Small PBXs and NT-Mode applications will
 * not need expensive hardware when processing calls.
 *
diff --git a/drivers/isdn/mISDN/dsp_dtmf.c b/drivers/isdn/mISDN/dsp_dtmf.c
index 9ae2d33b06f7..5b484c3f4af6 100644
--- a/drivers/isdn/mISDN/dsp_dtmf.c
+++ b/drivers/isdn/mISDN/dsp_dtmf.c
@@ -106,7 +106,7 @@ void dsp_dtmf_hardware(struct dsp *dsp)
 * tested it allot. it even works with very short tones (40ms). the only
 * disadvantage is, that it doesn't work good with different volumes of both
 * tones. this will happen, if accoustically coupled dialers are used.
- * it sometimes detects tones during speach, which is normal for decoders.
+ * it sometimes detects tones during speech, which is normal for decoders.
 * use sequences to given commands during calls.
 *
 * dtmf - points to a structure of the current dtmf state
@@ -244,7 +244,7 @@ coefficients:
                if (result[i] < tresh) {
                        lowgroup = -1;
                        highgroup = -1;
-                        break;  /* noise inbetween */
+                        break;  /* noise in between */
                }
                /* good level found. This is allowed only one time per group */
                if (i < NCOEFF/2) {
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c
index 7dbe54ed1deb..4e4440e8bae5 100644
--- a/drivers/isdn/mISDN/dsp_tones.c
+++ b/drivers/isdn/mISDN/dsp_tones.c
@@ -394,7 +394,7 @@ void dsp_tone_copy(struct dsp *dsp, u8 *data, int len)
        while (len) {
                /* find sample to start with */
                while (42) {
-                        /* warp arround */
+                        /* wrap around */
                        if (!pat->seq[index]) {
                                count = 0;
                                index = 0;
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index 307bd6e8988b..f6e108d0125f 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);
@@ -206,7 +206,7 @@ recv_Bchannel(struct bchannel *bch, unsigned int id)
        hh->id = id;
        if (bch->rcount >= 64) {
                printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                        "fushing!\n", bch);
+                        "flushing!\n", bch);
                skb_queue_purge(&bch->rqueue);
                bch->rcount = 0;
                return;
@@ -231,7 +231,7 @@ recv_Bchannel_skb(struct bchannel *bch, struct sk_buff *skb)
 {
        if (bch->rcount >= 64) {
                printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                        "fushing!\n", bch);
+                        "flushing!\n", bch);
                skb_queue_purge(&bch->rqueue);
                bch->rcount = 0;
        }
@@ -279,7 +279,7 @@ confirm_Bsend(struct bchannel *bch)
        if (bch->rcount >= 64) {
                printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                        "fushing!\n", bch);
+                        "flushing!\n", bch);
                skb_queue_purge(&bch->rqueue);
                bch->rcount = 0;
        }
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 22f38e48ac4e..22f8ec8b9247 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -179,7 +179,7 @@ NOTE: A value of 0 equals 256 bytes of data.
 - Time Base = Timestamp of first sample in frame
 The "Time Base" is used to rearange packets and to detect packet loss.
 The 16 bits are sent in network order (MSB first) and count 1/8000 th of a
-second. This causes a wrap arround each 8,192 seconds. There is no requirement
+second. This causes a wrap around each 8,192 seconds. There is no requirement
 for the initial "Time Base", but 0 should be used for the first packet.
 In case of HDLC data, this timestamp counts the packet or byte number.
@@ -205,7 +205,7 @@ On Demand:
 If the ondemand parameter is given, the remote IP is set to 0 on timeout.
 This will stop keepalive traffic to remote. If the remote is online again,
-traffic will continue to the remote address. This is usefull for road warriors.
+traffic will continue to the remote address. This is useful for road warriors.
 This feature only works with ID set, otherwhise it is highly unsecure.
@@ -590,7 +590,7 @@ multiframe:
                        return;
                }
        } else
-                mlen = len-2; /* single frame, substract timebase */
+                mlen = len-2; /* single frame, subtract timebase */
        if (len < 2) {
                printk(KERN_WARNING "%s: packet error - packet too short, time "
@@ -972,7 +972,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
                if (debug & DEBUG_L1OIP_SOCKET)
                        printk(KERN_DEBUG "%s: got new ip address from user "
                                "space.\n", __func__);
-                        l1oip_socket_open(hc);
+                l1oip_socket_open(hc);
                break;
        case MISDN_CTRL_UNSETPEER:
                if (debug & DEBUG_L1OIP_SOCKET)
@@ -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);
+        vaf.fmt = fmt;
-        printk("\n");
+        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..5bc00156315e 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);
+        vaf.fmt = fmt;
-        printk("\n");
+        vaf.va = &va;
+        printk(KERN_DEBUG "l2 (sapi %d tei %d): %pV\n",
+               l2->sapi, l2->tei, &vaf);
        va_end(va);
 }
@@ -1634,7 +1640,7 @@ l2_tei_remove(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct layer2 *l2 = fi->userdata;
        struct sk_buff *skb = arg;
@@ -1648,7 +1654,7 @@ l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st5_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct layer2 *l2 = fi->userdata;
        struct sk_buff *skb = arg;
@@ -1665,7 +1671,7 @@ l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st6_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct layer2 *l2 = fi->userdata;
        struct sk_buff *skb = arg;
@@ -1679,7 +1685,7 @@ l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct layer2 *l2 = fi->userdata;
        struct sk_buff *skb = arg;
@@ -1823,14 +1829,14 @@ static struct FsmNode L2FnList[] =
        {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error},
        {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest},
        {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest},
-        {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistant_da},
+        {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistent_da},
        {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove},
        {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove},
-        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistant_da},
+        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da},
-        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da},
+        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da},
-        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da},
+        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da},
-        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da},
+        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da},
-        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da},
+        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},
 };
 static int
@@ -1858,7 +1864,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                psapi >>= 2;
                ptei >>= 1;
                if (psapi != l2->sapi) {
-                        /* not our bussiness */
+                        /* not our business */
                        if (*debug & DEBUG_L2)
                                printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
                                        __func__, psapi, l2->sapi);
@@ -1866,7 +1872,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                        return 0;
                }
                if ((ptei != l2->tei) && (ptei != GROUP_TEI)) {
-                        /* not our bussiness */
+                        /* not our business */
                        if (*debug & DEBUG_L2)
                                printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
                                        __func__, ptei, l2->tei);
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 3232206406b1..8e325227b4c0 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -392,6 +392,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                if (dev) {
                        struct mISDN_devinfo di;
+                        memset(&di, 0, sizeof(di));
                        di.id = dev->id;
                        di.Dprotocols = dev->Dprotocols;
                        di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
@@ -456,6 +457,9 @@ static int data_sock_getsockopt(struct socket *sock, int level, int optname,
        if (get_user(len, optlen))
                return -EFAULT;
+        if (len != sizeof(char))
+                return -EINVAL;
        switch (optname) {
        case MISDN_TIME_STAMP:
                if (_pms(sk)->cmask & MISDN_TIME_STAMP)
@@ -672,6 +676,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                if (dev) {
                        struct mISDN_devinfo di;
+                        memset(&di, 0, sizeof(di));
                        di.id = dev->id;
                        di.Dprotocols = dev->Dprotocols;
                        di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c
index b159bd59e64e..a5b632e67552 100644
--- a/drivers/isdn/mISDN/stack.c
+++ b/drivers/isdn/mISDN/stack.c
@@ -18,7 +18,6 @@
 #include <linux/slab.h>
 #include <linux/mISDNif.h>
 #include <linux/kthread.h>
-#include <linux/smp_lock.h>
 #include "core.h"
 static u_int    *debug;
@@ -205,13 +204,7 @@ mISDNStackd(void *data)
        struct mISDNstack *st = data;
        int err = 0;
-#ifdef CONFIG_SMP
-        lock_kernel();
-#endif
        sigfillset(&current->blocked);
-#ifdef CONFIG_SMP
-        unlock_kernel();
-#endif
        if (*debug & DEBUG_MSG_THREAD)
                printk(KERN_DEBUG "mISDNStackd %s started\n",
                    dev_name(&st->dev->dev));
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);
+        vaf.fmt = fmt;
-        printk("\n");
+        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);
+        vaf.fmt = fmt;
-        printk("\n");
+        vaf.va = &va;
+        printk(KERN_DEBUG "sapi(%d) tei(%d): %pV\n",
+               tm->l2->sapi, tm->l2->tei, &vaf);
        va_end(va);
 }
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index de43c8c70ad0..859c81e9483b 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -267,6 +267,7 @@ static const struct file_operations mISDN_fops = {
        .unlocked_ioctl = mISDN_ioctl,
        .open           = mISDN_open,
        .release        = mISDN_close,
+        .llseek         = no_llseek,
 };
 static struct miscdevice mISDNtimer = {
diff --git a/drivers/isdn/pcbit/edss1.c b/drivers/isdn/pcbit/edss1.c
index d5920ae22d73..80c9c16fd5ef 100644
--- a/drivers/isdn/pcbit/edss1.c
+++ b/drivers/isdn/pcbit/edss1.c
@@ -33,7 +33,7 @@
 #include "callbacks.h"
-char * isdn_state_table[] = {
+const char * const isdn_state_table[] = {
  "Closed",
  "Call initiated",
  "Overlap sending",
diff --git a/drivers/isdn/pcbit/edss1.h b/drivers/isdn/pcbit/edss1.h
index 0b64f97015d8..39f8346e28c5 100644
--- a/drivers/isdn/pcbit/edss1.h
+++ b/drivers/isdn/pcbit/edss1.h
@@ -90,7 +90,7 @@ struct fsm_timer_entry {
        unsigned long timeout;          /* in seconds */
 };
-extern char * isdn_state_table[];
+extern const char * const isdn_state_table[];
 void pcbit_fsm_event(struct pcbit_dev *, struct pcbit_chan *,
                     unsigned short event, struct callb_data *);