diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 01:01:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 07:54:06 -0800 |
| commit | b2325fe1b7e5654fac9e9419423aa2c58a3dbd83 (patch) | |
| tree | 934555b25ef9b33d3c4242b5dafb49ee8931e993 /arch/ppc | |
| parent | f99d49adf527fa6f7a9c42257fa76bca6b8df1e3 (diff) | |
| download | blackbird-op-linux-b2325fe1b7e5654fac9e9419423aa2c58a3dbd83.tar.gz blackbird-op-linux-b2325fe1b7e5654fac9e9419423aa2c58a3dbd83.zip | |
[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/ppc')
| -rw-r--r-- | arch/ppc/8xx_io/cs4218_tdm.c | 3 | ||||
| -rw-r--r-- | arch/ppc/syslib/prom.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c index 532caa388dc2..49eb2a7e65c0 100644 --- a/arch/ppc/8xx_io/cs4218_tdm.c +++ b/arch/ppc/8xx_io/cs4218_tdm.c @@ -1013,8 +1013,7 @@ static void CS_IrqCleanup(void) */ cpm_free_handler(CPMVEC_SMC2); - if (beep_buf) - kfree(beep_buf); + kfree(beep_buf); kd_mksound = orig_mksound; } #endif /* MODULE */ diff --git a/arch/ppc/syslib/prom.c b/arch/ppc/syslib/prom.c index 278da6ee62ea..1b9aa0d6a924 100644 --- a/arch/ppc/syslib/prom.c +++ b/arch/ppc/syslib/prom.c @@ -1335,10 +1335,8 @@ release_OF_resource(struct device_node* node, int index) if (!res) return -ENODEV; - if (res->name) { - kfree(res->name); - res->name = NULL; - } + kfree(res->name); + res->name = NULL; release_resource(res); kfree(res); |
