From patchwork Tue Jan 17 11:07:34 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: 9520535 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 A40AD6020A for ; Tue, 17 Jan 2017 11:16:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 903FD28522 for ; Tue, 17 Jan 2017 11:16:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 838C427F9E; Tue, 17 Jan 2017 11:16:10 +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 2DB3D27F9E for ; Tue, 17 Jan 2017 11:16:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751069AbdAQLQJ (ORCPT ); Tue, 17 Jan 2017 06:16:09 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36425 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbdAQLQJ (ORCPT ); Tue, 17 Jan 2017 06:16:09 -0500 Received: by mail-lf0-f66.google.com with SMTP id h65so15737279lfi.3 for ; Tue, 17 Jan 2017 03:16:08 -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=aGh17Hvpqp/dKOwWVVpunD8isFQlAoy5Xg2or2t69r0=; b=lrT/hdyyYZtDiGU6t7uFAWLM9MV51V6D6tQT+XA+nJ0PrBw8A+prEfR+UAeR7VBl0j 2bbYhBBCpXh8hHwskZzO1pCSY4u0qgntL212zHKzkpyxE/4Oy9sBmm1BPrL/ONFsqUjr xOskGzfB6WWd1nsfkUiDtUmT0gygh411Xe1to= 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=aGh17Hvpqp/dKOwWVVpunD8isFQlAoy5Xg2or2t69r0=; b=rSJKfeel4Dgnd8iE7p2ezjqSvBJtLdGhwwAkJ5pXHgxEUGg71rwc/uSnZPIPsaOL9u ylmpsftJv6l3V0EESi09P2jIAmrcG18jhxyst6sK7t42waSdRTsuRJoV8MqopGrjVQwh HmdQ0/G6Q95if6FdD4jlb9dj86zwVAcdyWXC7+Il++w2HMOR+4O3IIzYCe4PBWKe1VHZ WIHUmey80iIRvPcx+QEeQmfbzucuol+KNNbEpSk4+QufH02dFeiTyQI7PgrPcjQkSgWp byXWKRi/ajg5dbwtnsqQo46LdCM8q4cZpQA2O0O42nP4luG+c1SAweNrcNfOIAndAewh gSew== X-Gm-Message-State: AIkVDXLUiJgH+yMgHO/Tq0S5vCq409IqayQbz+nPc+1J+i8SCUE3HOkSmuPAOO7HDIVCyw== X-Received: by 10.25.216.156 with SMTP id r28mr11696518lfi.28.1484651264761; Tue, 17 Jan 2017 03:07:44 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 03:07:44 -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 1/2] platform/x86: fujitsu-laptop: decrease indentation in acpi_fujitsu_notify() Date: Tue, 17 Jan 2017 12:07:34 +0100 Message-Id: <20170117110735.2543-2-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 acpi_fujitsu_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 96f8163d5002..35c1319b7c8e 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -789,40 +789,42 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event) input = fujitsu->input; - switch (event) { - case ACPI_FUJITSU_NOTIFY_CODE1: - keycode = 0; - oldb = fujitsu->brightness_level; - get_lcd_level(); - newb = fujitsu->brightness_level; - - vdbg_printk(FUJLAPTOP_DBG_TRACE, - "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; - } - 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->brightness_level; + get_lcd_level(); + newb = fujitsu->brightness_level; + + vdbg_printk(FUJLAPTOP_DBG_TRACE, + "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 (keycode != 0) {