[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>
This commit is contained in:
committed by
Linus Torvalds
parent
0743b86800
commit
5cbded585d
@@ -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)) {
|
||||
|
Reference in New Issue
Block a user