From patchwork Sat Sep 12 18:22:15 2009 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: 47100 X-Patchwork-Delegate: lenb@kernel.org 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 n8CIMRJT018286 for ; Sat, 12 Sep 2009 18:22:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754670AbZILSW2 (ORCPT ); Sat, 12 Sep 2009 14:22:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754695AbZILSW2 (ORCPT ); Sat, 12 Sep 2009 14:22:28 -0400 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:44778 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754670AbZILSWX (ORCPT ); Sat, 12 Sep 2009 14:22:23 -0400 Received: from compute1.internal (compute1.internal [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id 9302B6BC2F; Sat, 12 Sep 2009 14:22:26 -0400 (EDT) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Sat, 12 Sep 2009 14:22:26 -0400 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=DQRYvI4rBg1yzuleqfWP4yQ1bZ4=; b=iy9nFP+8fyPUh8DLHioJVaXUo6eSbivg/imZ2/2xfi6cY7ssAPXU6pYln5pxjMVBfiXqj33wJKj17iUqmrpwILHiilf0bUiTY9oib00kXTlfOHmkSzrV6J1GlYPW3OYkdLHsaWdBSHT/B8aTnhPzXNZK7SL2rCdffdejbnU4ois= X-Sasl-enc: xuyGGpddblGANCJoyv3f5HKI1sEckxCLPUFXDABOYmN3 1252779746 Received: from thorin.khazad-dum.debian.net (unknown [201.82.170.176]) by mail.messagingengine.com (Postfix) with ESMTPSA id 4075127BE7; Sat, 12 Sep 2009 14:22:26 -0400 (EDT) Received: by thorin.khazad-dum.debian.net (Postfix, from userid 1000) id E45F21E978C; Sat, 12 Sep 2009 15:22:22 -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 Subject: [PATCH 5/8] thinkpad-acpi: deprecate hotkey_bios_mask Date: Sat, 12 Sep 2009 15:22:15 -0300 Message-Id: <1252779738-7459-6-git-send-email-hmh@hmh.eng.br> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252779738-7459-1-git-send-email-hmh@hmh.eng.br> References: <1252779738-7459-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 Some analysis of the ACPI DSDTs shows that the HKEY pre-enabled mask is always 0x80c (FN+F3,FN+F4 and FN+F12), which are the hotkeys that the second gen of HKEY firmware supported (the first gen didn't report any hotkeys, the second reported these tree hotkeys but had no mask support, and the third added mask support). So, this is probably some sort of backwards compatibility with older versions of the IBM ThinkVantage suite. We have no use for that, and I know of exactly ZERO users of that attribute, anyway. Start the process of getting rid of it. Signed-off-by: Henrique de Moraes Holschuh --- Documentation/laptops/thinkpad-acpi.txt | 6 +++++- drivers/platform/x86/thinkpad_acpi.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index e2ddcde..ab4b58e 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt @@ -240,9 +240,13 @@ sysfs notes: Returns 0. hotkey_bios_mask: + DEPRECATED, DON'T USE, WILL BE REMOVED IN THE FUTURE. + Returns the hot keys mask when thinkpad-acpi was loaded. Upon module unload, the hot keys mask will be restored - to this value. + to this value. This is always 0x80c, because those are + the hotkeys that were supported by ancient firmware + without mask support. hotkey_enable: DEPRECATED, WILL BE REMOVED SOON. diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 679a73b..6b66789 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2544,6 +2544,8 @@ static ssize_t hotkey_bios_mask_show(struct device *dev, struct device_attribute *attr, char *buf) { + printk_deprecated_attribute("hotkey_bios_mask", + "This attribute is useless."); return snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_orig_mask); }