From patchwork Tue Jan 17 11:07:35 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: 9520533 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 DA96E6020A for ; Tue, 17 Jan 2017 11:16:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C977928520 for ; Tue, 17 Jan 2017 11:16:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8D6F28529; Tue, 17 Jan 2017 11:16:02 +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 884F128532 for ; Tue, 17 Jan 2017 11:16:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750849AbdAQLQA (ORCPT ); Tue, 17 Jan 2017 06:16:00 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33421 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbdAQLQA (ORCPT ); Tue, 17 Jan 2017 06:16:00 -0500 Received: by mail-lf0-f65.google.com with SMTP id x1so10462321lff.0 for ; Tue, 17 Jan 2017 03:15:45 -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=v1+hlh6EmxQPpzDZniEsIfgC+GikW0tvbC9nrwtGzc0=; b=sR+2zlFN4tfCO9+fcLENsFa8mX51dmqC0VgPdvfNb5dBLAN4mMFMtiO+H+TqSGvNPo K5LAwh96PgfdsRWqD/AWFbn5G4x/XOlGcM0ge0dd5wKbCuoGQbV8mWZ18YqemPMQ3CoY dG42bjSwyQJ7R8nFK8WhOXL/tJBG7sCBB70HI= 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=v1+hlh6EmxQPpzDZniEsIfgC+GikW0tvbC9nrwtGzc0=; b=hLSI6daj5YLHa2xIQuOeUURo04GGU1ptjXQZdGoZZkadyQGK9vbGpN/pQ62afjW1pA J6tak6gx5CGGTw1Dc8o6FvEE36oeuHPtqJ+kJs23MdlMW7+HMq5zJu1lFBlNHQuqhZYO BWOtjOEhAgNMElbrtFRdHtaL2fF5ucMEU+LYzx6LFuPGwRcv2CjFYLjyG+cAfT3CFhnA WA05i7bHvkcy85SeM+4NCZo1FMHRFOV84SvwbPQKHVZSSFmzvhLe+PhK3xNemnCBJUtG UjPMWi3QbGsF7sh8DWuyLUR4xNs66/UJ76ZzqoqxZO8PQfA66yQdwZczOHVne/YO0gYm Mr2A== X-Gm-Message-State: AIkVDXLEpaYCFgd0zzsZR6+FOqzkfpRqlWrgD56+6uyduomBbwBmpYc/xJ1gxT0CQiXl8A== X-Received: by 10.25.201.203 with SMTP id z194mr11744843lff.3.1484651265523; Tue, 17 Jan 2017 03:07:45 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id r27sm874138ljd.14.2017.01.17.03.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 03:07:45 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] platform/x86: fujitsu-laptop: simplify brightness key event generation logic Date: Tue, 17 Jan 2017 12:07:35 +0100 Message-Id: <20170117110735.2543-3-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170117110735.2543-1-kernel@kempniu.pl> References: <20170117110735.2543-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. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 37 +++++++++++++---------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 35c1319b7c8e..37b0fcecff51 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -800,7 +800,6 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event) return; } - keycode = 0; oldb = fujitsu->brightness_level; get_lcd_level(); newb = fujitsu->brightness_level; @@ -809,30 +808,22 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event) "brightness button event [%i -> %i (%i)]\n", oldb, newb, fujitsu->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 */