From 306be9e1c167dcd7d6635bd434ee8e63ab22a5d6 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 13 Mar 2011 00:29:01 -0500 Subject: staging: keucr: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/keucr/ms.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'drivers/staging/keucr') diff --git a/drivers/staging/keucr/ms.c b/drivers/staging/keucr/ms.c index 48496e4da42..a7137217cf8 100644 --- a/drivers/staging/keucr/ms.c +++ b/drivers/staging/keucr/ms.c @@ -244,8 +244,8 @@ int MS_CardInit(struct us_data *us) result = MS_STATUS_SUCCESS; exit: - if (PageBuffer1) kfree(PageBuffer1); - if (PageBuffer0) kfree(PageBuffer0); + kfree(PageBuffer1); + kfree(PageBuffer0); printk("MS_CardInit end\n"); return result; @@ -280,7 +280,7 @@ int MS_LibCheckDisableBlock(struct us_data *us, WORD PhyBlock) } while(1); exit: - if (PageBuf) kfree(PageBuf); + kfree(PageBuf); return result; } @@ -324,17 +324,11 @@ void MS_LibFreeWriteBuf(struct us_data *us) //----- MS_LibFreeLogicalMap() --------------------------------------- int MS_LibFreeLogicalMap(struct us_data *us) { - if (us->MS_Lib.Phy2LogMap) - { - kfree(us->MS_Lib.Phy2LogMap); - us->MS_Lib.Phy2LogMap = NULL; - } + kfree(us->MS_Lib.Phy2LogMap); + us->MS_Lib.Phy2LogMap = NULL; - if (us->MS_Lib.Log2PhyMap) - { - kfree(us->MS_Lib.Log2PhyMap); - us->MS_Lib.Log2PhyMap = NULL; - } + kfree(us->MS_Lib.Log2PhyMap); + us->MS_Lib.Log2PhyMap = NULL; return 0; } @@ -470,7 +464,7 @@ int MS_LibProcessBootBlock(struct us_data *us, WORD PhyBlock, BYTE *PageData) exit: if (result) MS_LibFreeLogicalMap(us); - if (PageBuffer) kfree(PageBuffer); + kfree(PageBuffer); result = 0; return result; -- cgit v1.2.3