From: Jesper Juhl Date: Thu, 20 Apr 2006 17:11:09 +0000 (-0700) Subject: [IA64] Remove redundant NULL checks before kfree X-Git-Tag: upstream/snapshot3+hdmi~40647^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbf283c048798ada7e062892b21de85fb5727243;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [IA64] Remove redundant NULL checks before kfree Signed-off-by: Jesper Juhl Signed-off-by: Tony Luck --- diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index b47476d..e9b628b 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -305,13 +305,10 @@ static struct kobj_type cache_ktype_percpu_entry = { static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu) { - if (all_cpu_cache_info[cpu].cache_leaves) { - kfree(all_cpu_cache_info[cpu].cache_leaves); - all_cpu_cache_info[cpu].cache_leaves = NULL; - } + kfree(all_cpu_cache_info[cpu].cache_leaves); + all_cpu_cache_info[cpu].cache_leaves = NULL; all_cpu_cache_info[cpu].num_cache_leaves = 0; memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject)); - return; } diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c index 9421142..2a89cfc 100644 --- a/arch/ia64/sn/kernel/xpc_partition.c +++ b/arch/ia64/sn/kernel/xpc_partition.c @@ -136,9 +136,7 @@ xpc_get_rsvd_page_pa(int nasid) } if (L1_CACHE_ALIGN(len) > buf_len) { - if (buf_base != NULL) { - kfree(buf_base); - } + kfree(buf_base); buf_len = L1_CACHE_ALIGN(len); buf = (u64) xpc_kmalloc_cacheline_aligned(buf_len, GFP_KERNEL, &buf_base); @@ -159,9 +157,7 @@ xpc_get_rsvd_page_pa(int nasid) } } - if (buf_base != NULL) { - kfree(buf_base); - } + kfree(buf_base); if (status != SALRET_OK) { rp_pa = 0;