[PATCH] Fixes: bda38f9a41 ("HID: asus: use hid for brightness control on keyboard")

[PATCH] Fixes: bda38f9a41 ("HID: asus: use hid for brightness control on keyboard")

[Luke D. Jones]

- Fix missing braces around initializer
- Remove unused function declaration from asus-wmi.h

Signed-off-by: Luke D. Jones <luke@ljones.dev>
---
 include/linux/platform_data/x86/asus-wmi.h | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 96c780efa0d7..74b32e1d6735 100644
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -162,15 +162,6 @@ static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1,
 #endif
 
 /* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */
-#if IS_ENABLED(CONFIG_ASUS_WMI)
-bool asus_use_hid_led(void);
-#else
-static inline bool asus_use_hid_led(void)
-{
-	return true;
-}
-#endif
-
 static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
 	{
 		.matches = {
@@ -202,7 +193,7 @@ static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
 			DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
 		},
 	},
-	NULL,
+	{ },
 };
 
 #endif	/* __PLATFORM_DATA_X86_ASUS_WMI_H */
-- 
2.45.2

Re: [PATCH] Fixes: bda38f9a41 ("HID: asus: use hid for brightness control on keyboard")

[Benjamin Tissoires]

Hi Luke,

On Jun 24 2024, Luke D. Jones wrote:
> - Fix missing braces around initializer
> - Remove unused function declaration from asus-wmi.h
> 
> Signed-off-by: Luke D. Jones <luke@ljones.dev>

You are missing Reported-by: Mark Brown <broonie@kernel.org> to give
credits where it's due and also a link to the report:
Link: https://lore.kernel.org/all/ZnQ03jc-xEWam2cR@sirena.org.uk/

The subject formatting is also wrong.

> ---
>  include/linux/platform_data/x86/asus-wmi.h | 11 +----------

That's weird. That file shouldn't be touched from us (on the HID side)
without the ack from Hans or the platform x86 people.

And bda38f9a41 ("HID: asus: use hid for brightness...) doesn't have such
an ack.

This got me realize that the initial patch was incorrectly taken through
the hid tree:

in [1] Hans explicitely asked to take the patch through his tree.

So I'm going to drop your patch from the HID tree and ask you to
resubmit the entire patch as a v3 to the platform guys.

Cheers,
Benjamin


[1] https://lore.kernel.org/all/b0d8eebc-5abb-4ec0-898c-af7eedc730d9@redhat.com/

>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
> index 96c780efa0d7..74b32e1d6735 100644
> --- a/include/linux/platform_data/x86/asus-wmi.h
> +++ b/include/linux/platform_data/x86/asus-wmi.h
> @@ -162,15 +162,6 @@ static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1,
>  #endif
>  
>  /* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */
> -#if IS_ENABLED(CONFIG_ASUS_WMI)
> -bool asus_use_hid_led(void);
> -#else
> -static inline bool asus_use_hid_led(void)
> -{
> -	return true;
> -}
> -#endif
> -
>  static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
>  	{
>  		.matches = {
> @@ -202,7 +193,7 @@ static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
>  			DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
>  		},
>  	},
> -	NULL,
> +	{ },
>  };
>  
>  #endif	/* __PLATFORM_DATA_X86_ASUS_WMI_H */
> -- 
> 2.45.2
>