Bluetooth: Use managed version of led_trigger_register in LED trigger

Recently a managed version of led_trigger_register was introduced.
Using devm_led_trigger_register allows to simplify the LED trigger code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 88f1ef3589d8a6b02c88a3b11b34c56e0b2b4bbc..9c0a6830ff9271b9d8d500545a63e0cb55feee11 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3134,8 +3134,6 @@ void hci_unregister_dev(struct hci_dev *hdev)
 
        id = hdev->id;
 
-       hci_leds_exit(hdev);
-
        write_lock(&hci_dev_list_lock);
        list_del(&hdev->list);
        write_unlock(&hci_dev_list_lock);

diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c
index ded7c88eaccceb1b2bd74a7fff77a5001697f6eb..8319c8440c899897a3f5c082ce611fd5fdeaed07 100644 (file)
--- a/net/bluetooth/leds.c
+++ b/net/bluetooth/leds.c
@@ -55,7 +55,7 @@ static struct led_trigger *led_allocate_basic(struct hci_dev *hdev,
        if (!htrig->led_trigger.name)
                goto err_alloc;
 
-       if (led_trigger_register(&htrig->led_trigger))
+       if (devm_led_trigger_register(&hdev->dev, &htrig->led_trigger))
                goto err_register;
 
        return &htrig->led_trigger;
@@ -72,9 +72,3 @@ void hci_leds_init(struct hci_dev *hdev)
        /* initialize power_led */
        hdev->power_led = led_allocate_basic(hdev, power_activate, "power");
 }
-
-void hci_leds_exit(struct hci_dev *hdev)
-{
-       if (hdev->power_led)
-               led_trigger_unregister(hdev->power_led);
-}

diff --git a/net/bluetooth/leds.h b/net/bluetooth/leds.h
index 068261a4e12c5521a021f22f514930460917e013..a9c4d6ea01cf8c8ee6b1a02659c06f826174c814 100644 (file)
--- a/net/bluetooth/leds.h
+++ b/net/bluetooth/leds.h
@@ -9,10 +9,8 @@
 #if IS_ENABLED(CONFIG_BT_LEDS)
 void hci_leds_update_powered(struct hci_dev *hdev, bool enabled);
 void hci_leds_init(struct hci_dev *hdev);
-void hci_leds_exit(struct hci_dev *hdev);
 #else
 static inline void hci_leds_update_powered(struct hci_dev *hdev,
                                           bool enabled) {}
 static inline void hci_leds_init(struct hci_dev *hdev) {}
-static inline void hci_leds_exit(struct hci_dev *hdev) {}
 #endif