From patchwork Tue Apr 4 09:39:03 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: 9661021 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 2E713602B9 for ; Tue, 4 Apr 2017 09:39:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E3A9284CB for ; Tue, 4 Apr 2017 09:39:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12DE3284D1; Tue, 4 Apr 2017 09:39:21 +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=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 22A1B284CB for ; Tue, 4 Apr 2017 09:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752879AbdDDJjT (ORCPT ); Tue, 4 Apr 2017 05:39:19 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33632 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbdDDJjS (ORCPT ); Tue, 4 Apr 2017 05:39:18 -0400 Received: by mail-lf0-f68.google.com with SMTP id r36so15074202lfi.0 for ; Tue, 04 Apr 2017 02:39:17 -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=tu35bGFUKvPO2PW2i9+w1YztrXj09mhzLYfVU5cBmhY=; b=CZf33kvloeOE3hBOJTgyOFUqdlGkLWBLVc8Psm5sB+rqxhXriRpXzdeFRvR6dceu+O rlooeAuxdPMzu6BM44MfhGrcuSGQgknvlfsf7WXTjNA809CAedddS7u/0OBx6iO5iFak s9S85UPyKgb5CugWiLeq8WJoTk3BgjN/xP9Oo= 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=tu35bGFUKvPO2PW2i9+w1YztrXj09mhzLYfVU5cBmhY=; b=pL8e77sIfm+/V+RT1UFN71aoVfw8tsdBUVAWQLBNtkBcEqOYQZBaMVT5aRrODyyRL5 0AXR7SJHFEQJNAFjls/uhJ3+6p5Qk5wplLWNaUdn7yBdL4JS6vdLUECFdJYxqxNaqGkP eUoRHRhjydx18DfPM7zcbL7FVhyiza3iRtRXYlvOUDmOb/lPVAv7Cd6FrMpj0RYkq33o z8nJCt4xww3agtiqGH58aic8OFLnHhhr2XWfaqto7zJ4cpOHRAtuL62gSUH2aWCF9VI3 5hB8zASkb4d+cNPnRqxVFZJN0G/MS1LNHnIPPSAqlk8NfdPsPMDyxgtMP++/GvPYKl/A Q84A== X-Gm-Message-State: AFeK/H3GonvJUb35NNVEufXqhUaocRa7aN2YiMFI1JD9DnL5IhbwCwkqDz9aGAAKTQDTDw== X-Received: by 10.25.39.14 with SMTP id n14mr6705760lfn.0.1491298756358; Tue, 04 Apr 2017 02:39:16 -0700 (PDT) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 31sm3105090lja.17.2017.04.04.02.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 02:39:15 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Darren Hart Cc: Jonathan Woithe , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04+/11] platform/x86: fujitsu-laptop: simplify set_lcd_level() Date: Tue, 4 Apr 2017 11:39:03 +0200 Message-Id: <20170404093903.15675-1-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170404000102.GD17322@fury> References: <20170404000102.GD17322@fury> 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_execute_simple_method() takes a method parameter which tells it to look for the given method underneath the given handle, so calling acpi_get_handle() beforehand is redundant. Replace the call to acpi_get_handle() with a call to acpi_execute_simple_method(), thus eliminating the need for a local variable storing the handle. Update debug message to reflect this change. Also do not assign a default value to status as it has no influence on execution flow. Signed-off-by: Michał Kępień --- Darren, This is patch 04/11 with updated debug and commit messages. Now that you mentioned this issue, I think we should do the same for patch 2/3 in the call_fext_func() cleanup series [1]. Would you like me to just send an updated version of that specific patch (similarly to what I did in this case) or rather send v2 of the entire call_fext_func() cleanup series? [1] https://www.spinics.net/lists/platform-driver-x86/msg11058.html drivers/platform/x86/fujitsu-laptop.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 2f563aa00592..6d4a2a36716b 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -358,8 +358,7 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev) static int set_lcd_level(int level) { - acpi_status status = AE_OK; - acpi_handle handle = NULL; + acpi_status status; char *method; switch (use_alt_lcd_levels) { @@ -377,16 +376,14 @@ static int set_lcd_level(int level) if (level < 0 || level >= fujitsu_bl->max_brightness) return -EINVAL; - status = acpi_get_handle(fujitsu_bl->acpi_handle, method, &handle); + status = acpi_execute_simple_method(fujitsu_bl->acpi_handle, method, + level); if (ACPI_FAILURE(status)) { - vdbg_printk(FUJLAPTOP_DBG_ERROR, "%s not present\n", method); + vdbg_printk(FUJLAPTOP_DBG_ERROR, "Failed to evaluate %s\n", + method); return -ENODEV; } - status = acpi_execute_simple_method(handle, NULL, level); - if (ACPI_FAILURE(status)) - return -ENODEV; - return 0; }