9 files changed, 36 insertions, 40 deletions

diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index a233ed53913a..86cd75a0e84d 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -4,7 +4,7 @@
 
 menuconfig ISDN
         bool "ISDN support"
-        depends on NET
+        depends on NET && NETDEVICES
         depends on !S390 && !UML
         ---help---
           ISDN ("Integrated Services Digital Network", called RNIS in France)
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index c679867c2ccd..89562a845f6a 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -77,8 +77,6 @@ struct ackqueue_entry {
 };
 
 struct capiminor {
-        struct kref kref;
-
         unsigned int      minor;
 
         struct capi20_appl      *ap;
@@ -190,7 +188,20 @@ static void capiminor_del_all_ack(struct capiminor *mp)
 
 /* -------- struct capiminor ---------------------------------------- */
 
-static const struct tty_port_operations capiminor_port_ops; /* we have none */
+static void capiminor_destroy(struct tty_port *port)
+{
+        struct capiminor *mp = container_of(port, struct capiminor, port);
+
+        kfree_skb(mp->outskb);
+        skb_queue_purge(&mp->inqueue);
+        skb_queue_purge(&mp->outqueue);
+        capiminor_del_all_ack(mp);
+        kfree(mp);
+}
+
+static const struct tty_port_operations capiminor_port_ops = {
+        .destruct = capiminor_destroy,
+};
 
 static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
 {
@@ -204,8 +215,6 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
                 return NULL;
         }
 
-        kref_init(&mp->kref);
-
         mp->ap = ap;
         mp->ncci = ncci;
         INIT_LIST_HEAD(&mp->ackqueue);
@@ -247,21 +256,10 @@ err_out2:
         spin_unlock(&capiminors_lock);
 
 err_out1:
-        kfree(mp);
+        tty_port_put(&mp->port);
         return NULL;
 }
 
-static void capiminor_destroy(struct kref *kref)
-{
-        struct capiminor *mp = container_of(kref, struct capiminor, kref);
-
-        kfree_skb(mp->outskb);
-        skb_queue_purge(&mp->inqueue);
-        skb_queue_purge(&mp->outqueue);
-        capiminor_del_all_ack(mp);
-        kfree(mp);
-}
-
 static struct capiminor *capiminor_get(unsigned int minor)
 {
         struct capiminor *mp;
@@ -269,7 +267,7 @@ static struct capiminor *capiminor_get(unsigned int minor)
         spin_lock(&capiminors_lock);
         mp = capiminors[minor];
         if (mp)
-                kref_get(&mp->kref);
+                tty_port_get(&mp->port);
         spin_unlock(&capiminors_lock);
 
         return mp;
@@ -277,7 +275,7 @@ static struct capiminor *capiminor_get(unsigned int minor)
 
 static inline void capiminor_put(struct capiminor *mp)
 {
-        kref_put(&mp->kref, capiminor_destroy);
+        tty_port_put(&mp->port);
 }
 
 static void capiminor_free(struct capiminor *mp)
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 30a6b174fbb0..6849a11a1b24 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -507,6 +507,7 @@ void gigaset_freecs(struct cardstate *cs)
                 gig_dbg(DEBUG_INIT, "clearing at_state");
                 clear_at_state(&cs->at_state);
                 dealloc_temp_at_states(cs);
+                tty_port_destroy(&cs->port);
 
                 /* fall through */
         case 0: /* error in basic setup */
diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c
index a47637be0cc5..ddec47a911a0 100644
--- a/drivers/isdn/hisax/callc.c
+++ b/drivers/isdn/hisax/callc.c
@@ -35,7 +35,7 @@ static int chancount;
 /* experimental REJECT after ALERTING for CALLBACK to beat the 4s delay */
 #define ALERT_REJECT 0
 
-/* Value to delay the sending of the first B-channel paket after CONNECT
+/* Value to delay the sending of the first B-channel packet after CONNECT
  * here is no value given by ITU, but experience shows that 300 ms will
  * work on many networks, if you or your other side is behind local exchanges
  * a greater value may be recommented. If the delay is to short the first paket
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
index 2302fbe70ac6..9c6650ea848e 100644
--- a/drivers/isdn/i4l/Kconfig
+++ b/drivers/isdn/i4l/Kconfig
@@ -6,7 +6,7 @@ if ISDN_I4L
 
 config ISDN_PPP
         bool "Support synchronous PPP"
-        depends on INET && NETDEVICES
+        depends on INET
         select SLHC
         help
           Over digital connections such as ISDN, there is no need to
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 8c610fa6782b..e2a945ee9f05 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1312,7 +1312,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
                         } else
                                 return -EINVAL;
                         break;
-#ifdef CONFIG_NETDEVICES
                 case IIOCNETGPN:
                         /* Get peer phone number of a connected
                          * isdn network interface */
@@ -1322,7 +1321,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
                                 return isdn_net_getpeer(&phone, argp);
                         } else
                                 return -EINVAL;
