Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756232Ab1CMFas (ORCPT <rfc822;w@1wt.eu>);
	Sun, 13 Mar 2011 00:30:48 -0500
Received: from mail-qy0-f174.google.com ([209.85.216.174]:59333 "EHLO
	mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752631Ab1CMF35 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 13 Mar 2011 00:29:57 -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=wimQVqCSY2E2wo1dQstAvJLkzBXKoQjLrxIbAH6xnGzvom2zSWw/LyXSZ59CeY7NxO
         lJKrSutKKEafYaTBkAjEFw6oAGQZyAnd2kanFhn/XuzxQWkDuKSNcvpCN3oCYbV+BgHU
         dUnzQ5g4yyD8ds8gUyK/picQhoV10KBZFlco8=
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 20/24] staging: vme: Remove NULL check before kfree
Date: Sun, 13 Mar 2011 00:29:13 -0500
Message-Id: <1299994157-11191-21-git-send-email-imirkin@alum.mit.edu>
X-Mailer: git-send-email 1.7.3.4
In-Reply-To: <1299994157-11191-20-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>
 <1299994157-11191-8-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-9-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-10-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-11-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-12-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-13-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-14-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-15-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-16-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-17-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-18-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-19-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-20-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: 1946
Lines: 54

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/vme/bridges/vme_ca91cx42.c |    3 +--
 drivers/staging/vme/bridges/vme_tsi148.c   |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 5d734d9..d4a48c4 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -516,8 +516,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
 	if (existing_size != 0) {
 		iounmap(image->kern_base);
 		image->kern_base = NULL;
-		if (image->bus_resource.name != NULL)
-			kfree(image->bus_resource.name);
+		kfree(image->bus_resource.name);
 		release_resource(&image->bus_resource);
 		memset(&image->bus_resource, 0, sizeof(struct resource));
 	}
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index 2df19ea..b00a53e 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -821,8 +821,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
 	if (existing_size != 0) {
 		iounmap(image->kern_base);
 		image->kern_base = NULL;
-		if (image->bus_resource.name != NULL)
-			kfree(image->bus_resource.name);
+		kfree(image->bus_resource.name);
 		release_resource(&image->bus_resource);
 		memset(&image->bus_resource, 0, sizeof(struct resource));
 	}
-- 
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/