platform/x86: remove obsolete calls to ledtrig_audio_get
Subsystems (4)
PATCH v2 1/1 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.
---
v2:
- remove Kconfig dependencies related to the audio LED trigger
--- drivers/platform/x86/Kconfig | 6 ------ drivers/platform/x86/asus-wmi.c | 1 - drivers/platform/x86/dell/Kconfig | 3 --- drivers/platform/x86/dell/dell-laptop.c | 2 -- drivers/platform/x86/dell/dell-wmi-privacy.c | 1 - drivers/platform/x86/huawei-wmi.c | 1 - drivers/platform/x86/thinkpad_acpi.c | 1 - 7 files changed, 15 deletions(-)
drivers/platform/x86/Kconfig +0 -6
@@ -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
drivers/platform/x86/asus-wmi.c +0 -1
@@ -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" ;
drivers/platform/x86/dell/Kconfig +0 -3
@@ -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"
drivers/platform/x86/dell/dell-laptop.c +0 -2
@@ -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;
drivers/platform/x86/dell/dell-wmi-privacy.c +0 -1
@@ -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); }
drivers/platform/x86/huawei-wmi.c +0 -1
@@ -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 ;
drivers/platform/x86/thinkpad_acpi.c +0 -1
@@ -9285,7 +9285,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--)
Signature · 1 line
2.43.0
Hi,
Quoted 6 lines · Heiner Kallweit
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 toledtrig_audio_get.
Quoted 7 lines
Positive side effect: There's no code dependency to ledtrig-audio any longer, what allows to remove some
Kconfigdependencies.Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- removeKconfigdependencies related to the audio LED trigger
Thanks, patch looks good to me:
Regards,
Hans
Quoted 130 lines
--- drivers/platform/x86/Kconfig | 6 ------ drivers/platform/x86/asus-wmi.c | 1 - drivers/platform/x86/dell/Kconfig | 3 --- drivers/platform/x86/dell/dell-laptop.c | 2 -- drivers/platform/x86/dell/dell-wmi-privacy.c | 1 - drivers/platform/x86/huawei-wmi.c | 1 - drivers/platform/x86/thinkpad_acpi.c | 1 - 7 files changed, 15 deletions(-)drivers/platform/x86/Kconfig +0
-6@@ -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, videodrivers/platform/x86/asus-wmi.c +0
-1@@ -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" ;drivers/platform/x86/dell/Kconfig +0
-3@@ -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"drivers/platform/x86/dell/dell-laptop.c +0
-2@@ -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;drivers/platform/x86/dell/dell-wmi-privacy.c +0
-1@@ -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); }drivers/platform/x86/huawei-wmi.c +0
-1@@ -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 ;drivers/platform/x86/thinkpad_acpi.c +0
-1@@ -9285,7 +9285,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--)
Ilpo Järvinen
maintainerQuoted 10 lines · Heiner Kallweit
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 toledtrig_audio_get.Positive side effect: There's no code dependency to ledtrig-audio any longer, what allows to remove some
Kconfigdependencies.[...]
Thank you for your contribution, it has been applied to my local review-ilpo branch. Note it will show up in the public platform-drivers-x86/review-ilpo branch only once I've pushed my local branch there, which might take a while.
The list of commits applied:
[1/1] platform/x86: remove obsolete calls to ledtrig_audio_get
commit: 2cee4d0c82c023c9012a3a8814cc5c2bcc9b6db6
--
i.