From patchwork Wed Mar 1 06:42:53 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: 9597693 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 1058860547 for ; Wed, 1 Mar 2017 06:44:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0227228405 for ; Wed, 1 Mar 2017 06:44:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB29728428; 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 2EFCD28410 for ; Wed, 1 Mar 2017 06:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751088AbdCAGoZ (ORCPT ); Wed, 1 Mar 2017 01:44:25 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35471 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750736AbdCAGoY (ORCPT ); Wed, 1 Mar 2017 01:44:24 -0500 Received: by mail-lf0-f67.google.com with SMTP id z127so2559134lfa.2 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=N8ZZQZGUretaD2q1Bu4J+W3n2dXM/ig2aylldGfDYwM=; b=shW97qziPXVBaNY3VuXAvBTUI0UDzdXS/4ENxQxjQn2THl4qaiEhbr967bUJibV2cc Huk3reQARthJNtHZTIhE+raVUuN0x9CIVEuyjSrwGC2huYinWDqU0PHLO8t9lnY9eUdQ NP1dFcmn9llBY7geMhjAVG+6UuuHrdln/1mho= 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=N8ZZQZGUretaD2q1Bu4J+W3n2dXM/ig2aylldGfDYwM=; b=pLg4x7aGOpdHXJTQxelmw2fYJhj3AySK+DVYhuppADejOTWwtnwK2cgDiH8mXhgpzz NVpPSzDmWcjpMGxO4+26JmaT4ss/h5SxnkUIW7UAsz/mLrXf5euI+h/WnH3WGQFOjE74 yvF6oQkQBC2uz9t76LSHc7b/dOCYPqBBfJQMSq1rNS4BNPTRBGV8oRnOSQ+Jb1MHvuLo mjIr1MdPbW70h7TpryoE6SGDbEfRRM46q8NcwzHFyhwBS9q5QMS+rie9OIzwcGnJw2OZ JvBkyZNhH45O+9+GxlGKxY6Yr/M1KCIh6YGb7qjAg9wVPnK5H52uCdtTV4GvrnuBejIQ o2nQ== X-Gm-Message-State: AMke39kVqA3eq+t/EgV89ipMlWag1RIjA+BKhdbh5lCnmg1mUwFbOmKGPk8+kSvy6CG7+w== X-Received: by 10.46.22.10 with SMTP id w10mr2150173ljd.65.1488350582021; 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.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 22:43:01 -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 1/2] platform/x86: fujitsu-laptop: decrease indentation in acpi_fujitsu_bl_notify() Date: Wed, 1 Mar 2017 07:42:53 +0100 Message-Id: <20170301064254.1311-2-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 acpi_fujitsu_bl_notify() is pretty deeply nested, which hurts readability. Strip off one level of indentation by returning early when the event code supplied as argument is not ACPI_FUJITSU_NOTIFY_CODE1. Signed-off-by: Michał Kępień --- Changes introduced by this patch are best viewed when whitespace changes are ignored. drivers/platform/x86/fujitsu-laptop.c | 64 ++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index e12cc3504d48..b19f6e1c0173 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -795,40 +795,42 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) input = fujitsu_bl->input; - switch (event) { - case ACPI_FUJITSU_NOTIFY_CODE1: - keycode = 0; - oldb = fujitsu_bl->brightness_level; - get_lcd_level(); - newb = fujitsu_bl->brightness_level; - - vdbg_printk(FUJLAPTOP_DBG_TRACE, - "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; - } - break; - default: + if (event != ACPI_FUJITSU_NOTIFY_CODE1) { keycode = KEY_UNKNOWN; vdbg_printk(FUJLAPTOP_DBG_WARN, "unsupported event [0x%x]\n", event); - break; + input_report_key(input, keycode, 1); + input_sync(input); + input_report_key(input, keycode, 0); + input_sync(input); + return; + } + + keycode = 0; + oldb = fujitsu_bl->brightness_level; + get_lcd_level(); + newb = fujitsu_bl->brightness_level; + + vdbg_printk(FUJLAPTOP_DBG_TRACE, + "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 (keycode != 0) {