28 files changed, 80 insertions, 498 deletions

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 0d7088367038..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;
-        dev_t device;
-
-        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);
-        }
+        if (cdev->userflags & CAPIFLAG_HIGHJACKING)
+                np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
 }
 
 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
-                printk(KERN_DEBUG "capi: currently no receiver\n");
-#endif
+                pr_debug("capi: currently no receiver\n");
                 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)
-                printk(KERN_DEBUG "capi: ldisc has no receive_buf function\n");
-#endif
+                pr_debug("capi: ldisc has no receive_buf function\n");
                 /* fatal error, do not requeue */
                 goto free_skb;
         }
         if (mp->ttyinstop) {
-#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
-                printk(KERN_DEBUG "capi: recv tty throttled\n");
-#endif
+                pr_debug("capi: recv tty throttled\n");
                 goto deref_ldisc;
         }
 
         if (tty->receive_room < datalen) {
-#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
-                printk(KERN_DEBUG "capi: no room in tty\n");
-#endif
+                pr_debug("capi: no room in tty\n");
                 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
-                printk(KERN_DEBUG "capi: DATA_B3_RESP %u len=%d => ldisc\n",
-                                        datahandle, skb->len);
-#endif
+                pr_debug("capi: DATA_B3_RESP %u len=%d => ldisc\n",
+                         datahandle, skb->len);
                 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)
-                printk(KERN_DEBUG "capi: send: tty stopped\n");
-#endif
+                pr_debug("capi: send: tty stopped\n");
                 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
-                        printk(KERN_DEBUG "capi: DATA_B3_REQ %u len=%u\n",
-                                                        datahandle, len);
-#endif
+                        pr_debug("capi: DATA_B3_REQ %u len=%u\n",
+                                 datahandle, len);
                         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
-                printk(KERN_DEBUG "capi_signal: DATA_B3_IND %u len=%d\n",
-                                datahandle, skb->len-CAPIMSG_LEN(skb->data));
-#endif
+                pr_debug("capi_signal: DATA_B3_IND %u len=%d\n",
+                         datahandle, skb->len-CAPIMSG_LEN(skb->data));
                 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
-                printk(KERN_DEBUG "capi_signal: DATA_B3_CONF %u 0x%x\n",
-                                datahandle,
-                                CAPIMSG_U16(skb->data, CAPIMSG_BASELEN+4+2));
-#endif
+                pr_debug("capi_signal: DATA_B3_CONF %u 0x%x\n",
+                         datahandle,
+                         CAPIMSG_U16(skb->data, CAPIMSG_BASELEN+4+2));
                 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
-        printk(KERN_DEBUG "capinc_tty_write(count=%d)\n", count);
-#endif
+        pr_debug("capinc_tty_write(count=%d)\n", count);
 
         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
-        printk(KERN_DEBUG "capinc_put_char(%u)\n", ch);
-#endif
+        pr_debug("capinc_put_char(%u)\n", ch);
 
         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
-        printk(KERN_DEBUG "capinc_tty_flush_chars\n");
-#endif
+        pr_debug("capinc_tty_flush_chars\n");
 
         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
-        printk(KERN_DEBUG "capinc_tty_write_room = %d\n", room);
-#endif
+        pr_debug("capinc_tty_write_room = %d\n", room);
         return room;
 }
 
@@ -1210,12 +1167,10 @@ static int capinc_tty_chars_in_buffer(struct tty_struct *tty)
 {
         struct capiminor *mp = tty->driver_data;
 
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_chars_in_buffer = %d nack=%d sq=%d rq=%d\n",
-                        mp->outbytes, mp->nack,
-                        skb_queue_len(&mp->outqueue),
-                        skb_queue_len(&mp->inqueue));
-#endif
+        pr_debug("capinc_tty_chars_in_buffer = %d nack=%d sq=%d rq=%d\n",
+                 mp->outbytes, mp->nack,
+                 skb_queue_len(&mp->outqueue),
+                 skb_queue_len(&mp->inqueue));
         return mp->outbytes;
 }
 
