From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753688AbbBTFIx (ORCPT ); Fri, 20 Feb 2015 00:08:53 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:45860 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752247AbbBTFIv (ORCPT ); Fri, 20 Feb 2015 00:08:51 -0500 Date: Thu, 19 Feb 2015 21:08:43 -0800 From: Darren Hart To: Bastien Nocera Cc: Henrique de Moraes Holschuh , ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: Re: [PATCH 1/6] thinkpad_acpi: Remember adaptive kbd presence Message-ID: <20150220050843.GB790@fury.dvhart.com> References: <1424292808.32581.45.camel@hadess.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424292808.32581.45.camel@hadess.net> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 18, 2015 at 09:53:28PM +0100, Bastien Nocera wrote: > Rather than checking on each suspend and resume whether the laptop > has an adaptive keyboard, check when the driver is initialised. Reasonable. > > Signed-off-by: Bastien Nocera > --- > drivers/platform/x86/thinkpad_acpi.c | 38 ++++++++++++++++++------------------ > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index c3d11fa..80db3ce 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c ... > @@ -3226,6 +3227,13 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) > if (!tp_features.hotkey) > return 1; > > + /* does it have an adaptive keyboard, like > + * the Lenovo Carbon X1 2014 (2nd gen) */ Please follow CodingStyle here: /* * Sentence formatting. * Second line. */ The above is a question, just state what you're doing: /* * Check if we have an adaptive keyboard, like on the * Lenovo Carbon X1 2014 (2nd Gen). */ > + if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) { > + if ((hkeyv >> 8) == 2) > + tp_features.has_adaptive_kbd = true; > + } > + > quirks = tpacpi_check_quirks(tpacpi_hotkey_qtable, > ARRAY_SIZE(tpacpi_hotkey_qtable)); > > @@ -3834,28 +3842,22 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) > > static void hotkey_suspend(void) > { > - int hkeyv; > - > /* Do these on suspend, we get the events on early resume! */ > hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE; > hotkey_autosleep_ack = 0; > > /* save previous mode of adaptive keyboard of X1 Carbon */ > - if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) { > - if ((hkeyv >> 8) == 2) { > - if (!acpi_evalf(hkey_handle, > - &adaptive_keyboard_prev_mode, > - "GTRW", "dd", 0)) { > - pr_err("Cannot read adaptive keyboard mode.\n"); > - } > + if (tp_features.has_adaptive_kbd) { > + if (!acpi_evalf(hkey_handle, > + &adaptive_keyboard_prev_mode, > + "GTRW", "dd", 0)) { > + pr_err("Cannot read adaptive keyboard mode.\n"); > } > } > } > > static void hotkey_resume(void) > { > - int hkeyv; > - > tpacpi_disable_brightness_delay(); > > if (hotkey_status_set(true) < 0 || > @@ -3870,14 +3872,12 @@ static void hotkey_resume(void) > hotkey_poll_setup_safe(false); > > /* restore previous mode of adapive keyboard of X1 Carbon */ > - if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) { > - if ((hkeyv >> 8) == 2) { > - if (!acpi_evalf(hkey_handle, > - NULL, > - "STRW", "vd", > - adaptive_keyboard_prev_mode)) { > - pr_err("Cannot set adaptive keyboard mode.\n"); > - } > + if (tp_features.has_adaptive_kbd) { > + if (!acpi_evalf(hkey_handle, > + NULL, > + "STRW", "vd", > + adaptive_keyboard_prev_mode)) { You've saved a level of indentation, please group the arguments into fewer lines, should be two instead of four. Otherwise, looks good. -- Darren Hart Intel Open Source Technology Center