Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751512Ab0KSHJ5 (ORCPT ); Fri, 19 Nov 2010 02:09:57 -0500 Received: from adelie.canonical.com ([91.189.90.139]:60464 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899Ab0KSHJ4 (ORCPT ); Fri, 19 Nov 2010 02:09:56 -0500 Message-ID: <4CE622BB.4070607@canonical.com> Date: Fri, 19 Nov 2010 15:09:47 +0800 From: Ike Panhc User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: Corentin Chary CC: Dmitry Torokhov , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Matthew Garrett , David Woodhouse Subject: Re: [PATCH 3/3] ideapad: add hotkey support References: <1289977165-14802-1-git-send-email-ike.pan@canonical.com> <1289977238-15113-1-git-send-email-ike.pan@canonical.com> <20101117212943.GA6661@core.coreip.homeip.net> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4106 Lines: 130 On 11/18/2010 03:35 PM, Corentin Chary wrote: > On Wed, Nov 17, 2010 at 10:29 PM, Dmitry Torokhov > wrote: >> On Wed, Nov 17, 2010 at 03:00:38PM +0800, Ike Panhc wrote: >>> Hotkey enabled by this patch: >>> Fn+F3: Video mode switch >>> Fn+F5: software rfkill for wifi >>> >>> For some ideapad when push Fn+F3, hardware generates Super-P keys, those key >>> will not be enabled by this patch. >>> >>> Signed-off-by: Ike Panhc >>> --- >>> drivers/platform/x86/ideapad-laptop.c | 74 +++++++++++++++++++++++++++++++++ >>> 1 files changed, 74 insertions(+), 0 deletions(-) >>> >>> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c >>> index d75c21f..d397034 100644 >>> --- a/drivers/platform/x86/ideapad-laptop.c >>> +++ b/drivers/platform/x86/ideapad-laptop.c >>> @@ -28,6 +28,8 @@ >>> #include >>> #include >>> #include >>> +#include >>> +#include >>> >>> #define IDEAPAD_DEV_CAMERA 0 >>> #define IDEAPAD_DEV_WLAN 1 >>> @@ -39,6 +41,7 @@ struct ideapad_private { >>> acpi_handle handle; >>> struct rfkill *rfk[5]; >>> struct platform_device *platform_device; >>> + struct input_dev *inputdev; >>> } *ideapad_priv; >>> >>> static struct { >>> @@ -325,6 +328,68 @@ static void ideapad_platform_exit(void) >>> } >>> /* the above is platform device */ >>> >>> +/* >>> + * input device >>> + */ >>> +static const struct key_entry ideapad_keymap[] = { >>> + { KE_KEY, 0x06, { KEY_SWITCHVIDEOMODE } }, >>> + { KE_KEY, 0x0D, { KEY_WLAN } }, >>> + { KE_END, 0 }, >>> +}; >>> + >>> +static int ideapad_input_init(void) >> >> __devinit? >> >>> +{ >>> + struct input_dev *inputdev; >>> + int error; >>> + >>> + inputdev = input_allocate_device(); >>> + if (!inputdev) { >>> + pr_info("Unable to allocate input device\n"); >>> + return -ENOMEM; >>> + } >>> + >>> + inputdev->name = "Ideapad extra buttons"; >>> + inputdev->phys = "ideapad/input0"; >>> + inputdev->id.bustype = BUS_HOST; >>> + inputdev->dev.parent = &ideapad_priv->platform_device->dev; >>> + >>> + error = sparse_keymap_setup(inputdev, ideapad_keymap, NULL); >>> + if (error) { >>> + pr_err("Unable to setup input device keymap\n"); >>> + goto err_free_dev; >>> + } >>> + >>> + error = input_register_device(inputdev); >>> + if (error) { >>> + pr_err("Unable to register input device\n"); >>> + goto err_free_keymap; >>> + } >>> + >>> + ideapad_priv->inputdev = inputdev; >> >> Why don't you pass ideapad_priv in as an argument instead of relying on >> global. I know that there can only be one, but then why do you have a >> structure? > > That may allow to remove the global later, like we did on > eeepc-laptop/asus-laptop. I am ok to go though the driver and try to avoid using global variable. Other feedbacks is easy done, so I will fix them first.. > >>> + return 0; >>> + >>> +err_free_keymap: >>> + sparse_keymap_free(inputdev); >>> +err_free_dev: >>> + input_free_device(inputdev); >>> + return error; >>> +} >>> + >>> +static void ideapad_input_exit(void) >> >> __devexit? The rest of the driver might user these markups as well. >> >>> +{ >>> + if (ideapad_priv->inputdev) { >>> + sparse_keymap_free(ideapad_priv->inputdev); >>> + input_unregister_device(ideapad_priv->inputdev); >>> + } >>> + ideapad_priv->inputdev = NULL; >> >> You fail driver initialization when ideapad_input_init() fails so there >> is no point in checking whether ideapad_priv->inputdev is null or not. >> >> Otherwise looks good from input POV. >> >> Thanks. > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/