Re: [PATCH] platform/x86: dell: fix DELL_WMI_PRIVACY dependencies & build error

From: Hans de Goede
Date: Tue Sep 21 2021 - 08:54:05 EST


Hi,

On 9/18/21 6:48 AM, Randy Dunlap wrote:
> When DELL_WMI=y, DELL_WMI_PRIVACY=y, and LEDS_TRIGGER_AUDIO=m, there
> is a linker error since the LEDS trigger code is built as a loadable
> module. This happens because DELL_WMI_PRIVACY is a bool that depends
> on a tristate (LEDS_TRIGGER_AUDIO=m), which can be dangerous.
>
> ld: drivers/platform/x86/dell/dell-wmi-privacy.o: in function `dell_privacy_wmi_probe':
> dell-wmi-privacy.c:(.text+0x3df): undefined reference to `ledtrig_audio_get'
>
> Fixes: 8af9fa37b8a3 ("platform/x86: dell-privacy: Add support for Dell hardware privacy")
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Perry Yuan <Perry.Yuan@xxxxxxxx>
> Cc: Dell.Client.Kernel@xxxxxxxx
> Cc: platform-driver-x86@xxxxxxxxxxxxxxx
> Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
> Cc: Mark Gross <mgross@xxxxxxxxxxxxxxx>

p.s.

I'll also add this to the pdx86 fixes branch and include it in my next
pdx86-fixes for 5.15 pull-req to Linus.

Regards,

Hans




> ---
> drivers/platform/x86/dell/Kconfig | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- linux-next-20210917.orig/drivers/platform/x86/dell/Kconfig
> +++ linux-next-20210917/drivers/platform/x86/dell/Kconfig
> @@ -166,8 +166,7 @@ config DELL_WMI
>
> config DELL_WMI_PRIVACY
> bool "Dell WMI Hardware Privacy Support"
> - depends on DELL_WMI
> - depends on LEDS_TRIGGER_AUDIO
> + depends on LEDS_TRIGGER_AUDIO = y || DELL_WMI = LEDS_TRIGGER_AUDIO
> help
> This option adds integration with the "Dell Hardware Privacy"
> feature of Dell laptops to the dell-wmi driver.
>