mtd: chips/cfi, remove unneeded NULL checks

PATCH In review [email protected] 1 participant 1 message Feb 2, 2010 Memory technology devices (MTD)

lore

Share & tools

lore

[email protected]

author

2010-02-02 22:43 UTC #0 lore raw

PATCH 3/5 mtd: chips/cfi, remove unneeded NULL checks

From: Jiri Slaby <[email protected]>

In cfi_intelext_setup and cfi_amdstd_setup, mtd is never NULL. Remove unnecessary checks.

Signed-off-by Jiri Slaby <[email protected]>

Cc David Woodhouse <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/mtd/chips/cfi_cmdset_0001.c |    6 ++----
 drivers/mtd/chips/cfi_cmdset_0002.c |    6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

drivers/mtd/chips/cfi_cmdset_0001.c renamed from drivers/mtd/chips/cfi_cmdset_0001.c~mtd-chips-cfi-remove-unneeded-null-checks +2 -4

diff -puN drivers/mtd/chips/cfi_cmdset_0001.c~mtd-chips-cfi-remove-unneeded-null-checks drivers/mtd/chips/cfi_cmdset_0001.c
@@ -615,10 +615,8 @@ static struct mtd_info *cfi_intelext_set
 	return mtd;
 
  setup_err:
-	if(mtd) {
-		kfree(mtd->eraseregions);
-		kfree(mtd);
-	}
+	kfree(mtd->eraseregions);
+	kfree(mtd);
 	kfree(cfi->cmdset_priv);
 	return NULL;
 }

drivers/mtd/chips/cfi_cmdset_0002.c renamed from drivers/mtd/chips/cfi_cmdset_0002.c~mtd-chips-cfi-remove-unneeded-null-checks +2 -4

diff -puN drivers/mtd/chips/cfi_cmdset_0002.c~mtd-chips-cfi-remove-unneeded-null-checks drivers/mtd/chips/cfi_cmdset_0002.c
@@ -494,10 +494,8 @@ static struct mtd_info *cfi_amdstd_setup
 	return mtd;
 
  setup_err:
-	if(mtd) {
-		kfree(mtd->eraseregions);
-		kfree(mtd);
-	}
+	kfree(mtd->eraseregions);
+	kfree(mtd);
 	kfree(cfi->cmdset_priv);
 	kfree(cfi->cfiq);
 	return NULL;