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

Commit b2325fe1 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] kfree cleanup: arch 



This is the arch/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in arch/.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarGrant Grundler <grundler@parisc-linux.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f99d49ad

arch/arm/mach-integrator/impd1.c

+1 −2
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ static int impd1_probe(struct lm_device *dev) 
 free_impd1:

	if (impd1 && impd1->base)

		iounmap(impd1->base);

	if (impd1)

	kfree(impd1);

 release_lm:

	release_mem_region(dev->resource.start, SZ_4K);

arch/cris/arch-v32/drivers/cryptocop.c

+7 −7
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ struct file_operations cryptocop_fops = { 
static void free_cdesc(struct cryptocop_dma_desc *cdesc)

{

	DEBUG(printk("free_cdesc: cdesc 0x%p, from_pool=%d\n", cdesc, cdesc->from_pool));

	if (cdesc->free_buf) kfree(cdesc->free_buf);

	kfree(cdesc->free_buf);



	if (cdesc->from_pool) {

		unsigned long int flags;
@@ -2950,15 +2950,15 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig 
		put_page(outpages[i]);

	}



	if (digest_result) kfree(digest_result);

	if (inpages) kfree(inpages);

	if (outpages) kfree(outpages);

	kfree(digest_result);

	kfree(inpages);

	kfree(outpages);

	if (cop){

		if (cop->tfrm_op.indata) kfree(cop->tfrm_op.indata);

		if (cop->tfrm_op.outdata) kfree(cop->tfrm_op.outdata);

		kfree(cop->tfrm_op.indata);

		kfree(cop->tfrm_op.outdata);

		kfree(cop);

	}

	if (jc) kfree(jc);

	kfree(jc);



	DEBUG(print_lock_status());

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Diff line number Diff line
@@ -4940,7 +4940,7 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count) 
	if (call_made && PFM_CMD_RW_ARG(cmd) && copy_to_user(arg, args_k, base_sz*count)) ret = -EFAULT;



error_args:

	if (args_k) kfree(args_k);

	kfree(args_k);



	DPRINT(("cmd=%s ret=%ld\n", PFM_CMD_NAME(cmd), ret));

arch/powerpc/platforms/pseries/reconfig.c

+2 −4
Original line number Diff line number Diff line
@@ -286,9 +286,7 @@ static struct property *new_property(const char *name, const int length, 
	return new;



cleanup:

	if (new->name)

	kfree(new->name);

	if (new->value)

	kfree(new->value);

	kfree(new);

	return NULL;

arch/ppc/8xx_io/cs4218_tdm.c

+1 −2
Original line number Diff line number Diff line
@@ -1013,7 +1013,6 @@ static void CS_IrqCleanup(void) 
	*/

	cpm_free_handler(CPMVEC_SMC2);



	if (beep_buf)

	kfree(beep_buf);

	kd_mksound = orig_mksound;

}