@@ -1227,17 +1182,13 @@ static int capinc_tty_ioctl(struct tty_struct *tty,
 
 static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios * old)
 {
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_set_termios\n");
-#endif
+        pr_debug("capinc_tty_set_termios\n");
 }
 
 static void capinc_tty_throttle(struct tty_struct *tty)
 {
         struct capiminor *mp = tty->driver_data;
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_throttle\n");
-#endif
+        pr_debug("capinc_tty_throttle\n");
         mp->ttyinstop = 1;
 }
 
@@ -1245,9 +1196,7 @@ static void capinc_tty_unthrottle(struct tty_struct *tty)
 {
         struct capiminor *mp = tty->driver_data;
 
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_unthrottle\n");
-#endif
+        pr_debug("capinc_tty_unthrottle\n");
         mp->ttyinstop = 0;
         handle_minor_recv(mp);
 }
@@ -1256,9 +1205,7 @@ static void capinc_tty_stop(struct tty_struct *tty)
 {
         struct capiminor *mp = tty->driver_data;
 
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_stop\n");
-#endif
+        pr_debug("capinc_tty_stop\n");
         mp->ttyoutstop = 1;
 }
 
@@ -1266,9 +1213,7 @@ static void capinc_tty_start(struct tty_struct *tty)
 {
         struct capiminor *mp = tty->driver_data;
 
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_start\n");
-#endif
+        pr_debug("capinc_tty_start\n");
         mp->ttyoutstop = 0;
         handle_minor_send(mp);
 }
@@ -1277,39 +1222,29 @@ static void capinc_tty_hangup(struct tty_struct *tty)
 {
         struct capiminor *mp = tty->driver_data;
 
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_hangup\n");
-#endif
+        pr_debug("capinc_tty_hangup\n");
         tty_port_hangup(&mp->port);
 }
 
 static int capinc_tty_break_ctl(struct tty_struct *tty, int state)
 {
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_break_ctl(%d)\n", state);
-#endif
+        pr_debug("capinc_tty_break_ctl(%d)\n", state);
         return 0;
 }
 
 static void capinc_tty_flush_buffer(struct tty_struct *tty)
 {
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_flush_buffer\n");
-#endif
+        pr_debug("capinc_tty_flush_buffer\n");
 }
 
 static void capinc_tty_set_ldisc(struct tty_struct *tty)
 {
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_set_ldisc\n");
-#endif
+        pr_debug("capinc_tty_set_ldisc\n");
 }
 
 static void capinc_tty_send_xchar(struct tty_struct *tty, char ch)
 {
-#ifdef _DEBUG_TTYFUNCS
-        printk(KERN_DEBUG "capinc_tty_send_xchar(%d)\n", ch);
-#endif
+        pr_debug("capinc_tty_send_xchar(%d)\n", ch);
 }
 
 static const struct tty_operations capinc_ops = {
@@ -1514,10 +1449,8 @@ static int __init capi_init(void)
 
         proc_init();
 
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-        compileinfo = " (middleware+capifs)";
-#elif defined(CONFIG_ISDN_CAPI_MIDDLEWARE)
-        compileinfo = " (no capifs)";
+#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
+        compileinfo = " (middleware)";
 #else
         compileinfo = " (no middleware)";
 #endif
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
deleted file mode 100644
index b4faed7fe0d3..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 struct dentry *capifs_mount(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data)
-{
-        return mount_single(fs_type, flags, data, capifs_fill_super);
-}
-
-static struct file_system_type capifs_fs_type = {
-        .owner          = THIS_MODULE,
-        .name           = "capifs",
-        .mount          = capifs_mount,
-        .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/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 8a3c5cfc4fea..3913f47ef86d 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -1157,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;
@@ -1225,7 +1224,6 @@ 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 ||
@@ -1235,9 +1233,6 @@ static void write_iso_tasklet(unsigned long data)
                                                  i, ifd->actual_length,
                                                  ifd->length,
                                                  get_usb_statmsg(ifd->status));
-                                        offset = (ifd->offset +
-                                                  ifd->actual_length)
-                                                 % BAS_OUTBUFSIZE;
                                         break;
                                 }
                         }
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;
-
-                                i = strict_strtoul(argv[curarg++], 16, &type);
-                                j = strict_strtoul(argv[curarg++], 16, &value);
+                                u8 type, value;
 
