From patchwork Fri Feb 26 04:11:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrique de Moraes Holschuh X-Patchwork-Id: 82255 X-Patchwork-Delegate: lenb@kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1Q4UrnE018669 for ; Fri, 26 Feb 2010 04:30:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935176Ab0BZEaw (ORCPT ); Thu, 25 Feb 2010 23:30:52 -0500 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:54293 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935174Ab0BZEav (ORCPT ); Thu, 25 Feb 2010 23:30:51 -0500 Received: from compute1.internal (compute1 [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id 529E0E2528; Thu, 25 Feb 2010 23:11:32 -0500 (EST) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Thu, 25 Feb 2010 23:11:32 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; s=smtpout; bh=zIW0oJ2M33/Xgy+O5b87Gazwaws=; b=go5ClwAbqE0t1xJnMwi1B/fOd96eH93i2AsxZPwi0qAvvKpul7NQa3baOFCwZJhQgFP3JhC/IjW8ltm/+y1EO2KHgTczJi1SHYTMdHgIhjuyE+WbwJby1gbeShlKYTaS6bJLbVH7/4mVQXv6u3dfC7fEccYHw7MetuQqVQ8iVsw= X-Sasl-enc: J1fDr0NEwiVJAbyoSx42Me5D3klraG/zGxu/bsWluWah 1267157491 Received: from khazad-dum.debian.net (unknown [201.82.165.62]) by mail.messagingengine.com (Postfix) with ESMTPSA id D16DA12666; Thu, 25 Feb 2010 23:11:31 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by localhost.khazad-dum.debian.net (Postfix) with ESMTP id 10AF528261; Fri, 26 Feb 2010 01:11:30 -0300 (BRT) X-Virus-Scanned: Debian amavisd-new at khazad-dum.debian.net Received: from khazad-dum.debian.net ([127.0.0.1]) by localhost (khazad-dum.debian.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 04IUtKv+n3Mu; Fri, 26 Feb 2010 01:11:27 -0300 (BRT) Received: by khazad-dum.debian.net (Postfix, from userid 1000) id 2B0FE28263; Fri, 26 Feb 2010 01:11:27 -0300 (BRT) From: Henrique de Moraes Holschuh To: Len Brown Cc: linux-acpi@vger.kernel.org, ibm-acpi-devel@lists.sourceforge.net, Henrique de Moraes Holschuh , Andrew Morton , stable@kernel.org Subject: [PATCH 4/6] thinkpad-acpi: make driver events work in NVRAM poll mode Date: Fri, 26 Feb 2010 01:11:22 -0300 Message-Id: <1267157484-23925-5-git-send-email-hmh@hmh.eng.br> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1267157484-23925-1-git-send-email-hmh@hmh.eng.br> References: <1267157484-23925-1-git-send-email-hmh@hmh.eng.br> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 26 Feb 2010 04:30:53 +0000 (UTC) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 933bcc4..5f45083 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2082,6 +2082,7 @@ static struct attribute_set *hotkey_dev_attributes; static void tpacpi_driver_event(const unsigned int hkey_event); static void hotkey_driver_event(const unsigned int scancode); +static void hotkey_poll_setup(const bool may_warn); /* HKEY.MHKG() return bits */ #define TP_HOTKEY_TABLET_MASK (1 << 3) @@ -2264,6 +2265,8 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask) rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) & ~hotkey_source_mask); + hotkey_poll_setup(true); + mutex_unlock(&hotkey_mutex); return rc; @@ -2548,7 +2551,7 @@ static void hotkey_poll_stop_sync(void) } /* call with hotkey_mutex held */ -static void hotkey_poll_setup(bool may_warn) +static void hotkey_poll_setup(const bool may_warn) { const u32 poll_driver_mask = hotkey_driver_mask & hotkey_source_mask; const u32 poll_user_mask = hotkey_user_mask & hotkey_source_mask; @@ -2579,7 +2582,7 @@ static void hotkey_poll_setup(bool may_warn) } } -static void hotkey_poll_setup_safe(bool may_warn) +static void hotkey_poll_setup_safe(const bool may_warn) { mutex_lock(&hotkey_mutex); hotkey_poll_setup(may_warn); @@ -2597,7 +2600,11 @@ static void hotkey_poll_set_freq(unsigned int freq) #else /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */ -static void hotkey_poll_setup_safe(bool __unused) +static void hotkey_poll_setup(const bool __unused) +{ +} + +static void hotkey_poll_setup_safe(const bool __unused) { }