Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753292Ab1CMFaE (ORCPT <rfc822;w@1wt.eu>);
	Sun, 13 Mar 2011 00:30:04 -0500
Received: from mail-qy0-f181.google.com ([209.85.216.181]:60998 "EHLO
	mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751438Ab1CMF3e (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 13 Mar 2011 00:29:34 -0500
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
         :references;
        b=FAhf0jgvO4cKfnlzWktQtIby0w1SBRE9s+3Ty/qBL+QfXg4oJer1ieuTt/nQvPODmz
         BptcDOyVnGnCW/nL5c3pwYnklgS/Ly6/u2qZB5BQP1CN21ST+zBcHwHILqeG4VuDv8XE
         bdEkkZBaUx49y2I81LB7sZXEtfkYdAs4kbnQ4=
From: Ilia Mirkin <imirkin@alum.mit.edu>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 07/24] staging: hv: Remove NULL check before kfree
Date: Sun, 13 Mar 2011 00:29:00 -0500
Message-Id: <1299994157-11191-8-git-send-email-imirkin@alum.mit.edu>
X-Mailer: git-send-email 1.7.3.4
In-Reply-To: <1299994157-11191-7-git-send-email-imirkin@alum.mit.edu>
References: <20110222145452.GD1331@suse.de>
 <1299994157-11191-1-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-2-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-3-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-4-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-5-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-6-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-7-git-send-email-imirkin@alum.mit.edu>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2130
Lines: 80

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@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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/