[PATCH] kfree cleanup: drivers/isdn

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

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

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 22 deletions

diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 94da03c30c51..47a47ef0968b 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -855,14 +855,10 @@ close_tigerstate(struct BCState *bcs)
 {
         mode_tiger(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.tiger.rcvbuf) {
-                        kfree(bcs->hw.tiger.rcvbuf);
-                        bcs->hw.tiger.rcvbuf = NULL;
-                }
-                if (bcs->hw.tiger.sendbuf) {
-                        kfree(bcs->hw.tiger.sendbuf);
-                        bcs->hw.tiger.sendbuf = NULL;
-                }
+                kfree(bcs->hw.tiger.rcvbuf);
+                bcs->hw.tiger.rcvbuf = NULL;
+                kfree(bcs->hw.tiger.sendbuf);
+                bcs->hw.tiger.sendbuf = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
@@ -967,20 +963,12 @@ inittiger(struct IsdnCardState *cs)
 static void
 releasetiger(struct IsdnCardState *cs)
 {
-        if (cs->bcs[0].hw.tiger.send) {
-                kfree(cs->bcs[0].hw.tiger.send);
-                cs->bcs[0].hw.tiger.send = NULL;
-        }
-        if (cs->bcs[1].hw.tiger.send) {
-                cs->bcs[1].hw.tiger.send = NULL;
-        }
-        if (cs->bcs[0].hw.tiger.rec) {
-                kfree(cs->bcs[0].hw.tiger.rec);
-                cs->bcs[0].hw.tiger.rec = NULL;
-        }
-        if (cs->bcs[1].hw.tiger.rec) {
-                cs->bcs[1].hw.tiger.rec = NULL;
-        }
+        kfree(cs->bcs[0].hw.tiger.send);
+        cs->bcs[0].hw.tiger.send = NULL;
+        cs->bcs[1].hw.tiger.send = NULL;
+        kfree(cs->bcs[0].hw.tiger.rec);
+        cs->bcs[0].hw.tiger.rec = NULL;
+        cs->bcs[1].hw.tiger.rec = NULL;
 }
 
 void