Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbded58 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0743b868

arch/arm/kernel/apm.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int apm_open(struct inode * inode, struct file * filp) 
{

	struct apm_user *as;



	as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);

	as = kzalloc(sizeof(*as), GFP_KERNEL);

	if (as) {

		/*

		 * XXX - this is a tiny bit broken, when we consider BSD

arch/arm/kernel/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num) 
		}

		if (c_id(&excd) == 0x80) { /* loader */

			if (!ec->loader) {

				ec->loader = (loader_t)kmalloc(c_len(&excd),

				ec->loader = kmalloc(c_len(&excd),

							       GFP_KERNEL);

				if (ec->loader)

					ecard_readbytes(ec->loader, ec,

arch/arm26/kernel/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num) 
		}

		if (c_id(&excd) == 0x80) { /* loader */

			if (!ec->loader) {

				ec->loader = (loader_t)kmalloc(c_len(&excd),

				ec->loader = kmalloc(c_len(&excd),

							       GFP_KERNEL);

				if (ec->loader)

					ecard_readbytes(ec->loader, ec,

arch/arm26/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_ 
	    (irq_flags & IRQF_SHARED && !dev_id))

		return -EINVAL;



	action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);

	action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);

	if (!action)

		return -ENOMEM;

arch/cris/arch-v10/drivers/axisflashmap.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int __init init_axis_flash(void) 
#else

		struct mtd_info *mtd_ram;



		mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),

		mtd_ram = kmalloc(sizeof(struct mtd_info),

						     GFP_KERNEL);

		if (!mtd_ram) {

			panic("axisflashmap couldn't allocate memory for "