* [PATCH] V2: platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist.
@ 2020-05-11 1:44 koba.ko
2020-05-14 1:26 ` Mario.Limonciello
2020-05-14 22:35 ` Pali Rohár
0 siblings, 2 replies; 3+ messages in thread
From: koba.ko @ 2020-05-11 1:44 UTC (permalink / raw)
To: Matthew Garrett, Pali Rohár, Darren Hart, Andy Shevchenko,
platform-driver-x86, linux-kernel, Mario.Limonciello
From: Koba Ko <koba.ko@canonical.com>
On dell G3-3590, error message is issued during boot up,
"platform::micmute: Setting an LED's brightness failed (-19)",
but there's no micmute led on the machine.
Get the related tokens of SMBIOS, GLOBAL_MIC_MUTE_DISABLE/ENABLE.
If one of two tokens doesn't exist,
don't call led_classdev_register() for platform::micmute.
After that, you wouldn't see the platform::micmute in /sys/class/leds/,
and the error message wouldn't see in dmesg.
Signed-off-by: Koba Ko <koba.ko@canonical.com>
---
Changelog:
1. Refine the typo of comment.
---
drivers/platform/x86/dell-laptop.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 1e46022fb2c5..afc1ded83e56 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -2208,10 +2208,13 @@ static int __init dell_init(void)
dell_laptop_register_notifier(&dell_laptop_notifier);
- 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;
+ if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
+ dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE)) {
+ 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;
+ }
if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
return 0;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH] V2: platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist.
2020-05-11 1:44 [PATCH] V2: platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist koba.ko
@ 2020-05-14 1:26 ` Mario.Limonciello
2020-05-14 22:35 ` Pali Rohár
1 sibling, 0 replies; 3+ messages in thread
From: Mario.Limonciello @ 2020-05-14 1:26 UTC (permalink / raw)
To: koba.ko, mjg59, pali.rohar, dvhart, andy, platform-driver-x86,
linux-kernel
> -----Original Message-----
> From: koba.ko@canonical.com <koba.ko@canonical.com>
> Sent: Sunday, May 10, 2020 8:45 PM
> To: Matthew Garrett; Pali Rohár; Darren Hart; Andy Shevchenko; platform-driver-
> x86@vger.kernel.org; linux-kernel@vger.kernel.org; Limonciello, Mario
> Subject: [PATCH] V2: platform/x86: dell-laptop: don't register
> platform::micmute if the related tokens don't exist.
>
>
> [EXTERNAL EMAIL]
>
> From: Koba Ko <koba.ko@canonical.com>
>
> On dell G3-3590, error message is issued during boot up,
> "platform::micmute: Setting an LED's brightness failed (-19)",
> but there's no micmute led on the machine.
>
> Get the related tokens of SMBIOS, GLOBAL_MIC_MUTE_DISABLE/ENABLE.
> If one of two tokens doesn't exist,
> don't call led_classdev_register() for platform::micmute.
> After that, you wouldn't see the platform::micmute in /sys/class/leds/,
> and the error message wouldn't see in dmesg.
>
> Signed-off-by: Koba Ko <koba.ko@canonical.com>
> ---
> Changelog:
> 1. Refine the typo of comment.
> ---
> drivers/platform/x86/dell-laptop.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-
> laptop.c
> index 1e46022fb2c5..afc1ded83e56 100644
> --- a/drivers/platform/x86/dell-laptop.c
> +++ b/drivers/platform/x86/dell-laptop.c
> @@ -2208,10 +2208,13 @@ static int __init dell_init(void)
>
> dell_laptop_register_notifier(&dell_laptop_notifier);
>
> - 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;
> + if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
> + dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE)) {
> + 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;
> + }
>
> if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
> return 0;
> --
> 2.17.1
Reviewed-by: Mario Limonciello <Mario.limonciello@dell.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] V2: platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist.
2020-05-11 1:44 [PATCH] V2: platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist koba.ko
2020-05-14 1:26 ` Mario.Limonciello
@ 2020-05-14 22:35 ` Pali Rohár
1 sibling, 0 replies; 3+ messages in thread
From: Pali Rohár @ 2020-05-14 22:35 UTC (permalink / raw)
To: koba.ko
Cc: Matthew Garrett, Darren Hart, Andy Shevchenko,
platform-driver-x86, linux-kernel, Mario.Limonciello
On Monday 11 May 2020 09:44:56 koba.ko@canonical.com wrote:
> From: Koba Ko <koba.ko@canonical.com>
>
> On dell G3-3590, error message is issued during boot up,
> "platform::micmute: Setting an LED's brightness failed (-19)",
> but there's no micmute led on the machine.
>
> Get the related tokens of SMBIOS, GLOBAL_MIC_MUTE_DISABLE/ENABLE.
> If one of two tokens doesn't exist,
> don't call led_classdev_register() for platform::micmute.
> After that, you wouldn't see the platform::micmute in /sys/class/leds/,
> and the error message wouldn't see in dmesg.
>
> Signed-off-by: Koba Ko <koba.ko@canonical.com>
Fine for me, you can add:
Reviewed-by: Pali Rohár <pali@kernel.org>
Darren / Andy, when applying this patch, please add Fixes line so this
change would be propagated to stable kernels:
Fixes: d00fa46e0a2c6 ("platform/x86: dell-laptop: Add micmute LED trigger support")
> ---
> Changelog:
> 1. Refine the typo of comment.
> ---
> drivers/platform/x86/dell-laptop.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
> index 1e46022fb2c5..afc1ded83e56 100644
> --- a/drivers/platform/x86/dell-laptop.c
> +++ b/drivers/platform/x86/dell-laptop.c
> @@ -2208,10 +2208,13 @@ static int __init dell_init(void)
>
> dell_laptop_register_notifier(&dell_laptop_notifier);
>
> - 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;
> + if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
> + dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE)) {
> + 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;
> + }
>
> if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
> return 0;
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-14 22:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-11 1:44 [PATCH] V2: platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist koba.ko
2020-05-14 1:26 ` Mario.Limonciello
2020-05-14 22:35 ` Pali Rohár
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).