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>

diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig
index cdf2a782dee130f31832e0f542409ba82a07df81..7827b2b392f670eb4db55bb37a7d07bddf0025c6 100644 (file)
--- a/arch/mips/configs/ci20_defconfig
+++ b/arch/mips/configs/ci20_defconfig
@@ -152,7 +152,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGER_PATTERN=y
-CONFIG_LEDS_TRIGGER_AUDIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_JZ4740=y
 CONFIG_DMADEVICES=y

diff --git a/drivers/leds/trigger/ledtrig-audio.c b/drivers/leds/trigger/ledtrig-audio.c
deleted file mode 100644 (file)
index 2ecd4b7..0000000
--- a/drivers/leds/trigger/ledtrig-audio.c
+++ /dev/null
@@ -1,67 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-//
-// Audio Mute LED trigger
-//
-
-#include <linux/kernel.h>
-#include <linux/leds.h>
-#include <linux/module.h>
-#include "../leds.h"
-
-static enum led_brightness audio_state[NUM_AUDIO_LEDS];
-
-static int ledtrig_audio_mute_activate(struct led_classdev *led_cdev)
-{
-       led_set_brightness_nosleep(led_cdev, audio_state[LED_AUDIO_MUTE]);
-       return 0;
-}
-
-static int ledtrig_audio_micmute_activate(struct led_classdev *led_cdev)
-{
-       led_set_brightness_nosleep(led_cdev, audio_state[LED_AUDIO_MICMUTE]);
-       return 0;
-}
-
-static struct led_trigger ledtrig_audio[NUM_AUDIO_LEDS] = {
-       [LED_AUDIO_MUTE] = {
-               .name     = "audio-mute",
-               .activate = ledtrig_audio_mute_activate,
-       },
-       [LED_AUDIO_MICMUTE] = {
-               .name     = "audio-micmute",
-               .activate = ledtrig_audio_micmute_activate,
-       },
-};
-
-enum led_brightness ledtrig_audio_get(enum led_audio type)
-{
-       return audio_state[type];
-}
-EXPORT_SYMBOL_GPL(ledtrig_audio_get);
-
-void ledtrig_audio_set(enum led_audio type, enum led_brightness state)
-{
-       audio_state[type] = state;
-       led_trigger_event(&ledtrig_audio[type], state);
-}
-EXPORT_SYMBOL_GPL(ledtrig_audio_set);
-
-static int __init ledtrig_audio_init(void)
-{
-       led_trigger_register(&ledtrig_audio[LED_AUDIO_MUTE]);
-       led_trigger_register(&ledtrig_audio[LED_AUDIO_MICMUTE]);
-       return 0;
-}
-module_init(ledtrig_audio_init);
-
-static void __exit ledtrig_audio_exit(void)
-{
-       led_trigger_unregister(&ledtrig_audio[LED_AUDIO_MUTE]);
-       led_trigger_unregister(&ledtrig_audio[LED_AUDIO_MICMUTE]);
-}
-module_exit(ledtrig_audio_exit);
-
-MODULE_DESCRIPTION("LED trigger for audio mute control");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("ledtrig:audio-mute");
-MODULE_ALIAS("ledtrig:audio-micmute");

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 7964ee38b2a3a5a379fff207445452a44aa79ac2..6300313c46b79957a2febfc5a312eab8d7fd9a05 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -705,18 +705,4 @@ enum led_audio {
        NUM_AUDIO_LEDS
 };
 
-#if IS_ENABLED(CONFIG_LEDS_TRIGGER_AUDIO)
-enum led_brightness ledtrig_audio_get(enum led_audio type);
-void ledtrig_audio_set(enum led_audio type, enum led_brightness state);
-#else
-static inline enum led_brightness ledtrig_audio_get(enum led_audio type)
-{
-       return LED_OFF;
-}
-static inline void ledtrig_audio_set(enum led_audio type,
-                                    enum led_brightness state)
-{
-}
-#endif
-
 #endif         /* __LINUX_LEDS_H_INCLUDED */