Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

4 files changed, 12 insertions, 20 deletions

diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c
index c401634c00ec..3e245712bba7 100644
--- a/drivers/isdn/mISDN/core.c
+++ b/drivers/isdn/mISDN/core.c
@@ -140,7 +140,6 @@ static struct device_attribute mISDN_dev_attrs[] = {
         {}
 };
 
-#ifdef CONFIG_HOTPLUG
 static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct mISDNdevice *mdev = dev_to_mISDN(dev);
@@ -153,7 +152,6 @@ static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env)
 
         return 0;
 }
-#endif
 
 static void mISDN_class_release(struct class *cls)
 {
@@ -163,9 +161,7 @@ static void mISDN_class_release(struct class *cls)
 static struct class mISDN_class = {
         .name = "mISDN",
         .owner = THIS_MODULE,
-#ifdef CONFIG_HOTPLUG
         .dev_uevent = mISDN_uevent,
-#endif
         .dev_attrs = mISDN_dev_attrs,
         .dev_release = mISDN_dev_release,
         .class_release = mISDN_class_release,
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 28c99c623bcd..22b720ec80cb 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -1217,8 +1217,7 @@ static void __exit dsp_cleanup(void)
 {
         mISDN_unregister_Bprotocol(&DSP);
 
-        if (timer_pending(&dsp_spl_tl))
-                del_timer(&dsp_spl_tl);
+        del_timer_sync(&dsp_spl_tl);
 
         if (!list_empty(&dsp_ilist)) {
                 printk(KERN_ERR "mISDN_dsp: Audio DSP object inst list not "
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index d67126dbbb04..2c0d2c2bf946 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;