-                                if (i == 0 && type < 256 &&
-                                    j == 0 && value < 256)
+                                i = kstrtou8(argv[curarg++], 16, &type);
+                                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) {
-                                unsigned long res;
-                                int rc;
-
-                                rc = strict_strtoul(argv[curarg++], 10, &res);
-                                if (rc == 0)
-                                        event->parameter = res;
-                        }
+                        if (curarg >= params ||
+                            kstrtoint(argv[curarg++], 10, &event->parameter))
+                                event->parameter = -1;
                         gig_dbg(DEBUG_EVENT, "parameter==%d", event->parameter);
                         break;
                 }
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c
index 362640120886..7a9894cb4557 100644
--- a/drivers/isdn/hardware/eicon/debug.c
+++ b/drivers/isdn/hardware/eicon/debug.c
@@ -861,7 +861,7 @@ 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[128];
   diva_dbg_entry_head_t* pmsg = NULL;
   int len;
@@ -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/message.c b/drivers/isdn/hardware/eicon/message.c
index 8c5c563c4f12..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 */
@@ -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) {
@@ -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/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 4343abac0b13..b01a7be1300f 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -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..3ccbff13eaf2 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 */
@@ -1726,7 +1724,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 +1742,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/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/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 496d477af0f8..9e5e87be756b 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -129,12 +129,10 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
 
 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;
 
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_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/ipacx.c b/drivers/isdn/hisax/ipacx.c
index 332104103e18..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); 
       }
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/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
index 8e2fd02ecce0..b0d9ab1f21c0 100644
--- a/drivers/isdn/hisax/l3dss1.c
+++ b/drivers/isdn/hisax/l3dss1.c
@@ -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 7b229c0ce115..092dcbb39d94 100644
--- a/drivers/isdn/hisax/l3ni1.c
+++ b/drivers/isdn/hisax/l3ni1.c
@@ -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/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_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/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index aa25e183bf79..360f9ec7c802 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -111,12 +111,10 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
 
 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)
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);
-
-        if (rc == 0) {
-                card->debug_flags = u;  /* remember debug flags */
-                hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
-        }
+        rc = kstrtoul(valbuf, 0, &card->debug_flags);
+        if (rc < 0)
+                return rc;
+        hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
         return (count);
 }                               /* hysdn_log_write */
 
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) {
-        
-        int di;
-        int ch;
-        
-        di = (cm->adr.Controller & 0x7f) -1;
-        ch = isdn_dc2minor(di, (cm->adr.Controller>>8)& 0x7f);
+isdn_capi_rec_hl_msg(capi_msg *cm)
+{
         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_net.c b/drivers/isdn/i4l/isdn_net.c
index 2a7d17c19489..97988111e45a 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -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;
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 607d846ae063..d8504279e502 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -998,7 +998,6 @@ isdn_tty_change_speed(modem_info * info)
 {
         uint cflag,
          cval,
-         fcr,
          quot;
         int i;
 
@@ -1037,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) {
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index d0aeb44ee7c0..5bc00156315e 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -1640,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;
@@ -1654,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;
@@ -1671,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;
@@ -1685,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;
@@ -1829,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_5, EV_L1_DEACTIVATE, l2_st5_persistant_da},
-        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da},
-        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da},
-        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da},
+        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da},
+        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da},
+        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da},
+        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da},
+        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},
 };
 
 static int
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 7446d8b4282d..8e325227b4c0 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -457,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)