[PATCH] getting rid of all casts of k[cmz]alloc() calls

Run this:

	#!/bin/sh
	for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do
	  echo "De-casting $f..."
	  perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f
	done

And then go through and reinstate those cases where code is casting pointers
to non-pointers.

And then drop a few hunks which conflicted with outstanding work.

Cc: Russell King <rmk@arm.linux.org.uk>, Ian Molton <spyro@f2s.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Greg KH <greg@kroah.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Karsten Keil <kkeil@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Ian Kent <raven@themaw.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 2df5cf4ec743..e4a2f8f3a1d7 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1810,7 +1810,7 @@ static int dvd_read_disckey(struct cdrom_device_info *cdi, dvd_struct *s)
 
         size = sizeof(s->disckey.value) + 4;
 
-        if ((buf = (u_char *) kmalloc(size, GFP_KERNEL)) == NULL)
+        if ((buf = kmalloc(size, GFP_KERNEL)) == NULL)
                 return -ENOMEM;
 
         init_cdrom_command(&cgc, buf, size, CGC_DATA_READ);
@@ -1861,7 +1861,7 @@ static int dvd_read_manufact(struct cdrom_device_info *cdi, dvd_struct *s)
 
         size = sizeof(s->manufact.value) + 4;
 
-        if ((buf = (u_char *) kmalloc(size, GFP_KERNEL)) == NULL)
+        if ((buf = kmalloc(size, GFP_KERNEL)) == NULL)
                 return -ENOMEM;
 
         init_cdrom_command(&cgc, buf, size, CGC_DATA_READ);
@@ -2849,7 +2849,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
                 /* FIXME: we need upper bound checking, too!! */
                 if (lba < 0)
                         return -EINVAL;
-                cgc.buffer = (char *) kmalloc(blocksize, GFP_KERNEL);
+                cgc.buffer = kmalloc(blocksize, GFP_KERNEL);
                 if (cgc.buffer == NULL)
                         return -ENOMEM;
                 memset(&sense, 0, sizeof(sense));
@@ -3031,7 +3031,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
                 int size = sizeof(dvd_struct);
                 if (!CDROM_CAN(CDC_DVD))
                         return -ENOSYS;
-                if ((s = (dvd_struct *) kmalloc(size, GFP_KERNEL)) == NULL)
+                if ((s = kmalloc(size, GFP_KERNEL)) == NULL)
                         return -ENOMEM;
                 cdinfo(CD_DO_IOCTL, "entering DVD_READ_STRUCT\n"); 
                 if (copy_from_user(s, (dvd_struct __user *)arg, size)) {
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index e6d8e9ededea..b6c61bbb20e1 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1420,7 +1420,7 @@ int __init cm206_init(void)
                 return -EIO;
         }
         printk(" adapter at 0x%x", cm206_base);
-        cd = (struct cm206_struct *) kmalloc(size, GFP_KERNEL);
+        cd = kmalloc(size, GFP_KERNEL);
         if (!cd)
                goto out_base;
         /* Now we have found the adaptor card, try to reset it. As we have