瀏覽代碼

staging: vme: Remove NULL check before kfree

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>
Ilia Mirkin 14 年之前
父節點
當前提交
794a8946ba
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 1 2
      drivers/staging/vme/bridges/vme_ca91cx42.c
  2. 1 2
      drivers/staging/vme/bridges/vme_tsi148.c

+ 1 - 2
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) {
 	if (existing_size != 0) {
 		iounmap(image->kern_base);
 		iounmap(image->kern_base);
 		image->kern_base = NULL;
 		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);
 		release_resource(&image->bus_resource);
 		memset(&image->bus_resource, 0, sizeof(struct resource));
 		memset(&image->bus_resource, 0, sizeof(struct resource));
 	}
 	}

+ 1 - 2
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) {
 	if (existing_size != 0) {
 		iounmap(image->kern_base);
 		iounmap(image->kern_base);
 		image->kern_base = NULL;
 		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);
 		release_resource(&image->bus_resource);
 		memset(&image->bus_resource, 0, sizeof(struct resource));
 		memset(&image->bus_resource, 0, sizeof(struct resource));
 	}
 	}