Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

leds: trigger: audio: Remove this trigger

Now that the audio trigger is fully integrated in
sound/core/control_led.c, we can remove it here.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/1e339779-6d04-4392-8ea2-5592c0fd1aa2@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>

authored by

Heiner Kallweit and committed by
Lee Jones
ab2ab9e6 a24de38d

-82
-1
arch/mips/configs/ci20_defconfig
··· 152 152 CONFIG_LEDS_TRIGGER_PANIC=y 153 153 CONFIG_LEDS_TRIGGER_NETDEV=y 154 154 CONFIG_LEDS_TRIGGER_PATTERN=y 155 - CONFIG_LEDS_TRIGGER_AUDIO=y 156 155 CONFIG_RTC_CLASS=y 157 156 CONFIG_RTC_DRV_JZ4740=y 158 157 CONFIG_DMADEVICES=y
-67
drivers/leds/trigger/ledtrig-audio.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 2 - // 3 - // Audio Mute LED trigger 4 - // 5 - 6 - #include <linux/kernel.h> 7 - #include <linux/leds.h> 8 - #include <linux/module.h> 9 - #include "../leds.h" 10 - 11 - static enum led_brightness audio_state[NUM_AUDIO_LEDS]; 12 - 13 - static int ledtrig_audio_mute_activate(struct led_classdev *led_cdev) 14 - { 15 - led_set_brightness_nosleep(led_cdev, audio_state[LED_AUDIO_MUTE]); 16 - return 0; 17 - } 18 - 19 - static int ledtrig_audio_micmute_activate(struct led_classdev *led_cdev) 20 - { 21 - led_set_brightness_nosleep(led_cdev, audio_state[LED_AUDIO_MICMUTE]); 22 - return 0; 23 - } 24 - 25 - static struct led_trigger ledtrig_audio[NUM_AUDIO_LEDS] = { 26 - [LED_AUDIO_MUTE] = { 27 - .name = "audio-mute", 28 - .activate = ledtrig_audio_mute_activate, 29 - }, 30 - [LED_AUDIO_MICMUTE] = { 31 - .name = "audio-micmute", 32 - .activate = ledtrig_audio_micmute_activate, 33 - }, 34 - }; 35 - 36 - enum led_brightness ledtrig_audio_get(enum led_audio type) 37 - { 38 - return audio_state[type]; 39 - } 40 - EXPORT_SYMBOL_GPL(ledtrig_audio_get); 41 - 42 - void ledtrig_audio_set(enum led_audio type, enum led_brightness state) 43 - { 44 - audio_state[type] = state; 45 - led_trigger_event(&ledtrig_audio[type], state); 46 - } 47 - EXPORT_SYMBOL_GPL(ledtrig_audio_set); 48 - 49 - static int __init ledtrig_audio_init(void) 50 - { 51 - led_trigger_register(&ledtrig_audio[LED_AUDIO_MUTE]); 52 - led_trigger_register(&ledtrig_audio[LED_AUDIO_MICMUTE]); 53 - return 0; 54 - } 55 - module_init(ledtrig_audio_init); 56 - 57 - static void __exit ledtrig_audio_exit(void) 58 - { 59 - led_trigger_unregister(&ledtrig_audio[LED_AUDIO_MUTE]); 60 - led_trigger_unregister(&ledtrig_audio[LED_AUDIO_MICMUTE]); 61 - } 62 - module_exit(ledtrig_audio_exit); 63 - 64 - MODULE_DESCRIPTION("LED trigger for audio mute control"); 65 - MODULE_LICENSE("GPL v2"); 66 - MODULE_ALIAS("ledtrig:audio-mute"); 67 - MODULE_ALIAS("ledtrig:audio-micmute");
-14
include/linux/leds.h
··· 705 705 NUM_AUDIO_LEDS 706 706 }; 707 707 708 - #if IS_ENABLED(CONFIG_LEDS_TRIGGER_AUDIO) 709 - enum led_brightness ledtrig_audio_get(enum led_audio type); 710 - void ledtrig_audio_set(enum led_audio type, enum led_brightness state); 711 - #else 712 - static inline enum led_brightness ledtrig_audio_get(enum led_audio type) 713 - { 714 - return LED_OFF; 715 - } 716 - static inline void ledtrig_audio_set(enum led_audio type, 717 - enum led_brightness state) 718 - { 719 - } 720 - #endif 721 - 722 708 #endif /* __LINUX_LEDS_H_INCLUDED */