From patchwork Mon Apr 3 09:38:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9659141 X-Patchwork-Delegate: dvhart@infradead.org 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 D28B960353 for ; Mon, 3 Apr 2017 09:40:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9AA1283ED for ; Mon, 3 Apr 2017 09:40:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9F22284A5; Mon, 3 Apr 2017 09:40:01 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable 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 49325283ED for ; Mon, 3 Apr 2017 09:40:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465AbdDCJkA (ORCPT ); Mon, 3 Apr 2017 05:40:00 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:36288 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbdDCJjL (ORCPT ); Mon, 3 Apr 2017 05:39:11 -0400 Received: by mail-lf0-f65.google.com with SMTP id n78so12309874lfi.3 for ; Mon, 03 Apr 2017 02:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4+rMvZp/tgMXj67qCcbA3kak8j6vTkyx958ARDH4PaI=; b=v8U+vX5PldjmAyLXGGkFf8B03JAinccdEttR9LdjiiC6IcHIW4mLAeAoC/SXQjdLo6 PonGt1HOMDabGgwT/f8vETJoKT2JAHmhF54RA0qTWPkXU8+VPfytZyQzP917qDlJ1UV/ adjqRrOByu0IHuN2M1+hMGXQp///JTOQ3Awzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4+rMvZp/tgMXj67qCcbA3kak8j6vTkyx958ARDH4PaI=; b=XjsdERQDK2oiaqJNvcao8342KlkIpHyDiehgYMORQWCc8M+5v0rc6crNY6EuCUMcSo Ls7UxooU/FxxiAS1y/7AAg11Z9OB0VCGjguHg/6VpW4MiNn93k00ferIQUKTpmcrfae4 e29SzOnWEKT2sD7hJNryjFBJrdzwGbelIUdfFSA7saKcd7zNi8R3rw1EHRLZKVhS1Lhl z4x9ANu8AmzKPMZijxW5lX+x1TdaxLWj9K0A3FJEIC1NK4dk0EmFaMsob747cu64fRvQ dTEZ5KAr6cCEb7eDEmu0DtIqvaw7e65Z13IZzeMBcBiIUXn1A5n3Flm9XZE9JULVDYGK WANQ== X-Gm-Message-State: AFeK/H3gXicd0cyj85Txrk0GWKOC6OhAMj7ieA9rP5G9n1MJHk219Kk/K1apmEKMFktcmw== X-Received: by 10.25.15.41 with SMTP id e41mr5352129lfi.117.1491212350123; Mon, 03 Apr 2017 02:39:10 -0700 (PDT) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id y15sm2439945ljd.41.2017.04.03.02.39.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 02:39:09 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] platform/x86: fujitsu-laptop: simplify call_fext_func() Date: Mon, 3 Apr 2017 11:38:58 +0200 Message-Id: <20170403093859.6685-3-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170403093859.6685-1-kernel@kempniu.pl> References: <20170403093859.6685-1-kernel@kempniu.pl> MIME-Version: 1.0 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 acpi_evaluate_integer() takes a pathname parameter which contains the name of the entity to evaluate underneath the given handle, so calling acpi_get_handle() beforehand is redundant. Replace the call to acpi_get_handle() with a call to acpi_evaluate_integer(), thus eliminating the need for a local variable storing the handle. Adjust whitespace to make checkpatch happy. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index ca1491ff659e..e5413d268b24 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -228,20 +228,11 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2) struct acpi_object_list arg_list = { 4, params }; unsigned long long value; acpi_status status; - acpi_handle handle; - status = acpi_get_handle(fujitsu_laptop->acpi_handle, "FUNC", &handle); + status = acpi_evaluate_integer(fujitsu_laptop->acpi_handle, "FUNC", + &arg_list, &value); if (ACPI_FAILURE(status)) { - vdbg_printk(FUJLAPTOP_DBG_ERROR, - "FUNC interface is not present\n"); - return -ENODEV; - } - - status = acpi_evaluate_integer(handle, NULL, &arg_list, &value); - if (ACPI_FAILURE(status)) { - vdbg_printk(FUJLAPTOP_DBG_WARN, - "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) call failed\n", - cmd, arg0, arg1, arg2); + vdbg_printk(FUJLAPTOP_DBG_ERROR, "FUNC interface is not present\n"); return -ENODEV; }