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 2/7] platform/x86: fujitsu-laptop: Define constants for FUNC features
Date: Tue, 27 Feb 2018 22:15:34 +0100 [thread overview]
Message-ID: <20180227211539.5708-3-kernel@kempniu.pl> (raw)
In-Reply-To: <20180227211539.5708-1-kernel@kempniu.pl>
Various functions exposed by the firmware through the FUNC interface
allow operations to be performed on certain features. Make sure these
features are referred to by consistently named constants instead of
integers in order to better convey the intent of each call_fext_func()
invocation.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/fujitsu-laptop.c | 53 +++++++++++++++++++----------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 74775caeb609..087b5d1f2f4a 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -103,15 +103,18 @@
/* FUNC interface - LED control */
#define FUNC_LED_OFF BIT(0)
#define FUNC_LED_ON (BIT(0) | BIT(16) | BIT(17))
-#define LOGOLAMP_POWERON BIT(13)
-#define LOGOLAMP_ALWAYS BIT(14)
-#define KEYBOARD_LAMPS BIT(8)
+#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 RADIO_LED_ON BIT(5)
-#define ECO_LED BIT(16)
+
+#define FEAT_ECO_LED BIT(16)
#define ECO_LED_ON BIT(19)
/* FUNC interface - backlight power control */
-#define BACKLIGHT_PARAM_POWER BIT(2)
+#define FEAT_BACKLIGHT_POWER BIT(2)
#define BACKLIGHT_OFF (BIT(0) | BIT(1))
#define BACKLIGHT_ON 0
@@ -273,10 +276,10 @@ static int bl_update_status(struct backlight_device *b)
if (fext) {
if (b->props.power == FB_BLANK_POWERDOWN)
call_fext_func(fext, FUNC_BACKLIGHT, OP_SET,
- BACKLIGHT_PARAM_POWER, BACKLIGHT_OFF);
+ FEAT_BACKLIGHT_POWER, BACKLIGHT_OFF);
else
call_fext_func(fext, FUNC_BACKLIGHT, OP_SET,
- BACKLIGHT_PARAM_POWER, BACKLIGHT_ON);
+ FEAT_BACKLIGHT_POWER, BACKLIGHT_ON);
}
return set_lcd_level(device, b->props.brightness);
@@ -606,12 +609,12 @@ static int logolamp_set(struct led_classdev *cdev,
always = FUNC_LED_OFF;
ret = call_fext_func(device, FUNC_LEDS, OP_SET,
- LOGOLAMP_POWERON, poweron);
+ FEAT_LOGOLAMP_POWERON, poweron);
if (ret < 0)
return ret;
return call_fext_func(device, FUNC_LEDS, OP_SET,
- LOGOLAMP_ALWAYS, always);
+ FEAT_LOGOLAMP_ALWAYS, always);
}
static enum led_brightness logolamp_get(struct led_classdev *cdev)
@@ -619,11 +622,13 @@ static enum led_brightness logolamp_get(struct led_classdev *cdev)
struct acpi_device *device = to_acpi_device(cdev->dev->parent);
int ret;
- ret = call_fext_func(device, FUNC_LEDS, OP_GET, LOGOLAMP_ALWAYS, 0x0);
+ ret = call_fext_func(device, FUNC_LEDS, OP_GET,
+ FEAT_LOGOLAMP_ALWAYS, 0x0);
if (ret == FUNC_LED_ON)
return LED_FULL;
- ret = call_fext_func(device, FUNC_LEDS, OP_GET, LOGOLAMP_POWERON, 0x0);
+ ret = call_fext_func(device, FUNC_LEDS, OP_GET,
+ FEAT_LOGOLAMP_POWERON, 0x0);
if (ret == FUNC_LED_ON)
return LED_HALF;
@@ -637,10 +642,10 @@ static int kblamps_set(struct led_classdev *cdev,
if (brightness >= LED_FULL)
return call_fext_func(device, FUNC_LEDS, OP_SET,
- KEYBOARD_LAMPS, FUNC_LED_ON);
+ FEAT_KEYBOARD_LAMPS, FUNC_LED_ON);
else
return call_fext_func(device, FUNC_LEDS, OP_SET,
- KEYBOARD_LAMPS, FUNC_LED_OFF);
+ FEAT_KEYBOARD_LAMPS, FUNC_LED_OFF);
}
static enum led_brightness kblamps_get(struct led_classdev *cdev)
@@ -649,7 +654,7 @@ static enum led_brightness kblamps_get(struct led_classdev *cdev)
enum led_brightness brightness = LED_OFF;
if (call_fext_func(device, FUNC_LEDS, OP_GET,
- KEYBOARD_LAMPS, 0x0) == FUNC_LED_ON)
+ FEAT_KEYBOARD_LAMPS, 0x0) == FUNC_LED_ON)
brightness = LED_FULL;
return brightness;
@@ -662,10 +667,10 @@ static int radio_led_set(struct led_classdev *cdev,
if (brightness >= LED_FULL)
return call_fext_func(device, FUNC_FLAGS, OP_SET_EXT,
- RADIO_LED_ON, RADIO_LED_ON);
+ FEAT_RADIO_LED, RADIO_LED_ON);
else
return call_fext_func(device, FUNC_FLAGS, OP_SET_EXT,
- RADIO_LED_ON, 0x0);
+ FEAT_RADIO_LED, 0x0);
}
static enum led_brightness radio_led_get(struct led_classdev *cdev)
@@ -686,13 +691,13 @@ static int eco_led_set(struct led_classdev *cdev,
struct acpi_device *device = to_acpi_device(cdev->dev->parent);
int curr;
- curr = call_fext_func(device, FUNC_LEDS, OP_GET, ECO_LED, 0x0);
+ curr = call_fext_func(device, FUNC_LEDS, OP_GET, FEAT_ECO_LED, 0x0);
if (brightness >= LED_FULL)
return call_fext_func(device, FUNC_LEDS, OP_SET,
- ECO_LED, curr | ECO_LED_ON);
+ FEAT_ECO_LED, curr | ECO_LED_ON);
else
return call_fext_func(device, FUNC_LEDS, OP_SET,
- ECO_LED, curr & ~ECO_LED_ON);
+ FEAT_ECO_LED, curr & ~ECO_LED_ON);
}
static enum led_brightness eco_led_get(struct led_classdev *cdev)
@@ -701,7 +706,7 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev)
enum led_brightness brightness = LED_OFF;
if (call_fext_func(device, FUNC_LEDS, OP_GET,
- ECO_LED, 0x0) & ECO_LED_ON)
+ FEAT_ECO_LED, 0x0) & ECO_LED_ON)
brightness = LED_FULL;
return brightness;
@@ -714,7 +719,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
int ret;
if (call_fext_func(device, FUNC_LEDS, OP_GET_CAPS,
- 0x0, 0x0) & LOGOLAMP_POWERON) {
+ 0x0, 0x0) & FEAT_LOGOLAMP_POWERON) {
led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL);
if (!led)
return -ENOMEM;
@@ -728,7 +733,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
}
if ((call_fext_func(device, FUNC_LEDS, OP_GET_CAPS,
- 0x0, 0x0) & KEYBOARD_LAMPS) &&
+ 0x0, 0x0) & FEAT_KEYBOARD_LAMPS) &&
(call_fext_func(device, FUNC_BUTTONS, OP_GET_CAPS,
0x0, 0x0) == 0x0)) {
led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL);
@@ -774,7 +779,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
if ((call_fext_func(device, FUNC_LEDS, OP_GET_CAPS,
0x0, 0x0) & BIT(14)) &&
(call_fext_func(device, FUNC_LEDS, OP_GET,
- ECO_LED, 0x0) != UNSUPPORTED_CMD)) {
+ FEAT_ECO_LED, 0x0) != UNSUPPORTED_CMD)) {
led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL);
if (!led)
return -ENOMEM;
@@ -844,7 +849,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
if (fujitsu_bl && fujitsu_bl->bl_device &&
acpi_video_get_backlight_type() == acpi_backlight_vendor) {
if (call_fext_func(fext, FUNC_BACKLIGHT, OP_GET,
- BACKLIGHT_PARAM_POWER, 0x0) == BACKLIGHT_OFF)
+ FEAT_BACKLIGHT_POWER, 0x0) == BACKLIGHT_OFF)
fujitsu_bl->bl_device->props.power = FB_BLANK_POWERDOWN;
else
fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK;
--
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 ` Michał Kępień [this message]
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 ` [PATCH 5/7] platform/x86: fujitsu-laptop: Tweak how constants are commented and laid out Michał Kępień
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-3-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
all inboxes | Powered by JetHome®