From patchwork Wed Dec 2 18:28:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 64321 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB2ITfaQ015362 for ; Wed, 2 Dec 2009 18:29:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755271AbZLBS3d (ORCPT ); Wed, 2 Dec 2009 13:29:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755258AbZLBS3d (ORCPT ); Wed, 2 Dec 2009 13:29:33 -0500 Received: from mail-ew0-f219.google.com ([209.85.219.219]:42357 "EHLO mail-ew0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754830AbZLBS3c convert rfc822-to-8bit (ORCPT ); Wed, 2 Dec 2009 13:29:32 -0500 Received: by ewy19 with SMTP id 19so545474ewy.21 for ; Wed, 02 Dec 2009 10:29:37 -0800 (PST) Received: by 10.213.25.75 with SMTP id y11mr467020ebb.49.1259778577173; Wed, 02 Dec 2009 10:29:37 -0800 (PST) Received: from destiny.ordissimo (253.175.70-86.rev.gaoland.net [86.70.175.253]) by mx.google.com with ESMTPS id 14sm885595ewy.11.2009.12.02.10.29.36 (version=SSLv3 cipher=RC4-MD5); Wed, 02 Dec 2009 10:29:37 -0800 (PST) Date: Wed, 2 Dec 2009 19:28:12 +0100 From: Anisse Astier To: linux-input@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Len Brown , Carlos Corbacho , Dmitry Torokhov Subject: [RFC PATCH 2/2] Input: msi-wmi - switch to using sparse keymap library Message-ID: <20091202192812.7e9919fb@destiny.ordissimo> In-Reply-To: <20091202192603.3e1de98a@destiny.ordissimo> References: <20091202192603.3e1de98a@destiny.ordissimo> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.12; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index fe142af..d6925ad 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -446,6 +446,7 @@ config MSI_WMI tristate "MSI WMI extras" depends on ACPI_WMI depends on INPUT + select INPUT_SPARSEKMAP ---help--- Say Y here if you want to support WMI-based hotkeys on MSI all-in-one WindTop AE1900-WT. diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index fb6d5bd..5dcb6fb 100644 --- a/drivers/platform/x86/msi-wmi.c +++ b/drivers/platform/x86/msi-wmi.c @@ -1,6 +1,7 @@ /* * MSI WMI hotkeys * + * Copyright (C) 2009 Anisse Astier * Copyright (C) 2009 Jérôme Pouiller * * Portions based on hp-wmi.c: @@ -28,51 +29,25 @@ #include #include +#include #include #include #define MSIWMI_EVENT_GUID "b6f3eef2-3d2f-49dc-9de3-85bce18c62f2" -struct key_entry { - u16 code; - u16 keycode; -}; - -static struct key_entry msi_wmi_keymap[] = { +static const struct key_entry msi_wmi_keymap[] = { /*Brightness keys should be used for a backlight driver*/ - {208, KEY_BRIGHTNESSUP}, - {209, KEY_BRIGHTNESSDOWN}, - {210, KEY_VOLUMEUP}, - {211, KEY_VOLUMEDOWN}, - {0} + {KE_KEY, 208, {KEY_BRIGHTNESSUP} }, + {KE_KEY, 209, {KEY_BRIGHTNESSDOWN} }, + {KE_KEY, 210, {KEY_VOLUMEUP} }, + {KE_KEY, 211, {KEY_VOLUMEDOWN} }, + {KE_END, 0} }; static struct input_dev *msi_wmi_input_dev; static unsigned long long msi_wmi_time_last_press; static unsigned pression_timeout = 10; -static struct key_entry *msi_wmi_get_entry_by_scancode(int code) -{ - struct key_entry *key; - - for (key = msi_wmi_keymap; key->code; key++) - if (code == key->code) - return key; - - return NULL; -} - -static struct key_entry *msi_wmi_get_entry_by_keycode(int keycode) -{ - struct key_entry *key; - - for (key = msi_wmi_keymap; key->code; key++) - if (keycode == key->keycode) - return key; - - return NULL; -} - static void msi_wmi_notify(u32 value, void *context) { struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; @@ -94,7 +69,8 @@ static void msi_wmi_notify(u32 value, void *context) "MSI WMI: event correctly received: %llu\n", obj->integer.value); msi_wmi_time_last_press = get_jiffies_64(); - key = msi_wmi_get_entry_by_scancode(obj->integer.value); + key = sparse_keymap_entry_from_scancode(msi_wmi_input_dev, + obj->integer.value); input_report_key(msi_wmi_input_dev, key->keycode, 1); input_sync(msi_wmi_input_dev); input_report_key(msi_wmi_input_dev, key->keycode, 0); @@ -102,42 +78,8 @@ static void msi_wmi_notify(u32 value, void *context) } } -static int msi_wmi_getkeycode(struct input_dev *dev, int scancode, int *keycode) -{ - struct key_entry *key = msi_wmi_get_entry_by_scancode(scancode); - - if (key && key->code) { - *keycode = key->keycode; - return 0; - } - - return -EINVAL; -} - -static int msi_wmi_setkeycode(struct input_dev *dev, int scancode, int keycode) -{ - struct key_entry *key; - int old_keycode; - - if (keycode < 0 || keycode > KEY_MAX) - return -EINVAL; - - key = msi_wmi_get_entry_by_scancode(scancode); - if (key && key->code) { - old_keycode = key->keycode; - key->keycode = keycode; - set_bit(keycode, dev->keybit); - if (!msi_wmi_get_entry_by_keycode(old_keycode)) - clear_bit(old_keycode, dev->keybit); - return 0; - } - - return -EINVAL; -} - static int __init msi_wmi_input_setup(void) { - struct key_entry *key; int err; msi_wmi_input_dev = input_allocate_device(); @@ -145,45 +87,48 @@ static int __init msi_wmi_input_setup(void) msi_wmi_input_dev->name = "MSI WMI hotkeys"; msi_wmi_input_dev->phys = "wmi/input0"; msi_wmi_input_dev->id.bustype = BUS_HOST; - msi_wmi_input_dev->getkeycode = msi_wmi_getkeycode; - msi_wmi_input_dev->setkeycode = msi_wmi_setkeycode; - for (key = msi_wmi_keymap; key->code; key++) { - set_bit(EV_KEY, msi_wmi_input_dev->evbit); - set_bit(key->keycode, msi_wmi_input_dev->keybit); - } + err = sparse_keymap_setup(msi_wmi_input_dev, msi_wmi_keymap, NULL); + if (err) + goto err_free_dev; + err = wmi_install_notify_handler(MSIWMI_EVENT_GUID, + msi_wmi_notify, NULL); + if (err) { + printk(KERN_ERR + "MSI WMI: Error while installing notify handler\n"); + goto err_free_keymap; + } err = input_register_device(msi_wmi_input_dev); - if (err) - input_free_device(msi_wmi_input_dev); + goto err_uninstall_notifier; + + return 0; + +err_uninstall_notifier: + wmi_remove_notify_handler(MSIWMI_EVENT_GUID); +err_free_keymap: + sparse_keymap_free(msi_wmi_input_dev); +err_free_dev: + input_free_device(msi_wmi_input_dev); return err; } static int __init msi_wmi_init(void) { - int err; + int err = 0; msi_wmi_time_last_press = get_jiffies_64(); if (!wmi_has_guid(MSIWMI_EVENT_GUID)) { printk(KERN_ERR "This machine doesn't have MSI-hotkeys through WMI\n"); - goto load_error; - } - err = wmi_install_notify_handler(MSIWMI_EVENT_GUID, - msi_wmi_notify, NULL); - if (err) { - printk(KERN_ERR - "MSI WMI: Error while installing notify handler\n"); - goto load_error; + return -ENODEV; } - msi_wmi_input_setup(); + err = msi_wmi_input_setup(); - return 0; -load_error: - return -ENODEV; + return err; } static void __exit msi_wmi_exit(void)