[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: Jesper Juhl <jesper.juhl@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Acked-by: Joern Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

20 files changed, 32 insertions, 63 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 0cfcd88468e0..c3fc9b2f21fb 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -455,8 +455,7 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
 
  setup_err:
         if(mtd) {
-                if(mtd->eraseregions)
-                        kfree(mtd->eraseregions);
+                kfree(mtd->eraseregions);
                 kfree(mtd);
         }
         kfree(cfi->cmdset_priv);
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 8505f118f2db..0e6475050da9 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -378,8 +378,7 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
 
  setup_err:
         if(mtd) {
-                if(mtd->eraseregions)
-                        kfree(mtd->eraseregions);
+                kfree(mtd->eraseregions);
                 kfree(mtd);
         }
         kfree(cfi->cmdset_priv);
@@ -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);
diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c
index 662e807801ed..59a29e616a22 100644
--- a/drivers/mtd/devices/blkmtd.c
+++ b/drivers/mtd/devices/blkmtd.c
@@ -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);
-
+                kfree(dev->mtd_info.eraseregions);
+                kfree(dev->mtd_info.name);
                 if(dev->blkdev) {
                         invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);
                         close_bdev_excl(dev->blkdev);
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 39eb53f6551f..8db65bf029ea 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -126,10 +126,8 @@ 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->PUtable);
+                kfree(inftl->VUtable);
                 kfree(inftl);
                 return;
         }
@@ -147,10 +145,8 @@ 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->PUtable);
+        kfree(inftl->VUtable);
         kfree(inftl);
 }
 
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index e8a900a77685..9a64149f431d 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -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);
-        }
+        kfree(map);
         /* See if I have any map structures */
         if (list_empty(&window->maps)) {
                 amd76xrom_cleanup(window);
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index bfe994e59265..8c19d722ac79 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -104,8 +104,7 @@ static int bast_flash_remove(struct device *dev)
                 map_destroy(info->mtd);
         }
 
-        if (info->partitions)
-                kfree(info->partitions);
+        kfree(info->partitions);
 
         if (info->area) {
                 release_resource(info->area);
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index c68b31dc7e6d..5a95ab370a97 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -313,8 +313,7 @@ static void __init clps_locate_partitions(struct mtd_info *mtd)
 
 static void __exit clps_destroy_partitions(void)
 {
-        if (parsed_parts)
-                kfree(parsed_parts);
+        kfree(parsed_parts);
 }
 
 static struct mtd_info *mymtd;
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index e505207cd489..c5e2111ba146 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -306,9 +306,8 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
 
  out:
         /* Free any left over map structures */
-        if (map) {
-                kfree(map);
-        }
+        kfree(map);
+
         /* See if I have any map structures */
         if (list_empty(&window->maps)) {
                 ichxrom_cleanup(window);
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index d14a0185b8f4..93f50d6d5488 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -148,8 +148,7 @@ static int armflash_probe(struct device *_dev)
                         del_mtd_partitions(info->mtd);
                         map_destroy(info->mtd);
                 }
-                if (info->parts)
-                        kfree(info->parts);
+                kfree(info->parts);
 
  no_device:
                 iounmap(base);
@@ -176,8 +175,7 @@ static int armflash_remove(struct device *_dev)
                         del_mtd_partitions(info->mtd);
                         map_destroy(info->mtd);
                 }
-                if (info->parts)
-                        kfree(info->parts);
+                kfree(info->parts);
 
                 iounmap(info->map.virt);
                 release_resource(info->res);
diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
index 712401810841..70b0e0b82c34 100644
--- a/drivers/mtd/maps/ipaq-flash.c
+++ b/drivers/mtd/maps/ipaq-flash.c
@@ -431,8 +431,7 @@ static void __exit ipaq_mtd_cleanup(void)
                                 if (my_sub_mtd[i])
                                         map_destroy(my_sub_mtd[i]);
                         }
-                if (parsed_parts)
-                        kfree(parsed_parts);
+                kfree(parsed_parts);
         }
 }
 
diff --git a/drivers/mtd/maps/iq80310.c b/drivers/mtd/maps/iq80310.c
index 558d014e7acc..2e7577492a2c 100644
--- a/drivers/mtd/maps/iq80310.c
+++ b/drivers/mtd/maps/iq80310.c
@@ -103,8 +103,7 @@ static void __exit cleanup_iq80310(void)
         if (mymtd) {
                 del_mtd_partitions(mymtd);
                 map_destroy(mymtd);
-                if (parsed_parts)
-                        kfree(parsed_parts);
+                kfree(parsed_parts);
         }
         if (iq80310_map.virt)
                 iounmap((void *)iq80310_map.virt);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 00b9f67580f1..6f36497022d1 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -129,8 +129,7 @@ static int ixp2000_flash_remove(struct device *_dev)
         if (info->map.map_priv_1)
                 iounmap((void *) info->map.map_priv_1);
 
