From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754046AbdEIORk (ORCPT ); Tue, 9 May 2017 10:17:40 -0400 Received: from mga02.intel.com ([134.134.136.20]:58772 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753697AbdEIORi (ORCPT ); Tue, 9 May 2017 10:17:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,314,1491289200"; d="scan'208";a="1145602056" From: Andy Shevchenko To: Henrique de Moraes Holschuh , Darren Hart Cc: Andy Shevchenko , Andy Shevchenko , ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/3] platform/x86: thinkpad_acpi: Make logic straight in hotkey_exit() Date: Tue, 9 May 2017 17:17:19 +0300 Message-Id: <20170509141721.15841-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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"); } -- 2.11.0