diff options
author | David Herrmann <dh.herrmann@googlemail.com> | 2012-03-09 09:53:42 -0500 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-08 23:41:30 -0400 |
commit | 6935e0f5181644201894f0b7fbe3d8910c18af05 (patch) | |
tree | 5420f01c982898aaac0204d9761b23fc39bcc081 /drivers/bluetooth | |
parent | bc3dd33cef001e61da0f71b5d8f918b3dbaa4a94 (diff) |
Bluetooth: Remove redundant hdev->parent field
We initialize the "struct device" in hci_alloc_dev() for a long time now
so we can access hdev->dev.parent directly. Hence, we can drop the
temporary field hdev->parent which is used in no other place than
hci_add_sysfs().
SET_HCIDEV_DEV() is never called after registering a device by the
drivers so we do not overwrite internal device-state. Furthermore,
hdev->dev is initialized to 0 by kzalloc() inside hci_alloc_dev() so the
default behavior with dev.parent = NULL is kept.
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/hci_ldisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 98a8c05d4f23..e564579a6115 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
@@ -388,7 +388,7 @@ static int hci_uart_register_dev(struct hci_uart *hu) | |||
388 | hdev->close = hci_uart_close; | 388 | hdev->close = hci_uart_close; |
389 | hdev->flush = hci_uart_flush; | 389 | hdev->flush = hci_uart_flush; |
390 | hdev->send = hci_uart_send_frame; | 390 | hdev->send = hci_uart_send_frame; |
391 | hdev->parent = hu->tty->dev; | 391 | SET_HCIDEV_DEV(hdev, hu->tty->dev); |
392 | 392 | ||
393 | if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags)) | 393 | if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags)) |
394 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); | 394 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); |