-#endif
                 default:
                         return -EINVAL;
                 }
@@ -1352,7 +1350,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
                 case IIOCNETLCR:
                         printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n");
                         return -ENODEV;
-#ifdef CONFIG_NETDEVICES
                 case IIOCNETAIF:
                         /* Add a network-interface */
                         if (arg) {
@@ -1491,7 +1488,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
                                 return -EFAULT;
                         return isdn_net_force_hangup(name);
                         break;
-#endif                          /* CONFIG_NETDEVICES */
                 case IIOCSETVER:
                         dev->net_verbose = arg;
                         printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose);
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index b817809f763c..e09dc8a5e743 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1849,6 +1849,8 @@ err_unregister:
                 kfree(info->fax);
 #endif
                 kfree(info->port.xmit_buf - 4);
+                info->port.xmit_buf = NULL;
+                tty_port_destroy(&info->port);
         }
         tty_unregister_driver(m->tty_modem);
 err:
@@ -1870,6 +1872,8 @@ isdn_tty_exit(void)
                 kfree(info->fax);
 #endif
                 kfree(info->port.xmit_buf - 4);
+                info->port.xmit_buf = NULL;
+                tty_port_destroy(&info->port);
         }
         tty_unregister_driver(dev->mdm.tty_modem);
         put_tty_driver(dev->mdm.tty_modem);
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index db50f788855d..f8e405c383a0 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -277,7 +277,6 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
                   u16 timebase, u8 *buf, int len)
 {
         u8 *p;
-        int multi = 0;
         u8 frame[len + 32];
         struct socket *socket = NULL;
 
@@ -317,9 +316,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
                 *p++ = hc->id >> 8;
                 *p++ = hc->id;
         }
-        *p++ = (multi == 1) ? 0x80 : 0x00 + channel; /* m-flag, channel */
-        if (multi == 1)
-                *p++ = len; /* length */
+        *p++ =  0x00 + channel; /* m-flag, channel */
         *p++ = timebase >> 8; /* time base */
         *p++ = timebase;
 
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index be88728f1106..592f597d8951 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -250,7 +250,7 @@ tei_debug(struct FsmInst *fi, char *fmt, ...)
 static int
 get_free_id(struct manager *mgr)
 {
-        u64             ids = 0;
+        DECLARE_BITMAP(ids, 64) = { [0 ... BITS_TO_LONGS(64) - 1] = 0 };
         int             i;
         struct layer2   *l2;
 
@@ -261,11 +261,11 @@ get_free_id(struct manager *mgr)
                                __func__);
                         return -EBUSY;
                 }
-                test_and_set_bit(l2->ch.nr, (u_long *)&ids);
+                __set_bit(l2->ch.nr, ids);
         }
-        for (i = 1; i < 64; i++)
-                if (!test_bit(i, (u_long *)&ids))
-                        return i;
+        i = find_next_zero_bit(ids, 64, 1);
+        if (i < 64)
+                return i;
         printk(KERN_WARNING "%s: more as 63 layer2 for one device\n",
                __func__);
         return -EBUSY;
@@ -274,7 +274,7 @@ get_free_id(struct manager *mgr)
 static int
 get_free_tei(struct manager *mgr)
 {
-        u64             ids = 0;
+        DECLARE_BITMAP(ids, 64) = { [0 ... BITS_TO_LONGS(64) - 1] = 0 };
         int             i;
         struct layer2   *l2;
 
@@ -288,11 +288,11 @@ get_free_tei(struct manager *mgr)
                         continue;
                 i -= 64;
 
-                test_and_set_bit(i, (u_long *)&ids);
+                __set_bit(i, ids);
         }
-        for (i = 0; i < 64; i++)
-                if (!test_bit(i, (u_long *)&ids))
-                        return i + 64;
+        i = find_first_zero_bit(ids, 64);
+        if (i < 64)
+                return i + 64;
         printk(KERN_WARNING "%s: more as 63 dynamic tei for one device\n",
                __func__);
         return -1;