From patchwork Wed Sep 7 15:28:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 9319543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AAF7060869 for ; Wed, 7 Sep 2016 15:29:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1925293DF for ; Wed, 7 Sep 2016 15:29:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9655B293E0; Wed, 7 Sep 2016 15:29:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.4 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D96E293E2 for ; Wed, 7 Sep 2016 15:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751527AbcIGP2Z (ORCPT ); Wed, 7 Sep 2016 11:28:25 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:33017 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964828AbcIGP2V (ORCPT ); Wed, 7 Sep 2016 11:28:21 -0400 Received: by mail-oi0-f67.google.com with SMTP id w78so2308135oie.0; Wed, 07 Sep 2016 08:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e8zLRQjgLcXzMQN5XXtgFTckdZf66SMIE4g6rpCWd3U=; b=mizmFffD14XggD3IQzyZvmq6tdnZcR0yhyES+0Dn8c/zaxCgz/1WVxosui8h32uiW6 ZMmQbnqANqcRehmmkhccZErLW6srTsfKZdSM5xIi2FN+X3M8L04U5TMyfQ48+FoCoHwW Zw9fMDAmRKPBmNMz74YMxu1p/gb0qcxwmn+Dv+BMHaCXLNJeymLdenT8HMds7hmGX/8v K9j7LIkiNKB7Eg+t/zC1NX2i+hFHIlZ2PpOD1zzWhrwbJ6P7E4BWDgs+0r3SgFjBBmAD 5oM1EUUHF9dS43u4ZWEvLy+GmPilwyWpUwdO3Zx+dmAftmgZjV4rD/rSEXLqw/mbzVPt MTZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e8zLRQjgLcXzMQN5XXtgFTckdZf66SMIE4g6rpCWd3U=; b=a2SlE52sMzBfNuOetUnTq5PimKFAlwDWMpNGeTAwYtPfwFYQrnyZpmD72XAzOcm08k kngdXPX9dxyYD121E/deRw1/47hwqdwIBEiFbuj1k+BjbU9sCby7otqeEgdG69KaARkw ncnUS3Phw91NcYqwj6DNvdp4kChNeCwPOHvZEhyNJ2BOhgzEXtBSsb0+f3wNVV1aMqpV K/ij9MPa9BOfAwJZimoU7H6JKx/IYbuz5iC9QiZjvIGzCy40y6tmxeemTECKpS0Vzyym 32cRgbJ89W22r34n/UrJVrP/ymdZAa6gOp1H7YTWpQ/M3x047fomk0RGVQ5UM/QxlnS1 m9dg== X-Gm-Message-State: AE9vXwOl7emy1qXK6J/JDN/mzxhWyzRowjbelrIibK6J0pR1wkJunfWEWaFr52NgCOIYcw== X-Received: by 10.157.40.27 with SMTP id m27mr8851560otb.128.1473262100853; Wed, 07 Sep 2016 08:28:20 -0700 (PDT) Received: from Shakuras.scurra.org ([148.210.135.54]) by smtp.gmail.com with ESMTPSA id l10sm12629705ote.19.2016.09.07.08.28.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 08:28:20 -0700 (PDT) From: Azael Avalos To: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Azael Avalos Subject: [PATCH 1/2] toshiba_haps: Split ACPI status error check from HDD protection support Date: Wed, 7 Sep 2016 09:28:13 -0600 Message-Id: <20160907152815.5950-2-coproscefalo@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160907152815.5950-1-coproscefalo@gmail.com> References: <20160907152815.5950-1-coproscefalo@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the code checking for the ACPI status is mixed along with the actual HDD protection status check. This patch splits those two checks are they are not related, printing an error string in case the ACPI call failed, and then check for actual HDD protection status. Signed-off-by: Azael Avalos --- drivers/platform/x86/toshiba_haps.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/toshiba_haps.c b/drivers/platform/x86/toshiba_haps.c index 7f2afc6..094f3a8 100644 --- a/drivers/platform/x86/toshiba_haps.c +++ b/drivers/platform/x86/toshiba_haps.c @@ -168,9 +168,13 @@ static int toshiba_haps_available(acpi_handle handle) * A non existent device as well as having (only) * Solid State Drives can cause the call to fail. */ - status = acpi_evaluate_integer(handle, "_STA", NULL, - &hdd_present); - if (ACPI_FAILURE(status) || !hdd_present) { + status = acpi_evaluate_integer(handle, "_STA", NULL, &hdd_present); + if (ACPI_FAILURE(status)) { + pr_err("ACPI call to query HDD protection failed\n"); + return 0; + } + + if (!hdd_present) { pr_info("HDD protection not available or using SSD\n"); return 0; }