From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756118AbdEIRCR (ORCPT ); Tue, 9 May 2017 13:02:17 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:34709 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755329AbdEIRCN (ORCPT ); Tue, 9 May 2017 13:02:13 -0400 X-ME-Sender: X-Sasl-enc: J7hjwcm4HsikkVw+JCiEvd6f6cRobZ2vv1J8R70CYKk1 1494349332 Date: Tue, 9 May 2017 14:02:06 -0300 From: Henrique de Moraes Holschuh To: Andy Shevchenko Cc: Henrique de Moraes Holschuh , Darren Hart , Andy Shevchenko , ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 1/3] platform/x86: thinkpad_acpi: Make logic straight in hotkey_exit() Message-ID: <20170509170206.GB19242@khazad-dum.debian.net> References: <20170509141721.15841-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170509141721.15841-1-andriy.shevchenko@linux.intel.com> X-GPG-Fingerprint1: 4096R/0x0BD9E81139CB4807: C467 A717 507B BAFE D3C1 6092 0BD9 E811 39CB 4807 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 Tue, 09 May 2017, Andy Shevchenko wrote: > The commit 4be73005e4dc > > ("thinkpad-acpi: remove uneeded tp_features.hotkey tests in hotkey_exit") > > adds a complex logic behind hotkey status check in a way > it started mixing logical operations with bitwise ones. > > Refactor the code to make it straight and slightly clearer. Eh, I find this actually less clear, given the comment that was in the old code, which you deleted. Please keep the important part of the comment at the very least. > Signed-off-by: Andy Shevchenko > --- > drivers/platform/x86/thinkpad_acpi.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index 7b6cb0c69b02..7740b5e1b998 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -3090,6 +3090,8 @@ static void tpacpi_send_radiosw_update(void) > > static void hotkey_exit(void) > { > + int res; > + > #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL > mutex_lock(&hotkey_mutex); > hotkey_poll_stop_sync(); > @@ -3101,11 +3103,8 @@ static void hotkey_exit(void) > > dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY, > "restoring original HKEY status and mask\n"); > - /* yes, there is a bitwise or below, we want the > - * functions to be called even if one of them fail */ > - if (((tp_features.hotkey_mask && > - hotkey_mask_set(hotkey_orig_mask)) | > - hotkey_status_set(false)) != 0) > + res = tp_features.hotkey_mask ? hotkey_mask_set(hotkey_orig_mask) : 0; > + if (hotkey_status_set(false) || res) > pr_err("failed to restore hot key mask " > "to BIOS defaults\n"); > } -- Henrique Holschuh