From: Christian Marangi <ansuelsmth@gmail.com>
To: Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Jonathan Corbet <corbet@lwn.net>,
Christian Marangi <ansuelsmth@gmail.com>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
John Crispin <john@phrozen.org>,
linux-leds@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-doc@vger.kernel.org, Tim Harvey <tharvey@gateworks.com>,
Alexander Stein <alexander.stein@ew.tq-group.com>,
Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Arun.Ramadoss@microchip.com
Subject: [PATCH v8 03/13] leds: trigger: netdev: drop NETDEV_LED_MODE_LINKUP from mode
Date: Thu, 16 Feb 2023 02:32:20 +0100 [thread overview]
Message-ID: <20230216013230.22978-4-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20230216013230.22978-1-ansuelsmth@gmail.com>
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
next prev parent reply other threads:[~2023-02-16 1:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 1:32 [PATCH v8 00/13] Adds support for PHY LEDs with offload triggers Christian Marangi
2023-02-16 1:32 ` [PATCH v8 01/13] leds: add support for hardware driven LEDs Christian Marangi
2023-02-16 1:32 ` [PATCH v8 02/13] leds: add function to configure hardware controlled LED Christian Marangi
2023-02-16 1:32 ` Christian Marangi [this message]
2023-02-16 1:32 ` [PATCH v8 04/13] leds: trigger: netdev: rename and expose NETDEV trigger enum modes Christian Marangi
2023-02-16 1:32 ` [PATCH v8 05/13] leds: trigger: netdev: convert device attr to macro Christian Marangi
2023-02-16 1:32 ` [PATCH v8 06/13] leds: trigger: netdev: add hardware control support Christian Marangi
2023-02-16 1:32 ` [PATCH v8 07/13] leds: trigger: netdev: use mutex instead of spinlocks Christian Marangi
2023-02-16 1:32 ` [PATCH v8 08/13] leds: trigger: netdev: add available mode sysfs attr Christian Marangi
2023-02-16 1:32 ` [PATCH v8 09/13] leds: trigger: netdev: add additional hardware only triggers Christian Marangi
2023-02-16 1:32 ` [PATCH v8 10/13] net: dsa: qca8k: add LEDs support Christian Marangi
2023-02-16 1:32 ` [PATCH v8 11/13] dt-bindings: leds: Document netdev trigger Christian Marangi
2023-02-17 23:03 ` Rob Herring
2023-02-17 5:58 ` Christian Marangi
2023-02-21 1:44 ` Rob Herring
2023-02-16 1:32 ` [PATCH v8 12/13] dt-bindings: net: phy: Document support for leds node Christian Marangi
2023-02-16 2:32 ` Rob Herring
2023-02-16 10:00 ` Christian Marangi
2023-02-17 23:10 ` Rob Herring
2023-02-16 1:32 ` [PATCH v8 13/13] dt-bindings: net: dsa: qca8k: add LEDs definition example Christian Marangi
2023-02-21 1:48 ` Rob Herring
2023-02-17 14:30 ` [PATCH v8 00/13] Adds support for PHY LEDs with offload triggers Andrew Lunn
2023-02-17 5:01 ` Christian Marangi
2023-02-22 15:02 ` Lee Jones
2023-03-06 18:43 ` Christian Marangi
2023-03-08 14:06 ` Lee Jones
2023-03-09 9:09 ` Linus Walleij
2023-03-09 9:32 ` Hans de Goede
2023-03-09 15:22 ` Andrew Lunn
2023-03-10 9:37 ` Linus Walleij
2023-03-10 15:15 ` Andrew Lunn
2023-03-13 9:28 ` Michael Walle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230216013230.22978-4-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=Arun.Ramadoss@microchip.com \
--cc=alexander.stein@ew.tq-group.com \
--cc=andrew@lunn.ch \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=jacek.anaszewski@gmail.com \
--cc=john@phrozen.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=lee@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=pavel@ucw.cz \
--cc=rasmus.villemoes@prevas.dk \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=tharvey@gateworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).