From patchwork Mon Jan 25 19:52:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 8115301 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AEED3BEEE5 for ; Mon, 25 Jan 2016 19:52:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA4432022A for ; Mon, 25 Jan 2016 19:52:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E74112009C for ; Mon, 25 Jan 2016 19:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934321AbcAYTwZ (ORCPT ); Mon, 25 Jan 2016 14:52:25 -0500 Received: from mail-oi0-f43.google.com ([209.85.218.43]:34572 "EHLO mail-oi0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934319AbcAYTwY (ORCPT ); Mon, 25 Jan 2016 14:52:24 -0500 Received: by mail-oi0-f43.google.com with SMTP id k206so95787127oia.1; Mon, 25 Jan 2016 11:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=qG3crKLBc9R676gbw6KMk+223RxqIWIOpFlNhWSMeXM=; b=CUkaIWPdh4wph725FkFAx9lARawu2dYkPOCQoGDi0+D598c8z8vxtlftyhILFvl6X5 xkECbxL89sZXwHzFfQuPfPMw7zROE1gXL7EbFrmnAZGbnf4BoPzT99xVpxIYwcEl007a 01YW26CLrvMjbc2pNMcgG03Tw4HGtNkMbSZ//cbgHVT1q8aYUhXDN9FRQMqBL24HstaC wiY4zx7VWmPjWnD5L3XmkzHzL0FkttW4Woya6tcb5X9j356nlvTAbbM0G8aw7MdZ8Wam dfXvHEdG0okJD+Dvr1I82ZNz0Lj+TmL0mMbZQmOdH09MzkPdFiAllnYjTTZz23z7Eq0J IeWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qG3crKLBc9R676gbw6KMk+223RxqIWIOpFlNhWSMeXM=; b=dTcrptJJklfHkDPchoJ71CLNwSRORqehq7pwf+K1xXausi3PtCcICn70K1gf4yYlnN 1uXgOBnE2/yDbfiWl4mhF+7UtMwRhlgwDFh6+ivvaN5imTXoNsyyzaEcIAt2Op2z/4EN eSvlwOA3SNIrbfBlDl1bBNR3QB+aDH3KXwNlHPdQLHwKe1yCMmCdSPsDvk6E3Fvlck5b 8pL2dT1YfdsYlVNGJpi0fMsCejcsIubHhXW5ZBqj1q2lyCzvWEow5RNnZY9YbTDjMPsb y+71UZI13saq+TpvnmMQUgWf5KRmcMGzvSF5r9OfBJOIliDV7Q7Z4gpAl3XdgGTw5N8f MCTw== X-Gm-Message-State: AG10YOQ923+pvSKtPRiJz0HTxCcgw1/K9YtZjgVIpbnnYoWE3sNnPVfYpsDLxaSVOv9oKA== X-Received: by 10.202.226.141 with SMTP id z135mr14006351oig.21.1453751542451; Mon, 25 Jan 2016 11:52:22 -0800 (PST) Received: from Shakuras.scurra.org ([148.210.108.137]) by smtp.gmail.com with ESMTPSA id w143sm11068074oiw.16.2016.01.25.11.52.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Jan 2016 11:52:21 -0800 (PST) From: Azael Avalos To: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Azael Avalos Subject: [PATCH] toshiba_acpi: Add a module parameter to disable hotkeys registration Date: Mon, 25 Jan 2016 12:52:18 -0700 Message-Id: <1453751538-18993-1-git-send-email-coproscefalo@gmail.com> X-Mailer: git-send-email 2.7.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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). Signed-off-by: Azael Avalos --- drivers/platform/x86/toshiba_acpi.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 5ace1e0..df1f1a7 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -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;