Commit b6e402fc authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Marcel Holtmann
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d2ee9c2e

net/bluetooth/hci_core.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

net/bluetooth/leds.c

+1 −7
Original line number Diff line number Diff line
@@ -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);

}

net/bluetooth/leds.h

+0 −2
Original line number Diff line number Diff line
@@ -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