leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Use managed version of led_trigger_register in LED trigger

Browse Source 
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>
This commit is contained in:
Heiner Kallweit 2016-01-25 20:46:21 +01:00 committed by Marcel Holtmann
parent d2ee9c2ec6
commit b6e402fc84
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bluetooth/hci_core.c
View File

@ -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);

8
net/bluetooth/leds.c
View File

@ -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);
}

2
net/bluetooth/leds.h
View File

@ -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