diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:06 -0500 |
commit | b2325fe1b7e5654fac9e9419423aa2c58a3dbd83 (patch) | |
tree | 934555b25ef9b33d3c4242b5dafb49ee8931e993 /arch/sparc64 | |
parent | f99d49adf527fa6f7a9c42257fa76bca6b8df1e3 (diff) |
[PATCH] kfree cleanup: arch
This is the arch/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in arch/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/us2e_cpufreq.c | 7 | ||||
-rw-r--r-- | arch/sparc64/kernel/us3_cpufreq.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/arch/sparc64/kernel/us2e_cpufreq.c b/arch/sparc64/kernel/us2e_cpufreq.c index 686e526bec04..b35dc8dc995a 100644 --- a/arch/sparc64/kernel/us2e_cpufreq.c +++ b/arch/sparc64/kernel/us2e_cpufreq.c | |||
@@ -388,10 +388,8 @@ err_out: | |||
388 | kfree(driver); | 388 | kfree(driver); |
389 | cpufreq_us2e_driver = NULL; | 389 | cpufreq_us2e_driver = NULL; |
390 | } | 390 | } |
391 | if (us2e_freq_table) { | 391 | kfree(us2e_freq_table); |
392 | kfree(us2e_freq_table); | 392 | us2e_freq_table = NULL; |
393 | us2e_freq_table = NULL; | ||
394 | } | ||
395 | return ret; | 393 | return ret; |
396 | } | 394 | } |
397 | 395 | ||
@@ -402,7 +400,6 @@ static void __exit us2e_freq_exit(void) | |||
402 | { | 400 | { |
403 | if (cpufreq_us2e_driver) { | 401 | if (cpufreq_us2e_driver) { |
404 | cpufreq_unregister_driver(cpufreq_us2e_driver); | 402 | cpufreq_unregister_driver(cpufreq_us2e_driver); |
405 | |||
406 | kfree(cpufreq_us2e_driver); | 403 | kfree(cpufreq_us2e_driver); |
407 | cpufreq_us2e_driver = NULL; | 404 | cpufreq_us2e_driver = NULL; |
408 | kfree(us2e_freq_table); | 405 | kfree(us2e_freq_table); |
diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c index 0340041f6143..6d1f9a3c464f 100644 --- a/arch/sparc64/kernel/us3_cpufreq.c +++ b/arch/sparc64/kernel/us3_cpufreq.c | |||
@@ -249,10 +249,8 @@ err_out: | |||
249 | kfree(driver); | 249 | kfree(driver); |
250 | cpufreq_us3_driver = NULL; | 250 | cpufreq_us3_driver = NULL; |
251 | } | 251 | } |
252 | if (us3_freq_table) { | 252 | kfree(us3_freq_table); |
253 | kfree(us3_freq_table); | 253 | us3_freq_table = NULL; |
254 | us3_freq_table = NULL; | ||
255 | } | ||
256 | return ret; | 254 | return ret; |
257 | } | 255 | } |
258 | 256 | ||
@@ -263,7 +261,6 @@ static void __exit us3_freq_exit(void) | |||
263 | { | 261 | { |
264 | if (cpufreq_us3_driver) { | 262 | if (cpufreq_us3_driver) { |
265 | cpufreq_unregister_driver(cpufreq_us3_driver); | 263 | cpufreq_unregister_driver(cpufreq_us3_driver); |
266 | |||
267 | kfree(cpufreq_us3_driver); | 264 | kfree(cpufreq_us3_driver); |
268 | cpufreq_us3_driver = NULL; | 265 | cpufreq_us3_driver = NULL; |
269 | kfree(us3_freq_table); | 266 | kfree(us3_freq_table); |