lkml.org 
[lkml]   [2023]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 03/13] leds: trigger: netdev: drop NETDEV_LED_MODE_LINKUP from mode
    Date
    Drop NETDEV_LED_MODE_LINKUP from mode list and convert to a simple bool
    that will be true or false based on the carrier link. No functional
    change intended.

    Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
    ---
    drivers/leds/trigger/ledtrig-netdev.c | 16 +++++++---------
    1 file changed, 7 insertions(+), 9 deletions(-)

    diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
    index d5e774d83021..66a81cc9b64d 100644
    --- a/drivers/leds/trigger/ledtrig-netdev.c
    +++ b/drivers/leds/trigger/ledtrig-netdev.c
    @@ -50,10 +50,10 @@ struct led_netdev_data {
    unsigned int last_activity;

    unsigned long mode;
    + bool carrier_link_up;
    #define NETDEV_LED_LINK 0
    #define NETDEV_LED_TX 1
    #define NETDEV_LED_RX 2
    -#define NETDEV_LED_MODE_LINKUP 3
    };

    enum netdev_led_attr {
    @@ -73,9 +73,9 @@ static void set_baseline_state(struct led_netdev_data *trigger_data)
    if (!led_cdev->blink_brightness)
    led_cdev->blink_brightness = led_cdev->max_brightness;

    - if (!test_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode))
    + if (!trigger_data->carrier_link_up) {
    led_set_brightness(led_cdev, LED_OFF);
    - else {
    + } else {
    if (test_bit(NETDEV_LED_LINK, &trigger_data->mode))
    led_set_brightness(led_cdev,
    led_cdev->blink_brightness);
    @@ -131,10 +131,9 @@ static ssize_t device_name_store(struct device *dev,
    trigger_data->net_dev =
    dev_get_by_name(&init_net, trigger_data->device_name);

    - clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
    + trigger_data->carrier_link_up = false;
    if (trigger_data->net_dev != NULL)
    - if (netif_carrier_ok(trigger_data->net_dev))
    - set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
    + trigger_data->carrier_link_up = netif_carrier_ok(trigger_data->net_dev);

    trigger_data->last_activity = 0;

    @@ -315,7 +314,7 @@ static int netdev_trig_notify(struct notifier_block *nb,

    spin_lock_bh(&trigger_data->lock);

    - clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
    + trigger_data->carrier_link_up = false;
    switch (evt) {
    case NETDEV_CHANGENAME:
    case NETDEV_REGISTER:
    @@ -330,8 +329,7 @@ static int netdev_trig_notify(struct notifier_block *nb,
    break;
    case NETDEV_UP:
    case NETDEV_CHANGE:
    - if (netif_carrier_ok(dev))
    - set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
    + trigger_data->carrier_link_up = netif_carrier_ok(dev);
    break;
    }

    --
    2.38.1
    \
     
     \ /
      Last update: 2023-03-27 00:25    [W:4.088 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site