|
From: Hans de G. <hde...@re...> - 2024-01-14 18:57:08
|
Hi,
On 1/14/24 18:14, Heiner Kallweit wrote:
> 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 <hka...@gm...>
> ---
> v2:
> - remove Kconfig dependencies related to the audio LED trigger
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hde...@re...>
Regards,
Hans
> ---
> 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(-)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index bdd302274..6dbd40e2a 100644
> --- 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 18be35fdb..21dee425e 100644
> --- 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 e712df67f..bd9f44597 100644
> --- 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 658643835..42f7de2b4 100644
> --- 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 c517bd45d..4d94603f7 100644
> --- 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 0ef1c46b6..dde139c69 100644
> --- 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 c4895e9bc..d1c9f91fd 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -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--)
|
