Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...

[linux-2.6-omap-h63xx.git] / drivers / isdn / i4l / isdn_bsdcomp.c

diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index baf4bcad9bf93a825c34941ea57e9f244b1d5bff..02d9918705dd5d70a96f538e6244e641f4dc9bca 100644 (file)
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -56,7 +56,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>
@@ -283,23 +282,19 @@ static void bsd_free (void *state)
                /*
                 * Release the dictionary
                 */
-               if (db->dict) {
-                       vfree (db->dict);
-                       db->dict = NULL;
-               }
+               vfree(db->dict);
+               db->dict = NULL;
 
                /*
                 * Release the string buffer
                 */
-               if (db->lens) {
-                       vfree (db->lens);
-                       db->lens = NULL;
-               }
+               vfree(db->lens);
+               db->lens = NULL;
 
                /*
                 * Finally release the structure itself.
                 */
-               kfree (db);
+               kfree(db);
        }
 }
 
@@ -335,12 +330,10 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
         * Allocate the main control structure for this instance.
         */
        maxmaxcode = MAXCODE(bits);
-       db = (struct bsd_db *) kmalloc (sizeof (struct bsd_db),GFP_KERNEL);
+       db = kzalloc (sizeof (struct bsd_db),GFP_KERNEL);
        if (!db)
                return NULL;
 
-       memset (db, 0, sizeof(struct bsd_db));
-
        db->xmit = data->flags & IPPP_COMP_FLAG_XMIT;
        decomp = db->xmit ? 0 : 1;
 
@@ -348,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
         * Allocate space for the dictionary. This may be more than one page in
         * length.
         */
-       db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict));
+       db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
        if (!db->dict) {
                bsd_free (db);
                return NULL;
@@ -361,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
        if (!decomp)
                db->lens = NULL;
        else {
-               db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *
-                       sizeof (db->lens[0]));
+               db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
                if (!db->lens) {
                        bsd_free (db);
                        return (NULL);