2
0

804-v6.5-10-leds-trigger-netdev-init-mode-if-hw-control-already-.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. From 0316cc5629d15880dd3f097d221c55ca648bcd61 Mon Sep 17 00:00:00 2001
  2. From: Christian Marangi <[email protected]>
  3. Date: Mon, 29 May 2023 18:32:40 +0200
  4. Subject: [PATCH 10/13] leds: trigger: netdev: init mode if hw control already
  5. active
  6. On netdev trigger activation, hw control may be already active by
  7. default. If this is the case and a device is actually provided by
  8. hw_control_get_device(), init the already active mode and set the
  9. bool to hw_control bool to true to reflect the already set mode in the
  10. trigger_data.
  11. Co-developed-by: Andrew Lunn <[email protected]>
  12. Signed-off-by: Andrew Lunn <[email protected]>
  13. Signed-off-by: Christian Marangi <[email protected]>
  14. Signed-off-by: David S. Miller <[email protected]>
  15. ---
  16. drivers/leds/trigger/ledtrig-netdev.c | 17 +++++++++++++++++
  17. 1 file changed, 17 insertions(+)
  18. --- a/drivers/leds/trigger/ledtrig-netdev.c
  19. +++ b/drivers/leds/trigger/ledtrig-netdev.c
  20. @@ -454,6 +454,8 @@ static void netdev_trig_work(struct work
  21. static int netdev_trig_activate(struct led_classdev *led_cdev)
  22. {
  23. struct led_netdev_data *trigger_data;
  24. + unsigned long mode;
  25. + struct device *dev;
  26. int rc;
  27. trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
  28. @@ -475,6 +477,21 @@ static int netdev_trig_activate(struct l
  29. atomic_set(&trigger_data->interval, msecs_to_jiffies(NETDEV_LED_DEFAULT_INTERVAL));
  30. trigger_data->last_activity = 0;
  31. + /* Check if hw control is active by default on the LED.
  32. + * Init already enabled mode in hw control.
  33. + */
  34. + if (supports_hw_control(led_cdev) &&
  35. + !led_cdev->hw_control_get(led_cdev, &mode)) {
  36. + dev = led_cdev->hw_control_get_device(led_cdev);
  37. + if (dev) {
  38. + const char *name = dev_name(dev);
  39. +
  40. + set_device_name(trigger_data, name, strlen(name));
  41. + trigger_data->hw_control = true;
  42. + trigger_data->mode = mode;
  43. + }
  44. + }
  45. +
  46. led_set_trigger_data(led_cdev, trigger_data);
  47. rc = register_netdevice_notifier(&trigger_data->notifier);