diff options
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 6e7bd4e4adbb..8ac4d938d89c 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c | |||
@@ -356,12 +356,6 @@ static void btmrvl_free_adapter(struct btmrvl_private *priv) | |||
356 | priv->adapter = NULL; | 356 | priv->adapter = NULL; |
357 | } | 357 | } |
358 | 358 | ||
359 | static int btmrvl_ioctl(struct hci_dev *hdev, | ||
360 | unsigned int cmd, unsigned long arg) | ||
361 | { | ||
362 | return -ENOIOCTLCMD; | ||
363 | } | ||
364 | |||
365 | static int btmrvl_send_frame(struct sk_buff *skb) | 359 | static int btmrvl_send_frame(struct sk_buff *skb) |
366 | { | 360 | { |
367 | struct hci_dev *hdev = (struct hci_dev *) skb->dev; | 361 | struct hci_dev *hdev = (struct hci_dev *) skb->dev; |
@@ -650,12 +644,11 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) | |||
650 | priv->btmrvl_dev.hcidev = hdev; | 644 | priv->btmrvl_dev.hcidev = hdev; |
651 | hci_set_drvdata(hdev, priv); | 645 | hci_set_drvdata(hdev, priv); |
652 | 646 | ||
653 | hdev->bus = HCI_SDIO; | 647 | hdev->bus = HCI_SDIO; |
654 | hdev->open = btmrvl_open; | 648 | hdev->open = btmrvl_open; |
655 | hdev->close = btmrvl_close; | 649 | hdev->close = btmrvl_close; |
656 | hdev->flush = btmrvl_flush; | 650 | hdev->flush = btmrvl_flush; |
657 | hdev->send = btmrvl_send_frame; | 651 | hdev->send = btmrvl_send_frame; |
658 | hdev->ioctl = btmrvl_ioctl; | ||
659 | hdev->setup = btmrvl_setup; | 652 | hdev->setup = btmrvl_setup; |
660 | 653 | ||
661 | hdev->dev_type = priv->btmrvl_dev.dev_type; | 654 | hdev->dev_type = priv->btmrvl_dev.dev_type; |