[PATCH 07/24] staging: hv: Remove NULL check before kfree

Ilia Mirkin imirkin at alum.mit.edu
Sun Mar 13 05:29:00 UTC 2011


This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 drivers/staging/hv/channel_mgmt.c |    3 +--
 drivers/staging/hv/connection.c   |    4 +---
 drivers/staging/hv/hv_mouse.c     |   12 ++++--------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 0781c0e..0fe4e2d 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -829,8 +829,7 @@ int vmbus_request_offers(void)
 
 
 cleanup:
-	if (msginfo)
-		kfree(msginfo);
+	kfree(msginfo);
 
 	return ret;
 }
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index f7df479..ece66bf 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -186,9 +186,7 @@ Cleanup:
 		vmbus_connection.monitor_pages = NULL;
 	}
 
-	if (msginfo) {
-		kfree(msginfo);
-	}
+	kfree(msginfo);
 
 	return ret;
 }
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 8f94f43..6fa4621 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -402,15 +402,11 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
 	return;
 
 Cleanup:
-	if (InputDevice->HidDesc) {
-		kfree(InputDevice->HidDesc);
-		InputDevice->HidDesc = NULL;
-	}
+	kfree(InputDevice->HidDesc);
+	InputDevice->HidDesc = NULL;
 
-	if (InputDevice->ReportDesc) {
-		kfree(InputDevice->ReportDesc);
-		InputDevice->ReportDesc = NULL;
-	}
+	kfree(InputDevice->ReportDesc);
+	InputDevice->ReportDesc = NULL;
 
 	InputDevice->DeviceInfoStatus = -1;
 	InputDevice->device_wait_condition = 1;
-- 
1.7.3.4




More information about the devel mailing list