Merge tag 'sound-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[mirror_ubuntu-disco-kernel.git] / drivers / platform / x86 / dell-laptop.c

diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 63121fd22c2e112b6bcda28bad3aa49449999f36..95e6ca116e00e2932e8dbcce678ca3489c31b5dc 100644 (file)
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -29,7 +29,6 @@
 #include <linux/mm.h>
 #include <linux/i8042.h>
 #include <linux/debugfs.h>
-#include <linux/dell-led.h>
 #include <linux/seq_file.h>
 #include <acpi/video.h>
 #include "dell-rbtn.h"
@@ -2111,17 +2110,17 @@ static struct notifier_block dell_laptop_notifier = {
        .notifier_call = dell_laptop_notifier_call,
 };
 
-int dell_micmute_led_set(int state)
+static int micmute_led_set(struct led_classdev *led_cdev,
+                          enum led_brightness brightness)
 {
        struct calling_interface_buffer buffer;
        struct calling_interface_token *token;
+       int state = brightness != LED_OFF;
 
        if (state == 0)
                token = dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE);
-       else if (state == 1)
-               token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);
        else
-               return -EINVAL;
+               token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);
 
        if (!token)
                return -ENODEV;
@@ -2129,9 +2128,15 @@ int dell_micmute_led_set(int state)
        dell_fill_request(&buffer, token->location, token->value, 0, 0);
        dell_send_request(&buffer, CLASS_TOKEN_WRITE, SELECT_TOKEN_STD);
 
-       return state;
+       return 0;
 }
-EXPORT_SYMBOL_GPL(dell_micmute_led_set);
+
+static struct led_classdev micmute_led_cdev = {
+       .name = "platform::micmute",
+       .max_brightness = 1,
+       .brightness_set_blocking = micmute_led_set,
+       .default_trigger = "audio-micmute",
+};
 
 static int __init dell_init(void)
 {
@@ -2177,6 +2182,11 @@ static int __init dell_init(void)
 
        dell_laptop_register_notifier(&dell_laptop_notifier);
 
+       micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+       ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev);
+       if (ret < 0)
+               goto fail_led;
+
        if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
                return 0;
 
@@ -2222,6 +2232,8 @@ static int __init dell_init(void)
 fail_get_brightness:
        backlight_device_unregister(dell_backlight_device);
 fail_backlight:
+       led_classdev_unregister(&micmute_led_cdev);
+fail_led:
        dell_cleanup_rfkill();
 fail_rfkill:
        platform_device_del(platform_device);
@@ -2241,6 +2253,7 @@ static void __exit dell_exit(void)
                touchpad_led_exit();
        kbd_led_exit();
        backlight_device_unregister(dell_backlight_device);
+       led_classdev_unregister(&micmute_led_cdev);
        dell_cleanup_rfkill();
        if (platform_device) {
                platform_device_unregister(platform_device);