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

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

[PATCH] kfree cleanup: drivers/mtd 



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

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

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Acked-by: default avatarJoern Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c9475cb0

drivers/mtd/chips/cfi_cmdset_0001.c

+1 −2
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd) 


 setup_err:

	if(mtd) {

		if(mtd->eraseregions)

		kfree(mtd->eraseregions);

		kfree(mtd);

	}

drivers/mtd/chips/cfi_cmdset_0002.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd) 


 setup_err:

	if(mtd) {

		if(mtd->eraseregions)

		kfree(mtd->eraseregions);

		kfree(mtd);

	}
@@ -1742,6 +1741,7 @@ static void cfi_amdstd_destroy(struct mtd_info *mtd) 
{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;



	kfree(cfi->cmdset_priv);

	kfree(cfi->cfiq);

	kfree(cfi);

drivers/mtd/devices/blkmtd.c

+2 −5
Original line number Diff line number Diff line
@@ -539,11 +539,8 @@ static void free_device(struct blkmtd_dev *dev) 
{

	DEBUG(2, "blkmtd: free_device() dev = %p\n", dev);

	if(dev) {

		if(dev->mtd_info.eraseregions)

		kfree(dev->mtd_info.eraseregions);

		if(dev->mtd_info.name)

		kfree(dev->mtd_info.name);



		if(dev->blkdev) {

			invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);

			close_bdev_excl(dev->blkdev);

drivers/mtd/inftlcore.c

+4 −8
Original line number Diff line number Diff line
@@ -126,9 +126,7 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	}



	if (add_mtd_blktrans_dev(&inftl->mbd)) {

		if (inftl->PUtable)

		kfree(inftl->PUtable);

		if (inftl->VUtable)

		kfree(inftl->VUtable);

		kfree(inftl);

		return;
@@ -147,9 +145,7 @@ static void inftl_remove_dev(struct mtd_blktrans_dev *dev) 


	del_mtd_blktrans_dev(dev);



	if (inftl->PUtable)

	kfree(inftl->PUtable);

	if (inftl->VUtable)

	kfree(inftl->VUtable);

	kfree(inftl);

}

drivers/mtd/maps/amd76xrom.c

+1 −3
Original line number Diff line number Diff line
@@ -259,9 +259,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev, 


 out:

	/* Free any left over map structures */

	if (map) {

	kfree(map);

	}

	/* See if I have any map structures */

	if (list_empty(&window->maps)) {

		amd76xrom_cleanup(window);