Эх сурвалжийг харах

powerpc: Delete unnecessary checks before kfree()

The kfree() function tests whether its argument is NULL and then returns
immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Markus Elfring 10 жил өмнө
parent
commit
7f4eec3953

+ 1 - 1
arch/powerpc/lib/rheap.c

@@ -284,7 +284,7 @@ EXPORT_SYMBOL_GPL(rh_create);
  */
  */
 void rh_destroy(rh_info_t * info)
 void rh_destroy(rh_info_t * info)
 {
 {
-	if ((info->flags & RHIF_STATIC_BLOCK) == 0 && info->block != NULL)
+	if ((info->flags & RHIF_STATIC_BLOCK) == 0)
 		kfree(info->block);
 		kfree(info->block);
 
 
 	if ((info->flags & RHIF_STATIC_INFO) == 0)
 	if ((info->flags & RHIF_STATIC_INFO) == 0)

+ 2 - 3
arch/powerpc/platforms/cell/celleb_pci.c

@@ -393,11 +393,10 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
 
 error:
 error:
 	if (mem_init_done) {
 	if (mem_init_done) {
-		if (config && *config)
+		if (config)
 			kfree(*config);
 			kfree(*config);
-		if (res && *res)
+		if (res)
 			kfree(*res);
 			kfree(*res);
-
 	} else {
 	} else {
 		if (config && *config) {
 		if (config && *config) {
 			size = 256;
 			size = 256;