Skip to contentSkip to conversation

Bluetooth: Remove pointless parameter check in bfusb_send_frame()

PATCH In review Marcel Holtmann 2 participants 2 messages Oct 11, 2013 Bluetooth drivers

lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 1/8 Bluetooth: Remove pointless parameter check in bfusb_send_frame()

The hdev parameter of bfusb_send_frame() is always valid. If it were not valid, then it would have crashed earlier in the call chain.

---
 drivers/bluetooth/bfusb.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/bluetooth/bfusb.c +1 -8
index a675849..cce2304 100644
@@ -466,23 +466,16 @@ static int bfusb_close(struct hci_dev *hdev)
 
 static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
 {
-	struct bfusb_data *data;
+	struct bfusb_data *data = hci_get_drvdata(hdev);
 	struct sk_buff *nskb;
 	unsigned char buf[3];
 	int sent = 0, size, count;
 
 	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, bt_cb(skb)->pkt_type, skb->len);
 
-	if (!hdev) {
-		BT_ERR("Frame for unknown HCI device (hdev=NULL)");
-		return -ENODEV;
-	}
-
 	if (!test_bit(HCI_RUNNING, &hdev->flags))
 		return -EBUSY;
 
-	data = hci_get_drvdata(hdev);
-
 	switch (bt_cb(skb)->pkt_type) {
 	case HCI_COMMAND_PKT:
 		hdev->stat.cmd_tx++;
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Marcel,

Quoted 7 lines · Marcel Holtmann

The hdev parameter of bfusb_send_frame() is always valid. If it were not valid, then it would have crashed earlier in the call chain.

---
 drivers/bluetooth/bfusb.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

All eight patches have been applied to bluetooth-next. Thanks.

Johan