ALSA: control-led: Integrate mute led trigger

This driver is the only one calling ledtrig_audio_set(), therefore
the LED audio trigger isn't usable standalone. So it makes sense
to fully integrate LED audio triger handling here.

The module aliases ensure that the driver is auto-loaded (if built
as module) if a LED device has one of the two audio triggers as
default trigger.

In addition disable building the old audio mute LED trigger.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/107634e6-d9ad-4a9f-881d-1eb72ea1a5a7@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
index d11d80176fc0fd271a859bc2da333d42e8f7992d..31576952e181727fd1f449ba414591c8046bc007 100644 (file)
--- a/drivers/leds/trigger/Kconfig
+++ b/drivers/leds/trigger/Kconfig
@@ -136,13 +136,6 @@ config LEDS_TRIGGER_PATTERN
          which is a series of tuples, of brightness and duration (ms).
          If unsure, say N
 
-config LEDS_TRIGGER_AUDIO
-       tristate "Audio Mute LED Trigger"
-       help
-         This allows LEDs to be controlled by audio drivers for following
-         the audio mute and mic-mute changes.
-         If unsure, say N
-
 config LEDS_TRIGGER_TTY
        tristate "LED Trigger for TTY devices"
        depends on TTY

diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
index 25c4db97cdd4cab37bb1f51e10beb3d9c76aa4bf..242f6c4e3453e349e8588d0b3a40a12829eb395a 100644 (file)
--- a/drivers/leds/trigger/Makefile
+++ b/drivers/leds/trigger/Makefile
@@ -14,5 +14,4 @@ obj-$(CONFIG_LEDS_TRIGGER_CAMERA)     += ledtrig-camera.o
 obj-$(CONFIG_LEDS_TRIGGER_PANIC)       += ledtrig-panic.o
 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
 obj-$(CONFIG_LEDS_TRIGGER_PATTERN)     += ledtrig-pattern.o
-obj-$(CONFIG_LEDS_TRIGGER_AUDIO)       += ledtrig-audio.o
 obj-$(CONFIG_LEDS_TRIGGER_TTY)         += ledtrig-tty.o

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 8077f481d84fd6baf3be305b2b6936575d937a3a..b970a173464708ff1d3abfeff71080a99963fd14 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -262,6 +262,5 @@ config SND_CTL_LED
        tristate
        select NEW_LEDS if SND_CTL_LED
        select LEDS_TRIGGERS if SND_CTL_LED
-       select LEDS_TRIGGER_AUDIO if SND_CTL_LED
 
 source "sound/core/seq/Kconfig"

diff --git a/sound/core/control_led.c b/sound/core/control_led.c
index 3d37e9fa7b9c207d9b24fa3bcd4507550d727316..061a8ea233408e0629da9d30dd7b313d42a42838 100644 (file)
--- a/sound/core/control_led.c
+++ b/sound/core/control_led.c
@@ -53,6 +53,7 @@ struct snd_ctl_led_ctl {
 
 static DEFINE_MUTEX(snd_ctl_led_mutex);
 static bool snd_ctl_led_card_valid[SNDRV_CARDS];
+static struct led_trigger *snd_ctl_ledtrig_audio[NUM_AUDIO_LEDS];
 static struct snd_ctl_led snd_ctl_leds[MAX_LED] = {
        {
                .name = "speaker",
@@ -174,8 +175,11 @@ static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access,
        case MODE_FOLLOW_ROUTE: if (route >= 0) route ^= 1; break;
        case MODE_FOLLOW_MUTE:  /* noop */ break;
        }
-       if (route >= 0)
-               ledtrig_audio_set(led->trigger_type, route ? LED_OFF : LED_ON);
+       if (route >= 0) {
+               struct led_trigger *trig = snd_ctl_ledtrig_audio[led->trigger_type];
+
+               led_trigger_event(trig, route ? LED_OFF : LED_ON);
+       }
 }
 
 static struct snd_ctl_led_ctl *snd_ctl_led_find(struct snd_kcontrol *kctl, unsigned int ioff)
@@ -425,8 +429,9 @@ static ssize_t brightness_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
 {
        struct snd_ctl_led *led = container_of(dev, struct snd_ctl_led, dev);
+       struct led_trigger *trig = snd_ctl_ledtrig_audio[led->trigger_type];
 
-       return sysfs_emit(buf, "%u\n", ledtrig_audio_get(led->trigger_type));
+       return sysfs_emit(buf, "%u\n", led_trigger_get_brightness(trig));
 }
 
 static DEVICE_ATTR_RW(mode);
@@ -716,6 +721,9 @@ static int __init snd_ctl_led_init(void)
        struct snd_ctl_led *led;
        unsigned int group;
 
+       led_trigger_register_simple("audio-mute", &snd_ctl_ledtrig_audio[LED_AUDIO_MUTE]);
+       led_trigger_register_simple("audio-micmute", &snd_ctl_ledtrig_audio[LED_AUDIO_MICMUTE]);
+
        device_initialize(&snd_ctl_led_dev);
        snd_ctl_led_dev.class = &sound_class;
        snd_ctl_led_dev.release = snd_ctl_led_dev_release;
@@ -768,7 +776,13 @@ static void __exit snd_ctl_led_exit(void)
        }
        device_unregister(&snd_ctl_led_dev);
        snd_ctl_led_clean(NULL);
+
+       led_trigger_unregister_simple(snd_ctl_ledtrig_audio[LED_AUDIO_MUTE]);
+       led_trigger_unregister_simple(snd_ctl_ledtrig_audio[LED_AUDIO_MICMUTE]);
 }
 
 module_init(snd_ctl_led_init)
 module_exit(snd_ctl_led_exit)
+
+MODULE_ALIAS("ledtrig:audio-mute");
+MODULE_ALIAS("ledtrig:audio-micmute");