-        if (info->partitions) {
-                kfree(info->partitions); }
+        kfree(info->partitions);
 
         if (info->res) {
                 release_resource(info->res);
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 733a9297a562..0d87c02dee04 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -124,8 +124,7 @@ static int ixp4xx_flash_remove(struct device *_dev)
         if (info->map.map_priv_1)
                 iounmap((void *) info->map.map_priv_1);
 
-        if (info->partitions)
-                kfree(info->partitions);
+        kfree(info->partitions);
 
         if (info->res) {
                 release_resource(info->res);
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index 2337e0c46750..2b4c5058787d 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -158,8 +158,7 @@ static void __exit cleanup_lubbock(void)
                 if (lubbock_maps[i].cached)
                         iounmap(lubbock_maps[i].cached);
 
-                if (parsed_parts[i])
-                        kfree(parsed_parts[i]);
+                kfree(parsed_parts[i]);
         }
 }
 
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c
index da36e8dddd17..763304154a92 100644
--- a/drivers/mtd/maps/omap-toto-flash.c
+++ b/drivers/mtd/maps/omap-toto-flash.c
@@ -124,8 +124,7 @@ static void  __exit omap_toto_mtd_cleanup(void)
         if (flash_mtd) {
                 del_mtd_partitions(flash_mtd);
                 map_destroy(flash_mtd);
-                if (parsed_parts)
-                        kfree(parsed_parts);
+                kfree(parsed_parts);
         }
 }
 
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index c8d0da19d897..a31f6ee8a4be 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -241,8 +241,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
 #endif
         }
 
-        if (info->parts)
-                kfree(info->parts);
+        kfree(info->parts);
 
         for (i = info->num_subdev - 1; i >= 0; i--)
                 sa1100_destroy_subdev(&info->subdev[i]);
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 29091d10030a..1355c28f90a4 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -166,9 +166,7 @@ static void __exit uflash_cleanup(void)
                         iounmap(udev->map.virt);
                         udev->map.virt = NULL;
                 }
-                if(0 != udev->name) {
-                        kfree(udev->name);
-                }
+                kfree(udev->name);
                 kfree(udev);
         }       
 }
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 4e28b977f224..0aca8179f27f 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -224,10 +224,8 @@ int __init init_tqm_mtd(void)
 error_mem:
         for(idx = 0 ; idx < FLASH_BANK_MAX ; idx++) {
                 if(map_banks[idx] != NULL) {
-                        if(map_banks[idx]->name != NULL) {
-                                kfree(map_banks[idx]->name);
-                                map_banks[idx]->name = NULL;
-                        }
+                        kfree(map_banks[idx]->name);
+                        map_banks[idx]->name = NULL;
                         kfree(map_banks[idx]);
                         map_banks[idx] = NULL;
                 }
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 04e54318bc6a..8e78d7b96a56 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2676,9 +2676,8 @@ void nand_release (struct mtd_info *mtd)
         /* Deregister the device */
         del_mtd_device (mtd);
 
-        /* Free bad block table memory, if allocated */
-        if (this->bbt)
-                kfree (this->bbt);
+        /* Free bad block table memory */
+        kfree (this->bbt);
         /* Buffer allocated by nand_scan ? */
         if (this->options & NAND_OOBBUF_ALLOC)
                 kfree (this->oob_buf);
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index b2014043634f..062ff3877536 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -114,10 +114,8 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         }
 
         if (add_mtd_blktrans_dev(&nftl->mbd)) {
-                if (nftl->ReplUnitTable)
-                        kfree(nftl->ReplUnitTable);
-                if (nftl->EUNtable)
-                        kfree(nftl->EUNtable);
+                kfree(nftl->ReplUnitTable);
+                kfree(nftl->EUNtable);
                 kfree(nftl);
                 return;
         }
@@ -133,10 +131,8 @@ static void nftl_remove_dev(struct mtd_blktrans_dev *dev)
         DEBUG(MTD_DEBUG_LEVEL1, "NFTL: remove_dev (i=%d)\n", dev->devnum);
 
         del_mtd_blktrans_dev(dev);
-        if (nftl->ReplUnitTable)
-                kfree(nftl->ReplUnitTable);
-        if (nftl->EUNtable)
-                kfree(nftl->EUNtable);
+        kfree(nftl->ReplUnitTable);
+        kfree(nftl->EUNtable);
         kfree(nftl);
 }