[PATCH AUTOSEL 5.4 08/11] platform/x86: lg-laptop: Remove LGEX0815 hotkey handling

[PATCH AUTOSEL 5.4 08/11] platform/x86: lg-laptop: Remove LGEX0815 hotkey handling

[Sasha Levin]

From: Armin Wolf <W_Armin@gmx.de>

[ Upstream commit 413c204595ca98a4f33414a948c18d7314087342 ]

The rfkill hotkey handling is already provided by the wireless-hotkey
driver. Remove the now unnecessary rfkill hotkey handling to avoid
duplicating functionality.

The ACPI notify handler still prints debugging information when
receiving ACPI notifications to aid in reverse-engineering.

Tested-by: Agathe Boutmy <agathe@boutmy.com>
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240606233540.9774-3-W_Armin@gmx.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/platform/x86/lg-laptop.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
index c0bb1f864dfeb..27c456b517850 100644
--- a/drivers/platform/x86/lg-laptop.c
+++ b/drivers/platform/x86/lg-laptop.c
@@ -79,7 +79,6 @@ static const struct key_entry wmi_keymap[] = {
 					  * this key both sends an event and
 					  * changes backlight level.
 					  */
-	{KE_KEY, 0x80, {KEY_RFKILL} },
 	{KE_END, 0}
 };
 
