Bluetooth: Remove some pointless conditionals before kfree_skb()
Wei Yongjun [Wed, 25 Feb 2009 10:09:33 +0000 (18:09 +0800)]
Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

drivers/bluetooth/bfusb.c
drivers/bluetooth/hci_h4.c
drivers/bluetooth/hci_ll.c

index d3f14be..2a00707 100644 (file)
@@ -257,8 +257,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch
 
        if (hdr & 0x10) {
                BT_ERR("%s error in block", data->hdev->name);
-               if (data->reassembly)
-                       kfree_skb(data->reassembly);
+               kfree_skb(data->reassembly);
                data->reassembly = NULL;
                return -EIO;
        }
index b0fafb0..c0ce813 100644 (file)
@@ -102,8 +102,7 @@ static int h4_close(struct hci_uart *hu)
 
        skb_queue_purge(&h4->txq);
 
-       if (h4->rx_skb)
-               kfree_skb(h4->rx_skb);
+       kfree_skb(h4->rx_skb);
 
        hu->priv = NULL;
        kfree(h4);
index b91d45a..5c65014 100644 (file)
@@ -163,8 +163,7 @@ static int ll_close(struct hci_uart *hu)
        skb_queue_purge(&ll->tx_wait_q);
        skb_queue_purge(&ll->txq);
 
-       if (ll->rx_skb)
-               kfree_skb(ll->rx_skb);
+       kfree_skb(ll->rx_skb);
 
        hu->priv = NULL;