summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-01-25 20:46:21 +0100
committerMarcel Holtmann <marcel@holtmann.org>2016-02-23 20:29:36 +0100
commitb6e402fc84a76c0238b64de497920aeeaa495026 (patch)
treeb6ade31ae4948d2b9a9a8e615ba76a2a9a608128
parentd2ee9c2ec659cfab715568d2d9837f7ff67402fa (diff)
downloadlinux-b6e402fc84a76c0238b64de497920aeeaa495026.tar.gz
linux-b6e402fc84a76c0238b64de497920aeeaa495026.tar.bz2
linux-b6e402fc84a76c0238b64de497920aeeaa495026.zip
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>
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/bluetooth/leds.c8
-rw-r--r--net/bluetooth/leds.h2
3 files changed, 1 insertions, 11 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 88f1ef3589d8..9c0a6830ff92 100644
--- 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 ded7c88eaccc..8319c8440c89 100644
--- 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 068261a4e12c..a9c4d6ea01cf 100644
--- 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