From patchwork Wed Mar 1 06:42:54 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: 9597691 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 AAC96604DC for ; Wed, 1 Mar 2017 06:44:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C9FF28405 for ; Wed, 1 Mar 2017 06:44:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9142A28490; Wed, 1 Mar 2017 06:44:27 +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 6026128428 for ; Wed, 1 Mar 2017 06:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750736AbdCAGo0 (ORCPT ); Wed, 1 Mar 2017 01:44:26 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:36320 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083AbdCAGoY (ORCPT ); Wed, 1 Mar 2017 01:44:24 -0500 Received: by mail-lf0-f65.google.com with SMTP id g70so1562251lfh.3 for ; Tue, 28 Feb 2017 22:43:03 -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=vU1aP+O4WSOoFcbkngNwRDaVA4R2keewEOW4eIUjm10=; b=HBuxFVVs+nQAOPVyXwILMpU1HzKMlmSHpkM1hgBFznpCeE4zE4YUpZINm73JDIvXgE 2Bt2FsLG1Oou9UfRWddP0hezeaHskU5HYnVdk7ltn/+5ZU53xktiWtibxwwIeGPzHRO4 5wMcXt5E+odLlYwuDYWL1pyB3EOVCsu4J/wIw= 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=vU1aP+O4WSOoFcbkngNwRDaVA4R2keewEOW4eIUjm10=; b=M/mDXuyTS3yMKLUFoOx6iaF3Ps2Saf1nJJaFJL2ffLKNqsIIUJSsQkBehoszNgEpyJ nBCg61VXH2NbGkOCftWsvXQULZGbCvRFDM2x+Kar0ST3CWPVHEdMpfsH4rzdYvLste2/ ta6NHsgSKUCEhqSRjqdQSils5yGopDf4vDIhGrRUfDQ/QEvPZNZUe9DZH4GLXrjDsPke xjpjUvCA595G4qlTb7JtrleI50qBvtNb7QwYRIFh7ch+iVTAL3aowEj1xjHvrLza6sj2 loQnwEnEQ7iLNghWlftKJhr9SgE4fTjfNbvSdKnWIHWM1818Alj43TRhRTQELKOuwtkO Vx+Q== X-Gm-Message-State: AMke39nXWyccbSR0lAUbxMfGLhheLMtztYAXOfodvKcB9yhiYBUuUadZWb4mm5bg2xW75Q== X-Received: by 10.46.22.18 with SMTP id w18mr2235273ljd.86.1488350582899; Tue, 28 Feb 2017 22:43:02 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id y29sm863338ljd.41.2017.02.28.22.43.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 22:43:02 -0800 (PST) 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 v2 2/2] platform/x86: fujitsu-laptop: simplify brightness key event generation logic Date: Wed, 1 Mar 2017 07:42:54 +0100 Message-Id: <20170301064254.1311-3-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170301064254.1311-1-kernel@kempniu.pl> References: <20170301064254.1311-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 Returning early when there is no brightness change allows removal of a duplicate code block, makes the purpose of the following code clearer and allows the condition surrounding key event generation to be removed. Local integer variables can also be declared in a single line. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 40 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index b19f6e1c0173..4a5e7b60a672 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -790,8 +790,7 @@ static int acpi_fujitsu_bl_remove(struct acpi_device *device) static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) { struct input_dev *input; - int keycode; - int oldb, newb; + int oldb, newb, keycode; input = fujitsu_bl->input; @@ -806,7 +805,6 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) return; } - keycode = 0; oldb = fujitsu_bl->brightness_level; get_lcd_level(); newb = fujitsu_bl->brightness_level; @@ -815,30 +813,22 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) "brightness button event [%i -> %i (%i)]\n", oldb, newb, fujitsu_bl->brightness_changed); - if (oldb < newb) { - if (disable_brightness_adjust != 1) { - if (use_alt_lcd_levels) - set_lcd_level_alt(newb); - else - set_lcd_level(newb); - } - keycode = KEY_BRIGHTNESSUP; - } else if (oldb > newb) { - if (disable_brightness_adjust != 1) { - if (use_alt_lcd_levels) - set_lcd_level_alt(newb); - else - set_lcd_level(newb); - } - keycode = KEY_BRIGHTNESSDOWN; - } + if (oldb == newb) + return; - if (keycode != 0) { - input_report_key(input, keycode, 1); - input_sync(input); - input_report_key(input, keycode, 0); - input_sync(input); + if (disable_brightness_adjust != 1) { + if (use_alt_lcd_levels) + set_lcd_level_alt(newb); + else + set_lcd_level(newb); } + + keycode = oldb < newb ? KEY_BRIGHTNESSUP : KEY_BRIGHTNESSDOWN; + + input_report_key(input, keycode, 1); + input_sync(input); + input_report_key(input, keycode, 0); + input_sync(input); } /* ACPI device for hotkey handling */