3 files changed, 10 insertions, 15 deletions

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 93068697a9bf..b59553d28d13 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -652,7 +652,7 @@ jffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         lock_kernel();
 
         D3({
-                char *s = (char *)kmalloc(len + 1, GFP_KERNEL);
+                char *s = kmalloc(len + 1, GFP_KERNEL);
                 memcpy(s, name, len);
                 s[len] = '\0';
                 printk("jffs_lookup(): dir: 0x%p, name: \"%s\"\n", dir, s);
@@ -1173,8 +1173,8 @@ jffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
         lock_kernel();
         D1({
                 int len = dentry->d_name.len; 
-                char *_name = (char *)kmalloc(len + 1, GFP_KERNEL);
-                char *_symname = (char *)kmalloc(symname_len + 1, GFP_KERNEL);
+                char *_name = kmalloc(len + 1, GFP_KERNEL);
+                char *_symname = kmalloc(symname_len + 1, GFP_KERNEL);
                 memcpy(_name, dentry->d_name.name, len);
                 _name[len] = '\0';
                 memcpy(_symname, symname, symname_len);
@@ -1282,7 +1282,7 @@ jffs_create(struct inode *dir, struct dentry *dentry, int mode,
         lock_kernel();
         D1({
                 int len = dentry->d_name.len;
-                char *s = (char *)kmalloc(len + 1, GFP_KERNEL);
+                char *s = kmalloc(len + 1, GFP_KERNEL);
                 memcpy(s, dentry->d_name.name, len);
                 s[len] = '\0';
                 printk("jffs_create(): dir: 0x%p, name: \"%s\"\n", dir, s);
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 9000f1effedf..4a543e114970 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -488,13 +488,11 @@ jffs_create_file(struct jffs_control *c,
 {
         struct jffs_file *f;
 
-        if (!(f = (struct jffs_file *)kmalloc(sizeof(struct jffs_file),
-                                              GFP_KERNEL))) {
+        if (!(f = kzalloc(sizeof(*f), GFP_KERNEL))) {
                 D(printk("jffs_create_file(): Failed!\n"));
                 return NULL;
         }
         no_jffs_file++;
-        memset(f, 0, sizeof(struct jffs_file));
         f->ino = raw_inode->ino;
         f->pino = raw_inode->pino;
         f->nlink = raw_inode->nlink;
@@ -516,7 +514,7 @@ jffs_create_control(struct super_block *sb)
 
         D2(printk("jffs_create_control()\n"));
 
-        if (!(c = (struct jffs_control *)kmalloc(s, GFP_KERNEL))) {
+        if (!(c = kmalloc(s, GFP_KERNEL))) {
                 goto fail_control;
         }
         DJM(no_jffs_control++);
@@ -524,7 +522,7 @@ jffs_create_control(struct super_block *sb)
         c->gc_task = NULL;
         c->hash_len = JFFS_HASH_SIZE;
         s = sizeof(struct list_head) * c->hash_len;
-        if (!(c->hash = (struct list_head *)kmalloc(s, GFP_KERNEL))) {
+        if (!(c->hash = kmalloc(s, GFP_KERNEL))) {
                 goto fail_hash;
         }
         DJM(no_hash++);
@@ -593,8 +591,7 @@ jffs_add_virtual_root(struct jffs_control *c)
         D2(printk("jffs_add_virtual_root(): "
                   "Creating a virtual root directory.\n"));
 
-        if (!(root = (struct jffs_file *)kmalloc(sizeof(struct jffs_file),
-                                                 GFP_KERNEL))) {
+        if (!(root = kmalloc(sizeof(struct jffs_file), GFP_KERNEL))) {
                 return -ENOMEM;
         }
         no_jffs_file++;
diff --git a/fs/jffs/jffs_fm.c b/fs/jffs/jffs_fm.c
index 7d8ca1aeace2..29b68d939bd9 100644
--- a/fs/jffs/jffs_fm.c
+++ b/fs/jffs/jffs_fm.c
@@ -94,8 +94,7 @@ jffs_build_begin(struct jffs_control *c, int unit)
         struct mtd_info *mtd;
         
         D3(printk("jffs_build_begin()\n"));
-        fmc = (struct jffs_fmcontrol *)kmalloc(sizeof(struct jffs_fmcontrol),
-                                               GFP_KERNEL);
+        fmc = kmalloc(sizeof(*fmc), GFP_KERNEL);
         if (!fmc) {
                 D(printk("jffs_build_begin(): Allocation of "
                          "struct jffs_fmcontrol failed!\n"));
@@ -486,8 +485,7 @@ jffs_add_node(struct jffs_node *node)
 
         D3(printk("jffs_add_node(): ino = %u\n", node->ino));
 
-        ref = (struct jffs_node_ref *)kmalloc(sizeof(struct jffs_node_ref),
-                                              GFP_KERNEL);
+        ref = kmalloc(sizeof(*ref), GFP_KERNEL);
         if (!ref)
                 return -ENOMEM;