Skip to content

Commit 2cee4d0

Browse files
hkallweitij-intel
authored andcommitted
platform/x86: remove obsolete calls to ledtrig_audio_get
Since 64f67b5 ("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>
1 parent 890a48c commit 2cee4d0

File tree

7 files changed

+0
-15
lines changed

7 files changed

+0
-15
lines changed

drivers/platform/x86/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ config HUAWEI_WMI
5656
depends on INPUT
5757
select INPUT_SPARSEKMAP
5858
select LEDS_CLASS
59-
select LEDS_TRIGGERS
60-
select LEDS_TRIGGER_AUDIO
6159
select NEW_LEDS
6260
help
6361
This driver provides support for Huawei WMI hotkeys, battery charge
@@ -269,8 +267,6 @@ config ASUS_WMI
269267
select INPUT_SPARSEKMAP
270268
select LEDS_CLASS
271269
select NEW_LEDS
272-
select LEDS_TRIGGERS
273-
select LEDS_TRIGGER_AUDIO
274270
select ACPI_PLATFORM_PROFILE
275271
help
276272
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
@@ -507,8 +503,6 @@ config THINKPAD_ACPI
507503
select NVRAM
508504
select NEW_LEDS
509505
select LEDS_CLASS
510-
select LEDS_TRIGGERS
511-
select LEDS_TRIGGER_AUDIO
512506
help
513507
This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
514508
support for Fn-Fx key combinations, Bluetooth control, video

drivers/platform/x86/asus-wmi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,6 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
16201620
if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
16211621
asus->micmute_led.name = "platform::micmute";
16221622
asus->micmute_led.max_brightness = 1;
1623-
asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
16241623
asus->micmute_led.brightness_set_blocking = micmute_led_set;
16251624
asus->micmute_led.default_trigger = "audio-micmute";
16261625

drivers/platform/x86/dell/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ config DELL_LAPTOP
5757
select POWER_SUPPLY
5858
select LEDS_CLASS
5959
select NEW_LEDS
60-
select LEDS_TRIGGERS
61-
select LEDS_TRIGGER_AUDIO
6260
help
6361
This driver adds support for rfkill and backlight control to Dell
6462
laptops (except for some models covered by the Compal driver).
@@ -165,7 +163,6 @@ config DELL_WMI
165163

166164
config DELL_WMI_PRIVACY
167165
bool "Dell WMI Hardware Privacy Support"
168-
depends on LEDS_TRIGGER_AUDIO = y || DELL_WMI = LEDS_TRIGGER_AUDIO
169166
depends on DELL_WMI
170167
help
171168
This option adds integration with the "Dell Hardware Privacy"

drivers/platform/x86/dell/dell-laptop.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,7 +2252,6 @@ static int __init dell_init(void)
22522252
if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
22532253
dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE) &&
22542254
!dell_privacy_has_mic_mute()) {
2255-
micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
22562255
ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev);
22572256
if (ret < 0)
22582257
goto fail_led;
@@ -2261,7 +2260,6 @@ static int __init dell_init(void)
22612260

22622261
if (dell_smbios_find_token(GLOBAL_MUTE_DISABLE) &&
22632262
dell_smbios_find_token(GLOBAL_MUTE_ENABLE)) {
2264-
mute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MUTE);
22652263
ret = led_classdev_register(&platform_device->dev, &mute_led_cdev);
22662264
if (ret < 0)
22672265
goto fail_backlight;

drivers/platform/x86/dell/dell-wmi-privacy.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ static int dell_privacy_leds_setup(struct device *dev)
288288
priv->cdev.max_brightness = 1;
289289
priv->cdev.brightness_set_blocking = dell_privacy_micmute_led_set;
290290
priv->cdev.default_trigger = "audio-micmute";
291-
priv->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
292291
return devm_led_classdev_register(dev, &priv->cdev);
293292
}
294293

drivers/platform/x86/huawei-wmi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ static void huawei_wmi_leds_setup(struct device *dev)
310310
huawei->cdev.max_brightness = 1;
311311
huawei->cdev.brightness_set_blocking = &huawei_wmi_micmute_led_set;
312312
huawei->cdev.default_trigger = "audio-micmute";
313-
huawei->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
314313
huawei->cdev.dev = dev;
315314
huawei->cdev.flags = LED_CORE_SUSPENDRESUME;
316315

drivers/platform/x86/thinkpad_acpi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9283,7 +9283,6 @@ static int mute_led_init(struct ibm_init_struct *iibm)
92839283
continue;
92849284
}
92859285

9286-
mute_led_cdev[i].brightness = ledtrig_audio_get(i);
92879286
err = led_classdev_register(&tpacpi_pdev->dev, &mute_led_cdev[i]);
92889287
if (err < 0) {
92899288
while (i--)

0 commit comments

Comments
 (0)