From patchwork Tue Feb 27 21:15:37 2018 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: 10246073 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 A705160362 for ; Tue, 27 Feb 2018 21:16:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99E2328AB5 for ; Tue, 27 Feb 2018 21:16:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EA8628AB7; Tue, 27 Feb 2018 21:16:50 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 3D6EB28AB5 for ; Tue, 27 Feb 2018 21:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751856AbeB0VQt (ORCPT ); Tue, 27 Feb 2018 16:16:49 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:40375 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751777AbeB0VPx (ORCPT ); Tue, 27 Feb 2018 16:15:53 -0500 Received: by mail-lf0-f67.google.com with SMTP id 37so364746lfs.7 for ; Tue, 27 Feb 2018 13:15:53 -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=XRjoSTpxgGYh9NCSdPw9yJ6hW4sZDEK3qCAXg0oVfpg=; b=OVRg5hsM3JHKfldnHVTUTu3JFJ0NAfPggwO5FJhTRh2bYF7TCIKOBLlACjtyP+Xw+e J6vylExLyvrjRMJl6KuutRlIF3m7L7UvUzlN7hFHOZmylGMpTLtGw0prDv7n28slQNMG l+1sb4YzW0jLgjoERg/m2yhJGQ0w9blmXHrbo= 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=XRjoSTpxgGYh9NCSdPw9yJ6hW4sZDEK3qCAXg0oVfpg=; b=Dy7srd+a3FxV00jbseCUmdmolXhOmmXlMGo85TEOe9txYV0xVDM/1iM7b8DSm+bVWe Ha52Z0gf9QJTutZOvki7WCKCZyDGVQ9hkfvILw9npauKEQyBnVINVnYwa2/1HmaYYdVC JW3ydt0TzSl7diSzTXFnwUpDwm+SWhVlI5iXJWQIiL6pPPQYckKeDuTA4XGtfGFK891N 4HuNw9XDpkmPXvA2c58HvxOtFL2vEyM/2UW76B0yE8+OyX68pAvfvS5qtj+zTYxasZ+R F/vK0p1RUh8WRJShiOGTV1hNjM/R96NIRKREsIVRPcz1GrQ8RYbtKwCDU0sIljOwPXx0 lKMQ== X-Gm-Message-State: APf1xPCPt5B5ZuDvbdM19gcxsR+aGdUDtWc6MAWQ36yPLPNJ8DjgHmyv ILmIAZ/1HBwFAdg3GYrR3Td8RLQK X-Google-Smtp-Source: AH8x226JtlqQ59H1EP27jh9+zEVvq+PYIkZEuMAHpYbMHDCYCsA1ISJ5O2YrDIGm7PvPa4a0cmnrLA== X-Received: by 10.46.23.219 with SMTP id 88mr11402527ljx.49.1519766152420; Tue, 27 Feb 2018 13:15:52 -0800 (PST) Received: from kmp-mobile.hq.kempniu.pl (kmp-mobile.hq.kempniu.pl. [2001:470:64df:111::d0d7]) by smtp.googlemail.com with ESMTPSA id l5sm16288lje.58.2018.02.27.13.15.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 13:15:51 -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 5/7] platform/x86: fujitsu-laptop: Tweak how constants are commented and laid out Date: Tue, 27 Feb 2018 22:15:37 +0100 Message-Id: <20180227211539.5708-6-kernel@kempniu.pl> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180227211539.5708-1-kernel@kempniu.pl> References: <20180227211539.5708-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 Update comments used for each group of constants to better reflect their current purpose. Ensure the layout of groups of constants follows the order in which call_fext_func() takes its arguments. Use alphabetic ordering for groups of constants. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 55 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 5f8c89155b51..5acf1ccc6864 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -78,15 +78,15 @@ #define ACPI_FUJITSU_NOTIFY_CODE 0x80 -/* FUNC interface - command values */ -#define FUNC_FLAGS BIT(12) -#define FUNC_LEDS (BIT(12) | BIT(0)) -#define FUNC_BUTTONS (BIT(12) | BIT(1)) -#define FUNC_BACKLIGHT (BIT(12) | BIT(2)) - /* FUNC interface - responses */ #define UNSUPPORTED_CMD BIT(31) +/* FUNC interface - function selectors */ +#define FUNC_BACKLIGHT (BIT(12) | BIT(2)) +#define FUNC_BUTTONS (BIT(12) | BIT(1)) +#define FUNC_FLAGS BIT(12) +#define FUNC_LEDS (BIT(12) | BIT(0)) + /* FUNC interface - operations */ #define OP_GET BIT(1) #define OP_GET_CAPS 0 @@ -95,41 +95,40 @@ #define OP_SET BIT(0) #define OP_SET_EXT (BIT(2) | BIT(0)) -/* FUNC interface - status flags */ -#define FLAG_RFKILL BIT(5) -#define FLAG_LID BIT(8) -#define FLAG_DOCK BIT(9) - -/* FUNC interface - LED control */ -#define STATE_LED_OFF BIT(0) -#define STATE_LED_ON (BIT(0) | BIT(16) | BIT(17)) -#define FEAT_LOGOLAMP_POWERON BIT(13) -#define FEAT_LOGOLAMP_ALWAYS BIT(14) -#define FEAT_KEYBOARD_LAMPS BIT(8) - -#define FEAT_RADIO_LED BIT(5) -#define STATE_RADIO_LED_OFF 0 -#define STATE_RADIO_LED_ON BIT(5) - -#define FEAT_ECO_LED BIT(16) -#define STATE_ECO_LED_ON BIT(19) - -/* FUNC interface - backlight power control */ +/* Constants related to FUNC_BACKLIGHT */ #define FEAT_BACKLIGHT_POWER BIT(2) #define STATE_BACKLIGHT_OFF (BIT(0) | BIT(1)) #define STATE_BACKLIGHT_ON 0 -/* Scancodes read from the GIRB register */ +/* Constants related to FUNC_BUTTONS */ #define EVENT_HK1 0x410 #define EVENT_HK2 0x411 #define EVENT_HK3 0x412 #define EVENT_HK4 0x413 #define EVENT_HK5 0x420 -/* Hotkey ringbuffer limits */ #define MAX_HOTKEY_RINGBUFFER_SIZE 100 #define RINGBUFFERSIZE 40 +/* Constant related to FUNC_FLAGS */ +#define FLAG_DOCK BIT(9) +#define FLAG_LID BIT(8) +#define FLAG_RFKILL BIT(5) + +/* Constants related to FUNC_LEDS */ +#define FEAT_KEYBOARD_LAMPS BIT(8) +#define FEAT_LOGOLAMP_ALWAYS BIT(14) +#define FEAT_LOGOLAMP_POWERON BIT(13) +#define STATE_LED_OFF BIT(0) +#define STATE_LED_ON (BIT(0) | BIT(16) | BIT(17)) + +#define FEAT_RADIO_LED BIT(5) +#define STATE_RADIO_LED_OFF 0 +#define STATE_RADIO_LED_ON BIT(5) + +#define FEAT_ECO_LED BIT(16) +#define STATE_ECO_LED_ON BIT(19) + /* Module parameters */ static int use_alt_lcd_levels = -1; static bool disable_brightness_adjust;