From: "Michał Kępień" <kernel@kempniu.pl>
To: Jonathan Woithe <jwoithe@just42.net>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
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 [thread overview]
Message-ID: <20180227211539.5708-6-kernel@kempniu.pl> (raw)
In-Reply-To: <20180227211539.5708-1-kernel@kempniu.pl>
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ń <kernel@kempniu.pl>
---
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;
--
2.16.2
next prev parent reply other threads:[~2018-02-27 21:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-27 21:15 [PATCH 0/7] fujitsu-laptop: Consistent naming of constants Michał Kępień
2018-02-27 21:15 ` [PATCH 1/7] platform/x86: fujitsu-laptop: Define constants for FUNC operations Michał Kępień
2018-02-28 16:08 ` Andy Shevchenko
2018-03-04 5:08 ` Jonathan Woithe
2018-03-04 19:44 ` Michał Kępień
2018-03-04 22:49 ` Jonathan Woithe
2018-03-05 23:16 ` Darren Hart
2018-03-06 9:37 ` Andy Shevchenko
2018-03-06 20:59 ` Michał Kępień
2018-03-07 12:34 ` Andy Shevchenko
2018-03-10 20:10 ` Michał Kępień
2018-03-12 9:27 ` Andy Shevchenko
2018-02-27 21:15 ` [PATCH 2/7] platform/x86: fujitsu-laptop: Define constants for FUNC features Michał Kępień
2018-02-27 21:15 ` [PATCH 3/7] platform/x86: fujitsu-laptop: Define constants for FUNC feature states Michał Kępień
2018-02-27 21:15 ` [PATCH 4/7] platform/x86: fujitsu-laptop: Rename constants defining hotkey codes Michał Kępień
2018-02-27 21:15 ` Michał Kępień [this message]
2018-02-27 21:15 ` [PATCH 6/7] platform/x86: fujitsu-laptop: More accurately represent the hotkey ring buffer managed by firmware Michał Kępień
2018-02-28 16:13 ` Andy Shevchenko
2018-03-04 19:57 ` Michał Kępień
2018-02-27 21:15 ` [PATCH 7/7] platform/x86: fujitsu-laptop: Introduce fext_*() helper functions Michał Kępień
2018-03-04 5:37 ` [PATCH 0/7] fujitsu-laptop: Consistent naming of constants Jonathan Woithe
2018-03-21 23:25 ` Darren Hart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180227211539.5708-6-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=jwoithe@just42.net \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).