[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>
このコミットが含まれているのは:
@@ -231,7 +231,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sv=(struct sv11_device *)kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
|
||||
sv = kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
|
||||
if(!sv)
|
||||
goto fail3;
|
||||
|
||||
|
@@ -3455,7 +3455,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
if ((err = pci_enable_device(pdev)) < 0)
|
||||
return err;
|
||||
|
||||
card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
|
||||
card = kmalloc(sizeof(pc300_t), GFP_KERNEL);
|
||||
if (card == NULL) {
|
||||
printk("PC300 found at RAM 0x%016llx, "
|
||||
"but could not allocate card structure.\n",
|
||||
|
@@ -784,7 +784,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
|
||||
continue;
|
||||
}
|
||||
|
||||
new = (st_cpc_rx_buf *)kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
|
||||
new = kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
|
||||
if (new == 0) {
|
||||
cpc_tty_rx_disc_frame(pc300chan);
|
||||
continue;
|
||||
|
@@ -123,8 +123,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
|
||||
unsigned char *xbuff, *rbuff;
|
||||
int len = 2* newmtu;
|
||||
|
||||
xbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
|
||||
rbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
|
||||
xbuff = kmalloc(len + 4, GFP_ATOMIC);
|
||||
rbuff = kmalloc(len + 4, GFP_ATOMIC);
|
||||
|
||||
if (xbuff == NULL || rbuff == NULL)
|
||||
{
|
||||
@@ -465,11 +465,11 @@ static int x25_asy_open(struct net_device *dev)
|
||||
|
||||
len = dev->mtu * 2;
|
||||
|
||||
sl->rbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
|
||||
sl->rbuff = kmalloc(len + 4, GFP_KERNEL);
|
||||
if (sl->rbuff == NULL) {
|
||||
goto norbuff;
|
||||
}
|
||||
sl->xbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
|
||||
sl->xbuff = kmalloc(len + 4, GFP_KERNEL);
|
||||
if (sl->xbuff == NULL) {
|
||||
goto noxbuff;
|
||||
}
|
||||
|
新しいイシューから参照
ユーザーをブロックする