diff options
| author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-06-25 14:58:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:25:00 -0700 |
| commit | 4ae6673e029d609da7ef4311440d6de501d6967a (patch) | |
| tree | 59453584086a82ff8dc7fd6ee04351a770c75b98 /arch | |
| parent | 5a6b454f8024bac68495b6cd51615feb0b54baa9 (diff) | |
| download | linux-3.10-4ae6673e029d609da7ef4311440d6de501d6967a.tar.gz linux-3.10-4ae6673e029d609da7ef4311440d6de501d6967a.tar.bz2 linux-3.10-4ae6673e029d609da7ef4311440d6de501d6967a.zip | |
[PATCH] get rid of redundant NULL checks before kfree() in arch/i386/
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/generic.c | 3 | ||||
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c index 5c530064eb7..73a5dc5b26b 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c @@ -648,9 +648,7 @@ static int powernow_cpu_exit (struct cpufreq_policy *policy) { } #endif - if (powernow_table) - kfree(powernow_table); - + kfree(powernow_table); return 0; } diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c index f468a979e9a..64d91f73a0a 100644 --- a/arch/i386/kernel/cpu/mtrr/generic.c +++ b/arch/i386/kernel/cpu/mtrr/generic.c @@ -70,8 +70,7 @@ void __init get_mtrr_state(void) /* Free resources associated with a struct mtrr_state */ void __init finalize_mtrr_state(void) { - if (mtrr_state.var_ranges) - kfree(mtrr_state.var_ranges); + kfree(mtrr_state.var_ranges); mtrr_state.var_ranges = NULL; } diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index fc81c8cddd2..060c4ca4d69 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -632,10 +632,8 @@ static int __init balanced_irq_init(void) printk(KERN_ERR "balanced_irq_init: failed to spawn balanced_irq"); failed: for (i = 0; i < NR_CPUS; i++) { - if(irq_cpu_data[i].irq_delta) - kfree(irq_cpu_data[i].irq_delta); - if(irq_cpu_data[i].last_irq) - kfree(irq_cpu_data[i].last_irq); + kfree(irq_cpu_data[i].irq_delta); + kfree(irq_cpu_data[i].last_irq); } return 0; } |