From patchwork Wed Sep 7 15:28:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 9319539 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 BBE0A60752 for ; Wed, 7 Sep 2016 15:29:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B218C293DF for ; Wed, 7 Sep 2016 15:29:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5BB6293E1; Wed, 7 Sep 2016 15:29:05 +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 603E2293DF for ; Wed, 7 Sep 2016 15:29:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935138AbcIGP23 (ORCPT ); Wed, 7 Sep 2016 11:28:29 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36757 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751243AbcIGP2X (ORCPT ); Wed, 7 Sep 2016 11:28:23 -0400 Received: by mail-oi0-f65.google.com with SMTP id u131so2303007oif.3; Wed, 07 Sep 2016 08:28:23 -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=7TPJ+IQp/yBPOOmfbkkNlwyXpfuwJxQueCps2/jQgLA=; b=EtpAGbO/K/pCEpe+Ljqr8lihYsuUxkOoe6Hhov9drm6hi0LHRXqMtISAAVqi1NqHqc XJKPi7dLvZNZOAM4/HdWjQXzNGuWoI9yl1YicfgqBcoS/JSmnEoVUfKHhEXYswhRFEK/ Y3tkGvJBFkDpmecjil1hFZzBK1FiEVby+ByxgDJE8/fQPcZn9xHr2dPI5jfCbU0JhgIV gsRJL9kvdhYtP0FM0O5d5j+rPrULO+ezhGrGtO7UOMI9pMXO1TpdUCukAZIOQqf2PqGh T4NIBHmWnmiIcvilIbNSS03zxLL9onmbZsCyHu/ORieP4rjLKt6LGcvjJ+qAjpczZGyp fM7A== 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=7TPJ+IQp/yBPOOmfbkkNlwyXpfuwJxQueCps2/jQgLA=; b=alru6+GgVUSOGVeS4zzzg5PAnXTe4smj9tFjVo+3RmtYg+7F7q4SRol/VZTDBGYwxr ylUh0ZEhGAOTueQmLRz7ijN/oNlfrOxba9PlW4W3WoKSub1cwbjnfpQwOR/QoqUAlQdd lhVfFDLkwVQ7ASAWHB6eSS8KZkbkrow/2DSZNprCqK7eqZ2xIY6u/Nd9VWCKA8c/iSG0 ksMsNzEGP5uXeHey7SrCB4B3L5PGAOddoC8sy0UpWSXHtzzKt2uKdvIAAJkCf6Uhl2Vs gGGqoMEGEZkhqPRoEdtzIfi+/71t2QG4VnR03J7yWm6R+44T94+/sSbUIg5fzlWqNd2J 67jQ== X-Gm-Message-State: AE9vXwPnFEsRW/gdiRPzMJimLtUWkFJUttmUPuLz0TLWeZN94L5vBqRsEHfiZbbELjMb7w== X-Received: by 10.157.9.227 with SMTP id 32mr6626486otz.2.1473262102600; Wed, 07 Sep 2016 08:28:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 08:28:22 -0700 (PDT) From: Azael Avalos To: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Azael Avalos Subject: [PATCH] toshiba_bluetooth: Decouple an error checking status code Date: Wed, 7 Sep 2016 09:28:15 -0600 Message-Id: <20160907152815.5950-4-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 This patch simply decouples te error checking of the ACPI status and the actual BT status, as those two were nested in an if/else check, but are completely unrelated. Signed-off-by: Azael Avalos --- drivers/platform/x86/toshiba_bluetooth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c index 5db495dd..be1d137 100644 --- a/drivers/platform/x86/toshiba_bluetooth.c +++ b/drivers/platform/x86/toshiba_bluetooth.c @@ -80,7 +80,9 @@ static int toshiba_bluetooth_present(acpi_handle handle) if (ACPI_FAILURE(result)) { pr_err("ACPI call to query Bluetooth presence failed\n"); return -ENXIO; - } else if (!bt_present) { + } + + if (!bt_present) { pr_info("Bluetooth device not present\n"); return -ENODEV; }