Skip to contentSkip to conversation

toshiba_acpi: Add a module parameter to disable hotkeys registration

PATCH In review Azael Avalos 2 participants 2 messages Jan 25, 2016 – Feb 7, 2016

Subsystems (2)
lore
Share & tools
lore

Azael Avalos

author maintainer
#0 lore raw

PATCH 1/1 toshiba_acpi: Add a module parameter to disable hotkeys registration

Some laptop models have working hotkeys without the need of the driver to activate them.

This patch adds a module parameter to tell the driver not to register the hotkeys.

The new parameter is useful in DE less installations or where the DE does not handle the hotkeys (see bug 99501).

---
 drivers/platform/x86/toshiba_acpi.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/platform/x86/toshiba_acpi.c +10 -0
index 5ace1e0..df1f1a7 100644
@@ -36,6 +36,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
@@ -220,6 +221,10 @@ struct toshiba_acpi_dev {
 
 static struct toshiba_acpi_dev *toshiba_acpi;
 
+static bool disable_hotkeys;
+module_param(disable_hotkeys, bool, 0444);
+MODULE_PARM_DESC(disable_hotkeys, "Disables the hotkeys activation");
+
 static const struct acpi_device_id toshiba_device_ids[] = {
 	{"TOS6200", 0},
 	{"TOS6207", 0},
@@ -2692,6 +2697,11 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
 	acpi_handle ec_handle;
 	int error;
 
+	if (disable_hotkeys) {
+		pr_info("Hotkeys disabled by module parameter\n");
+		return 0;
+	}
+
 	if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) {
 		pr_info("WMI event detected, hotkeys will not be monitored\n");
 		return 0;
Signature · 1 line
2.7.0
#1 lore raw
Quoted 10 lines · Azael Avalos

Some laptop models have working hotkeys without the need of the driver to activate them.

This patch adds a module parameter to tell the driver not to register the hotkeys.

The new parameter is useful in DE less installations or where the DE does not handle the hotkeys (see bug 99501).

Merged to testing. Thanks.

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center