From patchwork Sat May 30 16:25:09 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: 27060 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 n4UGPPXL016404 for ; Sat, 30 May 2009 16:25:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759853AbZE3QZ0 (ORCPT ); Sat, 30 May 2009 12:25:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759784AbZE3QZZ (ORCPT ); Sat, 30 May 2009 12:25:25 -0400 Received: from out4.smtp.messagingengine.com ([66.111.4.28]:51447 "EHLO out4.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758642AbZE3QZS (ORCPT ); Sat, 30 May 2009 12:25:18 -0400 Received: from compute2.internal (compute2.internal [10.202.2.42]) by out1.messagingengine.com (Postfix) with ESMTP id 0E8383477E4; Sat, 30 May 2009 12:25:20 -0400 (EDT) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute2.internal (MEProxy); Sat, 30 May 2009 12:25:20 -0400 X-Sasl-enc: B4xs/rsuX8Fqju+T5mVTmtOkaS/XvtffgC8WCulSYkAp 1243700719 Received: from khazad-dum.debian.net (unknown [201.82.166.239]) by mail.messagingengine.com (Postfix) with ESMTPSA id B819829B15; Sat, 30 May 2009 12:25:19 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by localhost.khazad-dum.debian.net (Postfix) with ESMTP id 9F78628274; Sat, 30 May 2009 13:25:17 -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 vi6oA2Xf6jwe; Sat, 30 May 2009 13:25:16 -0300 (BRT) Received: by khazad-dum.debian.net (Postfix, from userid 1000) id BC22228276; Sat, 30 May 2009 13:25:15 -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/5] thinkpad-acpi: silence bogus warning when ACPI video is disabled Date: Sat, 30 May 2009 13:25:09 -0300 Message-Id: <1243700709-25977-6-git-send-email-hmh@hmh.eng.br> X-Mailer: git-send-email 1.6.3.1 In-Reply-To: <1243700709-25977-1-git-send-email-hmh@hmh.eng.br> References: <1243700709-25977-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 Make use of acpi_video_backlight_support() also in hotkey_init, to make sure this doesn't happen: thinkpad_acpi: This ThinkPad has standard ACPI backlight brightness control, supported by the ACPI video driver thinkpad_acpi: Disabling thinkpad-acpi brightness events by default... thinkpad_acpi: Standard ACPI backlight interface not available, thinkpad_acpi native brightness control enabled thinkpad_acpi: detected a 16-level brightness capable ThinkPad Note that this is purely cosmetic, there is absolutely _no_ change in behaviour. Those events are sometimes enabled at runtime by userspace, but the driver never enables them by itself unless someone messed with the default keymaps. Signed-off-by: Henrique de Moraes Holschuh Reported-by: Jochen Schulz --- drivers/platform/x86/thinkpad_acpi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 06c7c03..5a22a06 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2655,7 +2655,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) /* update bright_acpimode... */ tpacpi_check_std_acpi_brightness_support(); - if (tp_features.bright_acpimode) { + if (tp_features.bright_acpimode && acpi_video_backlight_support()) { printk(TPACPI_INFO "This ThinkPad has standard ACPI backlight " "brightness control, supported by the ACPI "