From patchwork Wed Dec 2 09:24:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 64184 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 nB29ORfL028879 for ; Wed, 2 Dec 2009 09:24:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753667AbZLBJYY (ORCPT ); Wed, 2 Dec 2009 04:24:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753735AbZLBJYY (ORCPT ); Wed, 2 Dec 2009 04:24:24 -0500 Received: from mail-px0-f188.google.com ([209.85.216.188]:42964 "EHLO mail-px0-f188.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667AbZLBJYV (ORCPT ); Wed, 2 Dec 2009 04:24:21 -0500 Received: by mail-px0-f188.google.com with SMTP id 26so4618709pxi.21 for ; Wed, 02 Dec 2009 01:24:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:subject:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=IJQTnFIUbRQ7OpFiqBkkuZVbNmaxVpgmBHwdb9UMg7g=; b=CuPNHR8GF85a4h9cbo4KbCgS7gDFkOeV2+qNJ4wmvFAR1MsvY0ZFKwQDTP9w9g381D FbyjZTaFGjU5RGBzQHRn2dSBlR7sZXPUOo0+CpA8ox4I1bUHFa4KFj6jIey7xVSufWu1 53plolMbl0r/ezfYPnMGQd5ezU0UKOe9kc4zI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=ZJlFdAKJH7DN/ePjbz8J6VWWnbxjvWTMGilnWOTWxILBnuLE12lEHNfvWUfAPrIfQd ykySrj6c9wi8Bist5iDcadebw8QaIxGS7r4GfJl7r069fws0oPQBVTrbg5ojWlbUywYt 2c62ZQHygRAnUqF0vMf5fxzVzq1seU26PeaP4= Received: by 10.114.7.9 with SMTP id 9mr5975620wag.71.1259745868157; Wed, 02 Dec 2009 01:24:28 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-24-6-153-137.hsd1.ca.comcast.net [24.6.153.137]) by mx.google.com with ESMTPS id 21sm705892pzk.15.2009.12.02.01.24.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Dec 2009 01:24:27 -0800 (PST) From: Dmitry Torokhov Subject: [PATCH 4/8] Input: hp-wmi - switch to using sparse keymap library To: linux-input@vger.kernel.org Cc: linux-acpi@vger.kernel.org, Len Brown , Herton Ronaldo Krzesinski , Harald Welte , Corentin Chary , Carlos Corbacho , Wu Zhangjin Date: Wed, 02 Dec 2009 01:24:25 -0800 Message-ID: <20091202092425.30409.85617.stgit@localhost.localdomain> In-Reply-To: <20091202091056.30409.50455.stgit@localhost.localdomain> References: <20091202091056.30409.50455.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 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 1f10bf4..18b66fd 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -137,6 +137,7 @@ config HP_WMI depends on ACPI_WMI depends on INPUT depends on RFKILL || RFKILL = n + select INPUT_SPARSEKMAP help Say Y here if you want to support WMI-based hotkeys on HP laptops and to read data from WMI such as docking or ambient light sensor state. diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index c284217..8868610 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -69,21 +70,13 @@ struct bios_return { u32 value; }; -struct key_entry { - char type; /* See KE_* below */ - u16 code; - u16 keycode; -}; - -enum { KE_KEY, KE_END }; - -static struct key_entry hp_wmi_keymap[] = { - {KE_KEY, 0x02, KEY_BRIGHTNESSUP}, - {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, - {KE_KEY, 0x20e6, KEY_PROG1}, - {KE_KEY, 0x2142, KEY_MEDIA}, - {KE_KEY, 0x213b, KEY_INFO}, - {KE_KEY, 0x231b, KEY_HELP}, +static const struct key_entry hp_wmi_keymap[] = { + {KE_KEY, 0x02, {KEY_BRIGHTNESSUP}}, + {KE_KEY, 0x03, {KEY_BRIGHTNESSDOWN}}, + {KE_KEY, 0x20e6, {KEY_PROG1}}, + {KE_KEY, 0x2142, {KEY_MEDIA}}, + {KE_KEY, 0x213b, {KEY_INFO}}, + {KE_KEY, 0x231b, {KEY_HELP}}, {KE_END, 0} }; @@ -274,61 +267,6 @@ static DEVICE_ATTR(als, S_IRUGO | S_IWUSR, show_als, set_als); static DEVICE_ATTR(dock, S_IRUGO, show_dock, NULL); static DEVICE_ATTR(tablet, S_IRUGO, show_tablet, NULL); -static struct key_entry *hp_wmi_get_entry_by_scancode(int code) -{ - struct key_entry *key; - - for (key = hp_wmi_keymap; key->type != KE_END; key++) - if (code == key->code) - return key; - - return NULL; -} - -static struct key_entry *hp_wmi_get_entry_by_keycode(int keycode) -{ - struct key_entry *key; - - for (key = hp_wmi_keymap; key->type != KE_END; key++) - if (key->type == KE_KEY && keycode == key->keycode) - return key; - - return NULL; -} - -static int hp_wmi_getkeycode(struct input_dev *dev, int scancode, int *keycode) -{ - struct key_entry *key = hp_wmi_get_entry_by_scancode(scancode); - - if (key && key->type == KE_KEY) { - *keycode = key->keycode; - return 0; - } - - return -EINVAL; -} - -static int hp_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 = hp_wmi_get_entry_by_scancode(scancode); - if (key && key->type == KE_KEY) { - old_keycode = key->keycode; - key->keycode = keycode; - set_bit(keycode, dev->keybit); - if (!hp_wmi_get_entry_by_keycode(old_keycode)) - clear_bit(old_keycode, dev->keybit); - return 0; - } - - return -EINVAL; -} - static void hp_wmi_notify(u32 value, void *context) { struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; @@ -344,7 +282,8 @@ static void hp_wmi_notify(u32 value, void *context) if (eventcode == 0x4) eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0, 0); - key = hp_wmi_get_entry_by_scancode(eventcode); + key = sparse_keymap_entry_from_scancode(hp_wmi_input_dev, + eventcode); if (key) { switch (key->type) { case KE_KEY: @@ -381,7 +320,6 @@ static void hp_wmi_notify(u32 value, void *context) static int __init hp_wmi_input_setup(void) { - struct key_entry *key; int err; hp_wmi_input_dev = input_allocate_device(); @@ -389,21 +327,14 @@ static int __init hp_wmi_input_setup(void) hp_wmi_input_dev->name = "HP WMI hotkeys"; hp_wmi_input_dev->phys = "wmi/input0"; hp_wmi_input_dev->id.bustype = BUS_HOST; - hp_wmi_input_dev->getkeycode = hp_wmi_getkeycode; - hp_wmi_input_dev->setkeycode = hp_wmi_setkeycode; - - for (key = hp_wmi_keymap; key->type != KE_END; key++) { - switch (key->type) { - case KE_KEY: - set_bit(EV_KEY, hp_wmi_input_dev->evbit); - set_bit(key->keycode, hp_wmi_input_dev->keybit); - break; - } - } - set_bit(EV_SW, hp_wmi_input_dev->evbit); - set_bit(SW_DOCK, hp_wmi_input_dev->swbit); - set_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit); + __set_bit(EV_SW, hp_wmi_input_dev->evbit); + __set_bit(SW_DOCK, hp_wmi_input_dev->swbit); + __set_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit); + + err = sparse_keymap_setup(hp_wmi_input_dev, hp_wmi_keymap, NULL); + if (err) + goto err_free_dev; /* Set initial hardware state */ input_report_switch(hp_wmi_input_dev, SW_DOCK, hp_wmi_dock_state()); @@ -411,14 +342,29 @@ static int __init hp_wmi_input_setup(void) hp_wmi_tablet_state()); input_sync(hp_wmi_input_dev); - err = input_register_device(hp_wmi_input_dev); + err = wmi_install_notify_handler(HPWMI_EVENT_GUID, hp_wmi_notify, NULL); + if (err) + goto err_free_keymap; - if (err) { - input_free_device(hp_wmi_input_dev); - return err; - } + err = input_register_device(hp_wmi_input_dev); + if (err) + goto err_uninstall_notifier; return 0; + + err_uninstall_notifier: + wmi_remove_notify_handler(HPWMI_EVENT_GUID); + err_free_keymap: + sparse_keymap_free(hp_wmi_input_dev); + err_free_dev: + input_free_device(hp_wmi_input_dev); + return err; +} + +static void __exit hp_wmi_input_destroy(void) +{ + wmi_remove_notify_handler(HPWMI_EVENT_GUID); + input_unregister_device(hp_wmi_input_dev); } static void cleanup_sysfs(struct platform_device *device) @@ -541,10 +487,9 @@ static int __init hp_wmi_init(void) int err; if (wmi_has_guid(HPWMI_EVENT_GUID)) { - err = wmi_install_notify_handler(HPWMI_EVENT_GUID, - hp_wmi_notify, NULL); - if (!err) - hp_wmi_input_setup(); + err = hp_wmi_input_setup(); + if (err) + return err; } if (wmi_has_guid(HPWMI_BIOS_GUID)) { @@ -564,10 +509,9 @@ static int __init hp_wmi_init(void) static void __exit hp_wmi_exit(void) { - if (wmi_has_guid(HPWMI_EVENT_GUID)) { - wmi_remove_notify_handler(HPWMI_EVENT_GUID); - input_unregister_device(hp_wmi_input_dev); - } + if (wmi_has_guid(HPWMI_EVENT_GUID)) + hp_wmi_input_destroy(); + if (hp_wmi_platform_dev) { platform_device_del(hp_wmi_platform_dev); platform_driver_unregister(&hp_wmi_driver);