From: Heiner Kallweit <hkallweit1@gmail.com>
To: Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "linux-leds@vger.kernel.org" <linux-leds@vger.kernel.org>,
linux-sound@vger.kernel.org,
"open list:HID CORE LAYER" <linux-input@vger.kernel.org>,
linux-mips@vger.kernel.org
Subject: [PATCH 3/4] Input: leds: Prepare for removal of config option LEDS_AUDIO_TRIGGER
Date: Tue, 13 Feb 2024 08:33:24 +0100 [thread overview]
Message-ID: <e5ef576b-70ee-4781-88e3-e728c1e7cb9c@gmail.com> (raw)
In-Reply-To: <30d49088-283c-40f3-b97b-fd5f5174a467@gmail.com>
In a follow-up patch handling of the LED audio trigger will be changed,
including removal of config symbol LEDS_AUDIO_TRIGGER. Therefore set
the default trigger unconditionally to "audio-mute". It does no harm
if a default trigger doesn't exist.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/input/input-leds.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/input/input-leds.c b/drivers/input/input-leds.c
index b16fc8194..176f1da7f 100644
--- a/drivers/input/input-leds.c
+++ b/drivers/input/input-leds.c
@@ -18,12 +18,6 @@
#define VT_TRIGGER(_name) .trigger = NULL
#endif
-#if IS_ENABLED(CONFIG_LEDS_TRIGGER_AUDIO)
-#define AUDIO_TRIGGER(_name) .trigger = _name
-#else
-#define AUDIO_TRIGGER(_name) .trigger = NULL
-#endif
-
static const struct {
const char *name;
const char *trigger;
@@ -35,7 +29,7 @@ static const struct {
[LED_KANA] = { "kana", VT_TRIGGER("kbd-kanalock") },
[LED_SLEEP] = { "sleep" } ,
[LED_SUSPEND] = { "suspend" },
- [LED_MUTE] = { "mute", AUDIO_TRIGGER("audio-mute") },
+ [LED_MUTE] = { "mute", "audio-mute" },
[LED_MISC] = { "misc" },
[LED_MAIL] = { "mail" },
[LED_CHARGING] = { "charging" },
--
2.43.1
next prev parent reply other threads:[~2024-02-13 7:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 7:30 [PATCH 0/4] leds: trigger: Improve handling of led_trigger_event() and simplify mute audio trigger Heiner Kallweit
2024-02-13 7:31 ` [PATCH 1/4] leds: trigger: Store brightness set by led_trigger_event() Heiner Kallweit
2024-02-13 7:32 ` [PATCH 2/4] ALSA: control-led: Integrate mute led trigger Heiner Kallweit
2024-02-13 7:33 ` Heiner Kallweit [this message]
2024-02-23 23:23 ` [PATCH 3/4] Input: leds: Prepare for removal of config option LEDS_AUDIO_TRIGGER Dmitry Torokhov
2024-02-24 9:31 ` Heiner Kallweit
2024-02-26 17:49 ` Dmitry Torokhov
2024-02-13 7:34 ` [PATCH 4/4] leds: trigger: audio: Remove this trigger Heiner Kallweit
2024-02-15 12:29 ` [PATCH 0/4] leds: trigger: Improve handling of led_trigger_event() and simplify mute audio trigger Takashi Iwai
2024-02-16 12:18 ` Heiner Kallweit
2024-02-23 15:45 ` Lee Jones
2024-02-23 15:47 ` Takashi Iwai
2024-02-23 16:04 ` Lee Jones
2024-02-23 16:05 ` Takashi Iwai
2024-02-23 16:05 ` Lee Jones
2024-02-29 17:26 ` Lee Jones
2024-03-02 15:09 ` Heiner Kallweit
2024-03-05 9:55 ` Lee Jones
2024-03-05 10:26 ` Takashi Iwai
2024-03-05 10:40 ` Lee Jones
2024-03-05 12:08 ` Lee Jones
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=e5ef576b-70ee-4781-88e3-e728c1e7cb9c@gmail.com \
--to=hkallweit1@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=lee@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=tsbogend@alpha.franken.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;
as well as URLs for NNTP newsgroup(s).