ALSA: control-led: Integrate mute led trigger

[linux-2.6-block.git] / sound / core / control_led.c

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");