@@ -261,14 +260,7 @@ static void wmi_input_setup(void)
 
 static void acpi_notify(struct acpi_device *device, u32 event)
 {
-	struct key_entry *key;
-
 	acpi_handle_debug(device->handle, "notify: %d\n", event);
-	if (inited & INIT_SPARSE_KEYMAP) {
-		key = sparse_keymap_entry_from_scancode(wmi_input_dev, 0x80);
-		if (key && key->type == KE_KEY)
-			sparse_keymap_report_entry(wmi_input_dev, key, 1, true);
-	}
 }
 
 static ssize_t fan_mode_store(struct device *dev,
-- 
2.43.0

Re: [PATCH AUTOSEL 5.4 08/11] platform/x86: lg-laptop: Remove LGEX0815 hotkey handling

[Armin Wolf]

Am 09.07.24 um 18:26 schrieb Sasha Levin:

> From: Armin Wolf <W_Armin@gmx.de>
>
> [ Upstream commit 413c204595ca98a4f33414a948c18d7314087342 ]
>
> The rfkill hotkey handling is already provided by the wireless-hotkey
> driver. Remove the now unnecessary rfkill hotkey handling to avoid
> duplicating functionality.
>
> The ACPI notify handler still prints debugging information when
> receiving ACPI notifications to aid in reverse-engineering.

Hi,

this depends on other patches not in kernel 5.4, please do not use this
patch for kernel 5.4.

Thanks,
Armin Wolf

> Tested-by: Agathe Boutmy <agathe@boutmy.com>
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Link: https://lore.kernel.org/r/20240606233540.9774-3-W_Armin@gmx.de
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>   drivers/platform/x86/lg-laptop.c | 8 --------
>   1 file changed, 8 deletions(-)
>
> diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
> index c0bb1f864dfeb..27c456b517850 100644
> --- a/drivers/platform/x86/lg-laptop.c
> +++ b/drivers/platform/x86/lg-laptop.c
> @@ -79,7 +79,6 @@ static const struct key_entry wmi_keymap[] = {
>   					  * this key both sends an event and
>   					  * changes backlight level.
>   					  */
> -	{KE_KEY, 0x80, {KEY_RFKILL} },
>   	{KE_END, 0}
>   };
>
> @@ -261,14 +260,7 @@ static void wmi_input_setup(void)
>
>   static void acpi_notify(struct acpi_device *device, u32 event)
>   {
> -	struct key_entry *key;
> -
>   	acpi_handle_debug(device->handle, "notify: %d\n", event);
> -	if (inited & INIT_SPARSE_KEYMAP) {
> -		key = sparse_keymap_entry_from_scancode(wmi_input_dev, 0x80);
> -		if (key && key->type == KE_KEY)
> -			sparse_keymap_report_entry(wmi_input_dev, key, 1, true);
> -	}
>   }
>
>   static ssize_t fan_mode_store(struct device *dev,

Re: [PATCH AUTOSEL 5.4 08/11] platform/x86: lg-laptop: Remove LGEX0815 hotkey handling

[Sasha Levin]

On Tue, Jul 09, 2024 at 06:35:36PM +0200, Armin Wolf wrote:
>Am 09.07.24 um 18:26 schrieb Sasha Levin:
>
>>From: Armin Wolf <W_Armin@gmx.de>
>>
>>[ Upstream commit 413c204595ca98a4f33414a948c18d7314087342 ]
>>
>>The rfkill hotkey handling is already provided by the wireless-hotkey
>>driver. Remove the now unnecessary rfkill hotkey handling to avoid
>>duplicating functionality.
>>
>>The ACPI notify handler still prints debugging information when
>>receiving ACPI notifications to aid in reverse-engineering.
>
>Hi,
>
>this depends on other patches not in kernel 5.4, please do not use this
>patch for kernel 5.4.

Ack, I'll drop the two patches you've pointed out.

-- 
Thanks,
Sasha

[PATCH AUTOSEL 5.4 09/11] platform/x86: lg-laptop: Change ACPI device id

[Sasha Levin]

From: Armin Wolf <W_Armin@gmx.de>

[ Upstream commit 58a54f27a0dac81f7fd3514be01012635219a53c ]

The LGEX0815 ACPI device id is used for handling hotkey events, but
this functionality is already handled by the wireless-hotkey driver.

The LGEX0820 ACPI device id however is used to manage various
platform features using the WMAB/WMBB ACPI methods. Use this ACPI
device id to avoid blocking the wireless-hotkey driver from probing.

Tested-by: Agathe Boutmy <agathe@boutmy.com>
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240606233540.9774-4-W_Armin@gmx.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/platform/x86/lg-laptop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
index 27c456b517850..ff7ed8882aacb 100644
--- a/drivers/platform/x86/lg-laptop.c
+++ b/drivers/platform/x86/lg-laptop.c
@@ -653,7 +653,7 @@ static int acpi_remove(struct acpi_device *device)
 }
 
 static const struct acpi_device_id device_ids[] = {
-	{"LGEX0815", 0},
+	{"LGEX0820", 0},
 	{"", 0}
 };
 MODULE_DEVICE_TABLE(acpi, device_ids);
-- 
2.43.0

Re: [PATCH AUTOSEL 5.4 09/11] platform/x86: lg-laptop: Change ACPI device id

[Armin Wolf]

Am 09.07.24 um 18:26 schrieb Sasha Levin:

> From: Armin Wolf <W_Armin@gmx.de>
>
> [ Upstream commit 58a54f27a0dac81f7fd3514be01012635219a53c ]
>
> The LGEX0815 ACPI device id is used for handling hotkey events, but
> this functionality is already handled by the wireless-hotkey driver.
>
> The LGEX0820 ACPI device id however is used to manage various
> platform features using the WMAB/WMBB ACPI methods. Use this ACPI
> device id to avoid blocking the wireless-hotkey driver from probing.

Hi,

this depends on other patches not in kernel 5.4, please do not use this
patch for kernel 5.4.

Thanks,
Armin Wolf

>
> Tested-by: Agathe Boutmy <agathe@boutmy.com>
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Link: https://lore.kernel.org/r/20240606233540.9774-4-W_Armin@gmx.de
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>   drivers/platform/x86/lg-laptop.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
> index 27c456b517850..ff7ed8882aacb 100644
> --- a/drivers/platform/x86/lg-laptop.c
> +++ b/drivers/platform/x86/lg-laptop.c
> @@ -653,7 +653,7 @@ static int acpi_remove(struct acpi_device *device)
>   }
>
>   static const struct acpi_device_id device_ids[] = {
> -	{"LGEX0815", 0},
> +	{"LGEX0820", 0},
>   	{"", 0}
>   };
>   MODULE_DEVICE_TABLE(acpi, device_ids);