[PATCH] kfree cleanup: drivers/scsi

This is the drivers/scsi/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in drivers/scsi/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: Kai Makisara <kai.makisara@kolumbus.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index ee9067255930..723c0cea7c04 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1164,7 +1164,7 @@ int aac_command_thread(struct aac_dev * dev)
                                                 kfree(hw_fib_pool);
                                                 hw_fib_pool = NULL;
                                         }
-                                } else if (hw_fib_pool) {
+                                } else {
                                         kfree(hw_fib_pool);
                                         hw_fib_pool = NULL;
                                 }
@@ -1247,17 +1247,13 @@ int aac_command_thread(struct aac_dev * dev)
                                 hw_fib_p = hw_fib_pool;
                                 fib_p = fib_pool;
                                 while (hw_fib_p < &hw_fib_pool[num]) {
-                                        if (*hw_fib_p)
-                                                kfree(*hw_fib_p);
-                                        if (*fib_p)
-                                                kfree(*fib_p);
+                                        kfree(*hw_fib_p);
+                                        kfree(*fib_p);
                                         ++fib_p;
                                         ++hw_fib_p;
                                 }
-                                if (hw_fib_pool)
-                                        kfree(hw_fib_pool);
-                                if (fib_pool)
-                                        kfree(fib_pool);
+                                kfree(hw_fib_pool);
+                                kfree(fib_pool);
                         }
                         kfree(fib);
                         spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags);