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

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

[PATCH] kfree cleanup: drivers/char 



This is the drivers/char/ part of the big kfree cleanup patch.

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

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fa671646

drivers/char/consolemap.c

+5 −7
Original line number Diff line number Diff line
@@ -345,14 +345,12 @@ static void con_release_unimap(struct uni_pagedir *p) 
	for (i = 0; i < 32; i++) {

		if ((p1 = p->uni_pgdir[i]) != NULL) {

			for (j = 0; j < 32; j++)

				if (p1[j])

				kfree(p1[j]);

			kfree(p1);

		}

		p->uni_pgdir[i] = NULL;

	}

	for (i = 0; i < 4; i++)

		if (p->inverse_translations[i]) {

	for (i = 0; i < 4; i++) {

		kfree(p->inverse_translations[i]);

		p->inverse_translations[i] = NULL;

	}

drivers/char/drm/ffb_context.c

+2 −4
Original line number Diff line number Diff line
@@ -526,10 +526,8 @@ int ffb_driver_rmctx(struct inode *inode, struct file *filp, unsigned int cmd, 
	if (idx < 0 || idx >= FFB_MAX_CTXS)

		return -EINVAL;



	if (fpriv->hw_state[idx] != NULL) {

	kfree(fpriv->hw_state[idx]);

	fpriv->hw_state[idx] = NULL;

	}

	return 0;

}

drivers/char/drm/ffb_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -245,13 +245,11 @@ static void ffb_driver_release(drm_device_t * dev, struct file *filp) 


static void ffb_driver_pretakedown(drm_device_t * dev)

{

	if (dev->dev_private)

	kfree(dev->dev_private);

}



static int ffb_driver_postcleanup(drm_device_t * dev)

{

	if (ffb_position != NULL)

	kfree(ffb_position);

	return 0;

}

drivers/char/ip2/i2ellis.c

+1 −3
Original line number Diff line number Diff line
@@ -106,10 +106,8 @@ iiEllisInit(void) 
static void

iiEllisCleanup(void)

{

	if ( pDelayTimer != NULL ) {

	kfree(pDelayTimer);

}

}



//******************************************************************************

// Function:   iiSetAddress(pB, address, delay)

drivers/char/istallion.c

+3 −4
Original line number Diff line number Diff line
@@ -860,9 +860,8 @@ static void __exit istallion_module_exit(void) 
	if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))

		printk("STALLION: failed to un-register serial memory device, "

			"errno=%d\n", -i);

	if (stli_tmpwritebuf != (char *) NULL)



	kfree(stli_tmpwritebuf);

	if (stli_txcookbuf != (char *) NULL)

	kfree(stli_txcookbuf);



	for (i = 0; (i < stli_nrbrds); i++) {