Bluetooth: Create HCI device debugfs directory in hci_register_dev
Subsystems (2)
Marcel Holtmann
maintainerPATCH 5/8 Bluetooth: Create HCI device debugfs directory in hci_register_dev
Create the debugfs directory for each HCI device directly in hci_register_dev function and remove it during hci_unregister_dev.
Signed-off-by Marcel Holtmann <[email protected]>
--- net/bluetooth/hci_core.c | 5 +++++ net/bluetooth/hci_sysfs.c | 16 +--------------- 2 files changed, 6 insertions(+), 15 deletions(-)
net/bluetooth/hci_core.c +5 -0
@@ -2479,6 +2479,9 @@ int hci_register_dev(struct hci_dev *hdev) goto err; } +if (!IS_ERR_OR_NULL (bt_debugfs)) + hdev->debugfs =debugfs_create_dir (hdev->name, bt_debugfs); + error =hci_add_sysfs (hdev);if (error <0 ) goto err_wqueue;
@@ -2569,6 +2572,8 @@ void hci_unregister_dev(struct hci_dev *hdev)hci_del_sysfs (hdev); +debugfs_remove_recursive (hdev->debugfs); +destroy_workqueue (hdev->workqueue);destroy_workqueue (hdev->req_workqueue);
net/bluetooth/hci_sysfs.c +1 -15
@@ -409,32 +409,18 @@ void hci_init_sysfs(struct hci_dev *hdev)int hci_add_sysfs (struct hci_dev *hdev) {struct device *dev = &hdev->dev; -int err;BT_DBG ("%p name %s bus %d" , hdev, hdev->name, hdev->bus);dev_set_name (dev,"%s" , hdev->name); - err =device_add (dev); -if (err <0 ) -return err; - -if (!bt_debugfs) -return 0 ; - - hdev->debugfs =debugfs_create_dir (hdev->name, bt_debugfs); -if (!hdev->debugfs) -return 0 ; - -return 0 ; +return device_add (dev); }void hci_del_sysfs (struct hci_dev *hdev) {BT_DBG ("%p name %s bus %d" , hdev, hdev->name, hdev->bus); -debugfs_remove_recursive (hdev->debugfs); -device_del (&hdev->dev); }
Signature · 1 line
1.8.3.1