Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 819cddae authored by Michał Kępień's avatar Michał Kępień Committed by Darren Hart (VMware)
Browse files

platform/x86: fujitsu-laptop: Clean up constants 



Align all constant values defined in the module to a common indentation.
Rename ACPI_FUJITSU_NOTIFY_CODE1 to ACPI_FUJITSU_NOTIFY_CODE as there is
only one ACPI notification code used throughout the driver.  Define all
bitmasks using the BIT() macro.  Clean up comments.

Signed-off-by: default avatarMichał Kępień <kernel@kempniu.pl>
Reviewed-by: default avatarJonathan Woithe <jwoithe@just42.net>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 2f60efa1

drivers/platform/x86/fujitsu-laptop.c

+34 −32
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/bitops.h>

#include <linux/dmi.h>

#include <linux/backlight.h>

#include <linux/fb.h>
@@ -75,44 +76,45 @@ 
#define ACPI_FUJITSU_LAPTOP_DRIVER_NAME	"Fujitsu laptop FUJ02E3 ACPI hotkeys driver"

#define ACPI_FUJITSU_LAPTOP_DEVICE_NAME	"Fujitsu FUJ02E3"



#define ACPI_FUJITSU_NOTIFY_CODE1     0x80

#define ACPI_FUJITSU_NOTIFY_CODE	0x80



/* FUNC interface - command values */

#define FUNC_FLAGS	0x1000

#define FUNC_LEDS	0x1001

#define FUNC_BUTTONS	0x1002

#define FUNC_BACKLIGHT  0x1004

#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 0x80000000

#define UNSUPPORTED_CMD			BIT(31)



/* FUNC interface - status flags */

#define FLAG_RFKILL	0x020

#define FLAG_LID	0x100

#define FLAG_DOCK	0x200

#define FLAG_RFKILL			BIT(5)

#define FLAG_LID			BIT(8)

#define FLAG_DOCK			BIT(9)



/* FUNC interface - LED control */

#define FUNC_LED_OFF	0x1

#define FUNC_LED_ON	0x30001

#define KEYBOARD_LAMPS	0x100

#define LOGOLAMP_POWERON 0x2000

#define LOGOLAMP_ALWAYS  0x4000

#define RADIO_LED_ON	0x20

#define ECO_LED	0x10000

#define ECO_LED_ON	0x80000

#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 RADIO_LED_ON			BIT(5)

#define ECO_LED				BIT(16)

#define ECO_LED_ON			BIT(19)



/* FUNC interface - backlight power control */

#define BACKLIGHT_PARAM_POWER	0x4

#define BACKLIGHT_OFF	0x3

#define BACKLIGHT_ON	0x0

#define BACKLIGHT_PARAM_POWER		BIT(2)

#define BACKLIGHT_OFF			(BIT(0) | BIT(1))

#define BACKLIGHT_ON			0



/* Hotkey details */

#define KEY1_CODE	0x410	/* codes for the keys in the GIRB register */

/* Scancodes read from the GIRB register */

#define KEY1_CODE			0x410

#define KEY2_CODE			0x411

#define KEY3_CODE			0x412

#define KEY4_CODE			0x413

#define KEY5_CODE			0x420



/* Hotkey ringbuffer limits */

#define MAX_HOTKEY_RINGBUFFER_SIZE	100

#define RINGBUFFERSIZE			40
@@ -428,7 +430,7 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) 
	struct fujitsu_bl *priv = acpi_driver_data(device);

	int oldb, newb;



	if (event != ACPI_FUJITSU_NOTIFY_CODE1) {

	if (event != ACPI_FUJITSU_NOTIFY_CODE) {

		acpi_handle_info(device->handle, "unsupported event [0x%x]\n",

				 event);

		sparse_keymap_report_event(priv->input, -1, 1, true);
@@ -902,7 +904,7 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) 
	int scancode, i = 0;

	unsigned int irb;



	if (event != ACPI_FUJITSU_NOTIFY_CODE1) {

	if (event != ACPI_FUJITSU_NOTIFY_CODE) {

		acpi_handle_info(device->handle, "Unsupported event [0x%x]\n",

				 event);

		sparse_keymap_report_event(priv->input, -1, 1, true);