isdn: remove some pointless conditionals before kfree_skb()
Wei Yongjun [Wed, 25 Feb 2009 00:12:09 +0000 (00:12 +0000)]
Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/isdn/capi/capi.c
drivers/isdn/pcbit/layer2.c

index 1b5bf87..3e468d2 100644 (file)
@@ -277,7 +277,7 @@ static void capiminor_free(struct capiminor *mp)
        list_del(&mp->list);
        write_unlock_irqrestore(&capiminor_list_lock, flags);
 
-       if (mp->ttyskb) kfree_skb(mp->ttyskb);
+       kfree_skb(mp->ttyskb);
        mp->ttyskb = NULL;
        skb_queue_purge(&mp->inqueue);
        skb_queue_purge(&mp->outqueue);
index 5ba2a87..e075e8d 100644 (file)
@@ -347,8 +347,7 @@ pcbit_receive(struct pcbit_dev *dev)
                if (dev->read_frame) {
                        printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n");
                        /* discard previous queued frame */
-                       if (dev->read_frame->skb)
-                               kfree_skb(dev->read_frame->skb);
+                       kfree_skb(dev->read_frame->skb);
                        kfree(dev->read_frame);
                        dev->read_frame = NULL;
                }
@@ -601,8 +600,7 @@ pcbit_l2_err_recover(unsigned long data)
        dev->w_busy = dev->r_busy = 1;
 
        if (dev->read_frame) {
-               if (dev->read_frame->skb)
-                       kfree_skb(dev->read_frame->skb);
+               kfree_skb(dev->read_frame->skb);
                kfree(dev->read_frame);
                dev->read_frame = NULL;
        }