From patchwork Mon Jan 9 13:14:17 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: 9504611 X-Patchwork-Delegate: andy.shevchenko@gmail.com 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 7B2F46075F for ; Mon, 9 Jan 2017 13:15:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79209284D0 for ; Mon, 9 Jan 2017 13:15:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D98F284D5; Mon, 9 Jan 2017 13:15:31 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 3EBAC284D0 for ; Mon, 9 Jan 2017 13:15:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938860AbdAINPH (ORCPT ); Mon, 9 Jan 2017 08:15:07 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36808 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759463AbdAINO1 (ORCPT ); Mon, 9 Jan 2017 08:14:27 -0500 Received: by mail-lf0-f68.google.com with SMTP id j75so11748251lfe.3 for ; Mon, 09 Jan 2017 05:14:26 -0800 (PST) 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=vVIwbS4MzgdOrUFASBw1Bmy21qQzQ20M2gj6RbWvzXY=; b=IQFr02Jo5Kzn+JDxY3sgSAtcRbHBaFy//NQUocXXujHhnBCyDrDJkVd9BluEj0hQb7 M3YBPfvPmSpSjuxTXRShmpaXTeCN1176ZZuIT29WAJSz2eehTGavdp/AmwaKN80uUGkG 6DecK8++1WV5qlyy6Jspmgie4qjinhVHb6tdU= 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=vVIwbS4MzgdOrUFASBw1Bmy21qQzQ20M2gj6RbWvzXY=; b=U8Jf30d3X/eE81gNzRvY2q8XVnWiJXRSjzmJWnpWEBEk6n4AglSjzY2JVTURgkjBLP P+oummC/7YY9O4onxCHL+S8i9+iz1boC0tc4k7hORbnPmLwuPZ1vVbALuy2momuCWcEQ YmM1yeoZTK21oOQXrbpZcUi4NbDXD0YP00at2rwYJopt9KJfu+MWgpi01GqzIhwLyjgQ EK0VZ8PkwWmLZdggbknht+Kq94Kb7gCWOqKPA52IuXVjDLmh3yL24cq/nadY99bM6oSc ZGqZtmGsqjeKe8ueh/ht1q0oRp+1wp02D2BgvDGla+Yg1jNSYmBNPG+M+9hNY58hkLFw c0Cw== X-Gm-Message-State: AIkVDXLv9NpMvR2Z49MTdltyZ29PnRpXtW/n5jbUhwkax8YiItQBzGZHHfaeyFV8eL2qYw== X-Received: by 10.46.21.68 with SMTP id 4mr31212149ljv.11.1483967665432; Mon, 09 Jan 2017 05:14:25 -0800 (PST) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id u77sm21457380lfg.22.2017.01.09.05.14.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jan 2017 05:14:24 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart Cc: Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] platform/x86: fujitsu-laptop: simplify logolamp_get() Date: Mon, 9 Jan 2017 14:14:17 +0100 Message-Id: <20170109131417.9677-2-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170109131417.9677-1-kernel@kempniu.pl> References: <20170109131417.9677-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 Now that call_fext_func() is invoked by logolamp_set() for both LOGOLAMP_POWERON and LOGOLAMP_ALWAYS for every brightness value, logolamp_get() can be simplified to decrease indentation and number of local variables. Signed-off-by: Michał Kępień Acked-by: Jonathan Woithe --- Changes from v1: - This patch was not present in v1. One thing worth noting is that in case call_fext_func() returns an error, logolamp_get() will still return LED_OFF, just like the original version. drivers/platform/x86/fujitsu-laptop.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 34b8481fb0ed..7fa082558a42 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -319,17 +319,17 @@ static int eco_led_set(struct led_classdev *cdev, static enum led_brightness logolamp_get(struct led_classdev *cdev) { - enum led_brightness brightness = LED_OFF; - int poweron, always; - - poweron = call_fext_func(FUNC_LEDS, 0x2, LOGOLAMP_POWERON, 0x0); - if (poweron == FUNC_LED_ON) { - brightness = LED_HALF; - always = call_fext_func(FUNC_LEDS, 0x2, LOGOLAMP_ALWAYS, 0x0); - if (always == FUNC_LED_ON) - brightness = LED_FULL; - } - return brightness; + int ret; + + ret = call_fext_func(FUNC_LEDS, 0x2, LOGOLAMP_ALWAYS, 0x0); + if (ret == FUNC_LED_ON) + return LED_FULL; + + ret = call_fext_func(FUNC_LEDS, 0x2, LOGOLAMP_POWERON, 0x0); + if (ret == FUNC_LED_ON) + return LED_HALF; + + return LED_OFF; } static enum led_brightness kblamps_get(struct led_classdev *cdev)