From: "Marek Behún" <kabel@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Pavel Machek" <pavel@ucw.cz>, "Lee Jones" <lee@kernel.org>,
linux-leds@vger.kernel.org
Cc: "Marek Behún" <kabel@kernel.org>
Subject: [PATCH] leds: trigger: tty: Fix tty trigger when LED's max_brightness is greater than 1
Date: Tue, 1 Aug 2023 16:26:42 +0200 [thread overview]
Message-ID: <20230801142642.21335-1-kabel@kernel.org> (raw)
The tty LED trigger uses the obsolete LED_ON & LED_OFF constants when
setting LED brightness. This is bad because the LED_ON constant is equal
to 1, and so when activating the tty LED trigger on a LED class device
with max_brightness greater than 1, the LED is dimmer than it can be
(when max_brightness is 255, the LED is very dimm indeed; some devices
translate 1/255 to 0, so the LED is OFF all the time).
Use a mechanism similar to the netdev trigger, wherein on activation
time, the current LED brightness is taken as blinking brightness, and if
it is zero, the max_brightness is taken instead.
Fixes: fd4a641ac88f ("leds: trigger: implement a tty trigger")
Signed-off-by: Marek Behún <kabel@kernel.org>
---
PS: We need to get rid of the LED_ON, LED_OFF, LED_FULL and LED_HALF or
we're bound to repeat this kind of issues.
---
drivers/leds/trigger/ledtrig-tty.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/trigger/ledtrig-tty.c b/drivers/leds/trigger/ledtrig-tty.c
index f62db7e520b5..2ff00a0e7ba6 100644
--- a/drivers/leds/trigger/ledtrig-tty.c
+++ b/drivers/leds/trigger/ledtrig-tty.c
@@ -80,6 +80,7 @@ static void ledtrig_tty_work(struct work_struct *work)
{
struct ledtrig_tty_data *trigger_data =
container_of(work, struct ledtrig_tty_data, dwork.work);
+ struct led_classdev *led_cdev = trigger_data->led_cdev;
struct serial_icounter_struct icount;
int ret;
@@ -111,6 +112,9 @@ static void ledtrig_tty_work(struct work_struct *work)
goto out;
trigger_data->tty = tty;
+ led_cdev->blink_brightness = led_cdev->brightness;
+ if (!led_cdev->blink_brightness)
+ led_cdev->blink_brightness = led_cdev->max_brightness;
}
ret = tty_get_icount(trigger_data->tty, &icount);
@@ -122,12 +126,12 @@ static void ledtrig_tty_work(struct work_struct *work)
if (icount.rx != trigger_data->rx ||
icount.tx != trigger_data->tx) {
- led_set_brightness_sync(trigger_data->led_cdev, LED_ON);
+ led_set_brightness_sync(led_cdev, led_cdev->blink_brightness);
trigger_data->rx = icount.rx;
trigger_data->tx = icount.tx;
} else {
- led_set_brightness_sync(trigger_data->led_cdev, LED_OFF);
+ led_set_brightness_sync(led_cdev, 0);
}
out:
--
2.41.0
next reply other threads:[~2023-08-01 14:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 14:26 Marek Behún [this message]
2023-08-02 8:37 ` [PATCH] leds: trigger: tty: Fix tty trigger when LED's max_brightness is greater than 1 Marek Behún
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=20230801142642.21335-1-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=lee@kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=u.kleine-koenig@pengutronix.de \
/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