platform/x86: remove obsolete calls to ledtrig_audio_get

Since 64f67b5240db ("leds: trigger: audio: Add an activate callback to
ensure the initial brightness is set") the audio triggers have an
activate callback which sets the LED brightness as soon as the
(default) trigger is bound to the LED device. So we can remove the
call to ledtrig_audio_get.

Positive side effect: There's no code dependency to ledtrig-audio any
longer, what allows to remove some Kconfig dependencies.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/daef7331-dcb4-4b3a-802e-656629486b4c@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index bdd302274b9ab360c2d7bf0cf36ac99f6efed4b4..6dbd40e2aeda26b76326365bd31219034dec1d2a 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -56,8 +56,6 @@ config HUAWEI_WMI
        depends on INPUT
        select INPUT_SPARSEKMAP
        select LEDS_CLASS
-       select LEDS_TRIGGERS
-       select LEDS_TRIGGER_AUDIO
        select NEW_LEDS
        help
          This driver provides support for Huawei WMI hotkeys, battery charge
@@ -269,8 +267,6 @@ config ASUS_WMI
        select INPUT_SPARSEKMAP
        select LEDS_CLASS
        select NEW_LEDS
-       select LEDS_TRIGGERS
-       select LEDS_TRIGGER_AUDIO
        select ACPI_PLATFORM_PROFILE
        help
          Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
@@ -507,8 +503,6 @@ config THINKPAD_ACPI
        select NVRAM
        select NEW_LEDS
        select LEDS_CLASS
-       select LEDS_TRIGGERS
-       select LEDS_TRIGGER_AUDIO
        help
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 18be35fdb3814d1d6659f48d3fc871bf30ee581d..21dee425ea6fc6d5beb8616a8a521b720d109ea7 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -1620,7 +1620,6 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
        if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
                asus->micmute_led.name = "platform::micmute";
                asus->micmute_led.max_brightness = 1;
-               asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
                asus->micmute_led.brightness_set_blocking = micmute_led_set;
                asus->micmute_led.default_trigger = "audio-micmute";
 

diff --git a/drivers/platform/x86/dell/Kconfig b/drivers/platform/x86/dell/Kconfig
index e712df67fa6be047c71061083b75ef3b8269a679..bd9f445974cc683abad5a7734970becff10feb9e 100644 (file)
--- a/drivers/platform/x86/dell/Kconfig
+++ b/drivers/platform/x86/dell/Kconfig
@@ -57,8 +57,6 @@ config DELL_LAPTOP
        select POWER_SUPPLY
        select LEDS_CLASS
        select NEW_LEDS
-       select LEDS_TRIGGERS
-       select LEDS_TRIGGER_AUDIO
        help
        This driver adds support for rfkill and backlight control to Dell
        laptops (except for some models covered by the Compal driver).
@@ -165,7 +163,6 @@ config DELL_WMI
 
 config DELL_WMI_PRIVACY
        bool "Dell WMI Hardware Privacy Support"
-       depends on LEDS_TRIGGER_AUDIO = y || DELL_WMI = LEDS_TRIGGER_AUDIO
        depends on DELL_WMI
        help
          This option adds integration with the "Dell Hardware Privacy"

diff --git a/drivers/platform/x86/dell/dell-laptop.c b/drivers/platform/x86/dell/dell-laptop.c
index 6586438356de76fbab93cd88d85ef6c88574d852..42f7de2b45223fe904649b897636840f37361f65 100644 (file)
--- a/drivers/platform/x86/dell/dell-laptop.c
+++ b/drivers/platform/x86/dell/dell-laptop.c
@@ -2252,7 +2252,6 @@ static int __init dell_init(void)
        if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
            dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE) &&
            !dell_privacy_has_mic_mute()) {
-               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;
@@ -2261,7 +2260,6 @@ static int __init dell_init(void)
 
        if (dell_smbios_find_token(GLOBAL_MUTE_DISABLE) &&
            dell_smbios_find_token(GLOBAL_MUTE_ENABLE)) {
-               mute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MUTE);
                ret = led_classdev_register(&platform_device->dev, &mute_led_cdev);
                if (ret < 0)
                        goto fail_backlight;

diff --git a/drivers/platform/x86/dell/dell-wmi-privacy.c b/drivers/platform/x86/dell/dell-wmi-privacy.c
index c517bd45dd32e4154f239e01ccf1bd98c606ded2..4d94603f7785aa535ec405cb70fe9fe0a6344632 100644 (file)
--- a/drivers/platform/x86/dell/dell-wmi-privacy.c
+++ b/drivers/platform/x86/dell/dell-wmi-privacy.c
@@ -288,7 +288,6 @@ static int dell_privacy_leds_setup(struct device *dev)
        priv->cdev.max_brightness = 1;
        priv->cdev.brightness_set_blocking = dell_privacy_micmute_led_set;
        priv->cdev.default_trigger = "audio-micmute";
-       priv->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
        return devm_led_classdev_register(dev, &priv->cdev);
 }
 

diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index 0ef1c46b617b63e7219357b3a93981bfee61bcd9..dde139c69945eb3ff6fd3d162e956c321531bf90 100644 (file)
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -310,7 +310,6 @@ static void huawei_wmi_leds_setup(struct device *dev)
        huawei->cdev.max_brightness = 1;
        huawei->cdev.brightness_set_blocking = &huawei_wmi_micmute_led_set;
        huawei->cdev.default_trigger = "audio-micmute";
-       huawei->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
        huawei->cdev.dev = dev;
        huawei->cdev.flags = LED_CORE_SUSPENDRESUME;
 

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 7bf91cfd3e51a459f54e6b0d0f939b63ec3fe994..b769d9d60432c36423deb77580dce210c1d542d4 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9283,7 +9283,6 @@ static int mute_led_init(struct ibm_init_struct *iibm)
                        continue;
                }
 
-               mute_led_cdev[i].brightness = ledtrig_audio_get(i);
                err = led_classdev_register(&tpacpi_pdev->dev, &mute_led_cdev[i]);
                if (err < 0) {
                        while (i--)