Re: [PATCH] platform/x86: remove obsolete calls to ledtrig_audio_get

[Heiner Kallweit <hkallweit1@gmail.com>]

On 14.01.2024 17:34, Hans de Goede wrote:
> Hi Heiner
> 
> On 1/13/24 18:03, 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.
> 
> Thank you for your patch since these drivers now no longer
> depend on the ledtrig-audio module can you please remove the:
> 
>         select LEDS_TRIGGERS
>         select LEDS_TRIGGER_AUDIO
> 
> lines from the Kconfig bits for the modified drivers?
> 
Sure. I thought about this, but wasn't sure whether the LED support is
highly desirable from a functional point of view, what may have justified
keeping the selects.

> Regards,
> 
> Hans
> 
> 
> 
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>>  drivers/platform/x86/asus-wmi.c              | 1 -
>>  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 -
>>  5 files changed, 6 deletions(-)
>>
>> 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/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--)
>