7 files changed, 17 insertions, 32 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 0dd6c2b5391b..d0a4bab220e5 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -704,8 +704,7 @@ static void crypt_dtr(struct dm_target *ti)
         mempool_destroy(cc->page_pool);
         mempool_destroy(cc->io_pool);
 
-        if (cc->iv_mode)
-                kfree(cc->iv_mode);
+        kfree(cc->iv_mode);
         if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
                 cc->iv_gen_ops->dtr(cc);
         crypto_free_tfm(cc->tfm);
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b1941b887f46..8d740013d74d 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -217,8 +217,7 @@ static int linear_run (mddev_t *mddev)
         return 0;
 
 out:
-        if (conf)
-                kfree(conf);
+        kfree(conf);
         return 1;
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 65fab74ad737..0c6b5b6baff6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -195,8 +195,7 @@ static mddev_t * mddev_find(dev_t unit)
                 if (mddev->unit == unit) {
                         mddev_get(mddev);
                         spin_unlock(&all_mddevs_lock);
-                        if (new)
-                                kfree(new);
+                        kfree(new);
                         return mddev;
                 }
 
@@ -458,11 +457,8 @@ static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2)
                 ret = 1;
 
 abort:
-        if (tmp1)
-                kfree(tmp1);
-        if (tmp2)
-                kfree(tmp2);
-
+        kfree(tmp1);
+        kfree(tmp2);
         return ret;
 }
 
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 2ae2d709cb15..2d2ca7fa0265 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -533,8 +533,7 @@ static int multipath_run (mddev_t *mddev)
 out_free_conf:
         if (conf->pool)
                 mempool_destroy(conf->pool);
-        if (conf->multipaths)
-                kfree(conf->multipaths);
+        kfree(conf->multipaths);
         kfree(conf);
         mddev->private = NULL;
 out:
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index e7d934eca06f..e11dd14d0b43 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -371,10 +371,8 @@ static int raid0_run (mddev_t *mddev)
         return 0;
 
 out_free_conf:
-        if (conf->strip_zone)
-                kfree(conf->strip_zone);
-        if (conf->devlist)
-                kfree (conf->devlist);
+        kfree(conf->strip_zone);
+        kfree(conf->devlist);
         kfree(conf);
         mddev->private = NULL;
 out:
@@ -386,11 +384,11 @@ static int raid0_stop (mddev_t *mddev)
         raid0_conf_t *conf = mddev_to_conf(mddev);
 
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
-        kfree (conf->hash_table);
+        kfree(conf->hash_table);
         conf->hash_table = NULL;
-        kfree (conf->strip_zone);
+        kfree(conf->strip_zone);
         conf->strip_zone = NULL;
-        kfree (conf);
+        kfree(conf);
         mddev->private = NULL;
 
         return 0;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 98b09773e79e..ff1dbec864af 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1427,10 +1427,8 @@ out_free_conf:
         if (conf) {
                 if (conf->r1bio_pool)
                         mempool_destroy(conf->r1bio_pool);
-                if (conf->mirrors)
-                        kfree(conf->mirrors);
-                if (conf->poolinfo)
-                        kfree(conf->poolinfo);
+                kfree(conf->mirrors);
+                kfree(conf->poolinfo);
                 kfree(conf);
                 mddev->private = NULL;
         }
@@ -1447,10 +1445,8 @@ static int stop(mddev_t *mddev)
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
         if (conf->r1bio_pool)
                 mempool_destroy(conf->r1bio_pool);
-        if (conf->mirrors)
-                kfree(conf->mirrors);
-        if (conf->poolinfo)
-                kfree(conf->poolinfo);
+        kfree(conf->mirrors);
+        kfree(conf->poolinfo);
         kfree(conf);
         mddev->private = NULL;
         return 0;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index fd7324a86d13..62ebb1bc72be 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1737,8 +1737,7 @@ static int run(mddev_t *mddev)
 out_free_conf:
         if (conf->r10bio_pool)
                 mempool_destroy(conf->r10bio_pool);
-        if (conf->mirrors)
-                kfree(conf->mirrors);
+        kfree(conf->mirrors);
         kfree(conf);
         mddev->private = NULL;
 out:
@@ -1754,8 +1753,7 @@ static int stop(mddev_t *mddev)
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
         if (conf->r10bio_pool)
                 mempool_destroy(conf->r10bio_pool);
-        if (conf->mirrors)
-                kfree(conf->mirrors);
+        kfree(conf->mirrors);
         kfree(conf);
         mddev->private = NULL;
         return 0;