diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-07 09:47:10 -0500 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 10:01:23 -0500 |
| commit | e300440beb806616094f838a92a33c5d4677ab7a (patch) | |
| tree | 03a7415014e2c1bb54ca82a4e8e635414eb2ea79 /drivers/bluetooth | |
| parent | a3f356251835205e291f7b9adb2c5f7615cf39f3 (diff) | |
Bluetooth: btmrvl: Remove empty destruct cb
The callback is optional and we provide an empty callback so remove it
entirely.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 6c3defa50845..995cf43f4bd2 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c | |||
| @@ -387,10 +387,6 @@ static int btmrvl_ioctl(struct hci_dev *hdev, | |||
| 387 | return -ENOIOCTLCMD; | 387 | return -ENOIOCTLCMD; |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | static void btmrvl_destruct(struct hci_dev *hdev) | ||
| 391 | { | ||
| 392 | } | ||
| 393 | |||
| 394 | static int btmrvl_send_frame(struct sk_buff *skb) | 390 | static int btmrvl_send_frame(struct sk_buff *skb) |
| 395 | { | 391 | { |
| 396 | struct hci_dev *hdev = (struct hci_dev *) skb->dev; | 392 | struct hci_dev *hdev = (struct hci_dev *) skb->dev; |
| @@ -553,7 +549,6 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) | |||
| 553 | hdev->close = btmrvl_close; | 549 | hdev->close = btmrvl_close; |
| 554 | hdev->flush = btmrvl_flush; | 550 | hdev->flush = btmrvl_flush; |
| 555 | hdev->send = btmrvl_send_frame; | 551 | hdev->send = btmrvl_send_frame; |
| 556 | hdev->destruct = btmrvl_destruct; | ||
| 557 | hdev->ioctl = btmrvl_ioctl; | 552 | hdev->ioctl = btmrvl_ioctl; |
| 558 | hdev->owner = THIS_MODULE; | 553 | hdev->owner = THIS_MODULE; |
| 559 | 554 | ||
