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 /net | |
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 'net')
-rw-r--r-- | net/bluetooth/hci_sysfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index bc154298979a..60b93d8219ef 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
@@ -533,7 +533,6 @@ int hci_add_sysfs(struct hci_dev *hdev) | |||
533 | 533 | ||
534 | BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus); | 534 | BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus); |
535 | 535 | ||
536 | dev->parent = hdev->parent; | ||
537 | dev_set_name(dev, "%s", hdev->name); | 536 | dev_set_name(dev, "%s", hdev->name); |
538 | 537 | ||
539 | err = device_add(dev); | 538 | err = device_add(dev); |