staging: vme: Remove NULL check before kfree
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 13 Mar 2011 05:29:13 +0000 (00:29 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Mar 2011 18:57:37 +0000 (11:57 -0700)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vme/bridges/vme_ca91cx42.c
drivers/staging/vme/bridges/vme_tsi148.c

index 5d734d9..d4a48c4 100644 (file)
@@ -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));
        }
index 2df19ea..b00a53e 100644 (file)
@@ -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));
        }