Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S947838AbcJaW4D (ORCPT ); Mon, 31 Oct 2016 18:56:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58266 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S947800AbcJaWzm (ORCPT ); Mon, 31 Oct 2016 18:55:42 -0400 From: Lyude To: ibm-acpi-devel@lists.sourceforge.net Cc: Lyude , Daniel Martin , Henrique de Moraes Holschuh , Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] thinkpad_acpi: Don't repeat ourselves in hotkey_init_tablet_mode() Date: Mon, 31 Oct 2016 18:55:33 -0400 Message-Id: <1477954535-12536-3-git-send-email-lyude@redhat.com> In-Reply-To: <1477954535-12536-1-git-send-email-lyude@redhat.com> References: <1477954535-12536-1-git-send-email-lyude@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 31 Oct 2016 22:55:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1142 Lines: 35 There's no need to have multiple copies of the logic we use for checking whether or not we're in tablet mode, so just use hotkey_get_tablet_mode() when checking the initial state in hotkey_init_tablet_mode(). Cc: Daniel Martin Signed-off-by: Lyude --- drivers/platform/x86/thinkpad_acpi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 369b483..92e8986 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -3130,13 +3130,16 @@ hotkey_init_tablet_mode(void) /* For X41t, X60t, X61t Tablets... */ if (acpi_evalf(hkey_handle, &res, "MHKG", "qd")) { tp_features.hotkey_tablet = TP_HOTKEY_TABLET_USES_MHKG; - in_tablet_mode = !!(res & TP_HOTKEY_TABLET_MASK); type = "MHKG"; } if (!tp_features.hotkey_tablet) return 0; + res = hotkey_get_tablet_mode(&in_tablet_mode); + if (res) + return res; + pr_info("Tablet mode switch found (type: %s), currently in %s mode\n", type, in_tablet_mode ? "tablet" : "laptop"); -- 2.7.4