Commit 2cee4d0c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ilpo Järvinen

platform/x86: remove obsolete calls to ledtrig_audio_get

Since 64f67b52 ("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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/daef7331-dcb4-4b3a-802e-656629486b4c@gmail.comReviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 890a48ca
...@@ -56,8 +56,6 @@ config HUAWEI_WMI ...@@ -56,8 +56,6 @@ config HUAWEI_WMI
depends on INPUT depends on INPUT
select INPUT_SPARSEKMAP select INPUT_SPARSEKMAP
select LEDS_CLASS select LEDS_CLASS
select LEDS_TRIGGERS
select LEDS_TRIGGER_AUDIO
select NEW_LEDS select NEW_LEDS
help help
This driver provides support for Huawei WMI hotkeys, battery charge This driver provides support for Huawei WMI hotkeys, battery charge
...@@ -269,8 +267,6 @@ config ASUS_WMI ...@@ -269,8 +267,6 @@ config ASUS_WMI
select INPUT_SPARSEKMAP select INPUT_SPARSEKMAP
select LEDS_CLASS select LEDS_CLASS
select NEW_LEDS select NEW_LEDS
select LEDS_TRIGGERS
select LEDS_TRIGGER_AUDIO
select ACPI_PLATFORM_PROFILE select ACPI_PLATFORM_PROFILE
help help
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
...@@ -507,8 +503,6 @@ config THINKPAD_ACPI ...@@ -507,8 +503,6 @@ config THINKPAD_ACPI
select NVRAM select NVRAM
select NEW_LEDS select NEW_LEDS
select LEDS_CLASS select LEDS_CLASS
select LEDS_TRIGGERS
select LEDS_TRIGGER_AUDIO
help help
This is a driver for the IBM and Lenovo ThinkPad laptops. It adds This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
support for Fn-Fx key combinations, Bluetooth control, video support for Fn-Fx key combinations, Bluetooth control, video
......
...@@ -1620,7 +1620,6 @@ static int asus_wmi_led_init(struct asus_wmi *asus) ...@@ -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)) { if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
asus->micmute_led.name = "platform::micmute"; asus->micmute_led.name = "platform::micmute";
asus->micmute_led.max_brightness = 1; 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.brightness_set_blocking = micmute_led_set;
asus->micmute_led.default_trigger = "audio-micmute"; asus->micmute_led.default_trigger = "audio-micmute";
......
...@@ -57,8 +57,6 @@ config DELL_LAPTOP ...@@ -57,8 +57,6 @@ config DELL_LAPTOP
select POWER_SUPPLY select POWER_SUPPLY
select LEDS_CLASS select LEDS_CLASS
select NEW_LEDS select NEW_LEDS
select LEDS_TRIGGERS
select LEDS_TRIGGER_AUDIO
help help
This driver adds support for rfkill and backlight control to Dell This driver adds support for rfkill and backlight control to Dell
laptops (except for some models covered by the Compal driver). laptops (except for some models covered by the Compal driver).
...@@ -165,7 +163,6 @@ config DELL_WMI ...@@ -165,7 +163,6 @@ config DELL_WMI
config DELL_WMI_PRIVACY config DELL_WMI_PRIVACY
bool "Dell WMI Hardware Privacy Support" bool "Dell WMI Hardware Privacy Support"
depends on LEDS_TRIGGER_AUDIO = y || DELL_WMI = LEDS_TRIGGER_AUDIO
depends on DELL_WMI depends on DELL_WMI
help help
This option adds integration with the "Dell Hardware Privacy" This option adds integration with the "Dell Hardware Privacy"
......
...@@ -2252,7 +2252,6 @@ static int __init dell_init(void) ...@@ -2252,7 +2252,6 @@ static int __init dell_init(void)
if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) && if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE) && dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE) &&
!dell_privacy_has_mic_mute()) { !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); ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev);
if (ret < 0) if (ret < 0)
goto fail_led; goto fail_led;
...@@ -2261,7 +2260,6 @@ static int __init dell_init(void) ...@@ -2261,7 +2260,6 @@ static int __init dell_init(void)
if (dell_smbios_find_token(GLOBAL_MUTE_DISABLE) && if (dell_smbios_find_token(GLOBAL_MUTE_DISABLE) &&
dell_smbios_find_token(GLOBAL_MUTE_ENABLE)) { 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); ret = led_classdev_register(&platform_device->dev, &mute_led_cdev);
if (ret < 0) if (ret < 0)
goto fail_backlight; goto fail_backlight;
......
...@@ -288,7 +288,6 @@ static int dell_privacy_leds_setup(struct device *dev) ...@@ -288,7 +288,6 @@ static int dell_privacy_leds_setup(struct device *dev)
priv->cdev.max_brightness = 1; priv->cdev.max_brightness = 1;
priv->cdev.brightness_set_blocking = dell_privacy_micmute_led_set; priv->cdev.brightness_set_blocking = dell_privacy_micmute_led_set;
priv->cdev.default_trigger = "audio-micmute"; priv->cdev.default_trigger = "audio-micmute";
priv->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
return devm_led_classdev_register(dev, &priv->cdev); return devm_led_classdev_register(dev, &priv->cdev);
} }
......
...@@ -310,7 +310,6 @@ static void huawei_wmi_leds_setup(struct device *dev) ...@@ -310,7 +310,6 @@ static void huawei_wmi_leds_setup(struct device *dev)
huawei->cdev.max_brightness = 1; huawei->cdev.max_brightness = 1;
huawei->cdev.brightness_set_blocking = &huawei_wmi_micmute_led_set; huawei->cdev.brightness_set_blocking = &huawei_wmi_micmute_led_set;
huawei->cdev.default_trigger = "audio-micmute"; huawei->cdev.default_trigger = "audio-micmute";
huawei->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
huawei->cdev.dev = dev; huawei->cdev.dev = dev;
huawei->cdev.flags = LED_CORE_SUSPENDRESUME; huawei->cdev.flags = LED_CORE_SUSPENDRESUME;
......
...@@ -9283,7 +9283,6 @@ static int mute_led_init(struct ibm_init_struct *iibm) ...@@ -9283,7 +9283,6 @@ static int mute_led_init(struct ibm_init_struct *iibm)
continue; continue;
} }
mute_led_cdev[i].brightness = ledtrig_audio_get(i);
err = led_classdev_register(&tpacpi_pdev->dev, &mute_led_cdev[i]); err = led_classdev_register(&tpacpi_pdev->dev, &mute_led_cdev[i]);
if (err < 0) { if (err < 0) {
while (i--) while (i--)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment