aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-02-03 07:55:53 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-03-16 03:50:14 -0400
commit7f4eec395351ef25166276ad9dc3390b83ab41b6 (patch)
tree9c56c2acc95efa338ced09b2bdefd0ac9d194e2f
parent7e73a3b7f34240871fa5556d952e801178970741 (diff)
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>
-rw-r--r--arch/powerpc/lib/rheap.c2
-rw-r--r--arch/powerpc/platforms/cell/celleb_pci.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index a1060a868e69..69abf844c2c3 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -284,7 +284,7 @@ EXPORT_SYMBOL_GPL(rh_create);
284 */ 284 */
285void rh_destroy(rh_info_t * info) 285void rh_destroy(rh_info_t * info)
286{ 286{
287 if ((info->flags & RHIF_STATIC_BLOCK) == 0 && info->block != NULL) 287 if ((info->flags & RHIF_STATIC_BLOCK) == 0)
288 kfree(info->block); 288 kfree(info->block);
289 289
290 if ((info->flags & RHIF_STATIC_INFO) == 0) 290 if ((info->flags & RHIF_STATIC_INFO) == 0)
diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index 3ce70ded2d6a..9b11b5dd8b7c 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -393,11 +393,10 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
393 393
394error: 394error:
395 if (mem_init_done) { 395 if (mem_init_done) {
396 if (config && *config) 396 if (config)
397 kfree(*config); 397 kfree(*config);
398 if (res && *res) 398 if (res)
399 kfree(*res); 399 kfree(*res);
400
401 } else { 400 } else {
402 if (config && *config) { 401 if (config && *config) {
403 size = 256; 402 size = 256;