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

Commit 88ba6cae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.10-3' of... 

Merge tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Just two small fixes for platform drivers x86:

   - use brightness_set_blocking for LED-setting callbacks on Fujitsu
     laptops

   - fix surface3_button build errors"

* tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  platform/x86: fujitsu-laptop: use brightness_set_blocking for LED-setting callbacks
  platform/x86: fix surface3_button build errors
parents 6989606a a608a9d5

drivers/platform/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ config SURFACE_PRO3_BUTTON 


config SURFACE_3_BUTTON

	tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"

	depends on ACPI && KEYBOARD_GPIO

	depends on ACPI && KEYBOARD_GPIO && I2C

	---help---

	  This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.

drivers/platform/x86/fujitsu-laptop.c

+21 −21
Original line number Diff line number Diff line
@@ -177,43 +177,43 @@ static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event); 


#if IS_ENABLED(CONFIG_LEDS_CLASS)

static enum led_brightness logolamp_get(struct led_classdev *cdev);

static void logolamp_set(struct led_classdev *cdev,

static int logolamp_set(struct led_classdev *cdev,

			       enum led_brightness brightness);



static struct led_classdev logolamp_led = {

 .name = "fujitsu::logolamp",

 .brightness_get = logolamp_get,

 .brightness_set = logolamp_set

 .brightness_set_blocking = logolamp_set

};



static enum led_brightness kblamps_get(struct led_classdev *cdev);

static void kblamps_set(struct led_classdev *cdev,

static int kblamps_set(struct led_classdev *cdev,

			       enum led_brightness brightness);



static struct led_classdev kblamps_led = {

 .name = "fujitsu::kblamps",

 .brightness_get = kblamps_get,

 .brightness_set = kblamps_set

 .brightness_set_blocking = kblamps_set

};



static enum led_brightness radio_led_get(struct led_classdev *cdev);

static void radio_led_set(struct led_classdev *cdev,

static int radio_led_set(struct led_classdev *cdev,

			       enum led_brightness brightness);



static struct led_classdev radio_led = {

 .name = "fujitsu::radio_led",

 .brightness_get = radio_led_get,

 .brightness_set = radio_led_set

 .brightness_set_blocking = radio_led_set

};



static enum led_brightness eco_led_get(struct led_classdev *cdev);

static void eco_led_set(struct led_classdev *cdev,

static int eco_led_set(struct led_classdev *cdev,

			       enum led_brightness brightness);



static struct led_classdev eco_led = {

 .name = "fujitsu::eco_led",

 .brightness_get = eco_led_get,

 .brightness_set = eco_led_set

 .brightness_set_blocking = eco_led_set

};

#endif
@@ -267,48 +267,48 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2) 
#if IS_ENABLED(CONFIG_LEDS_CLASS)

/* LED class callbacks */



static void logolamp_set(struct led_classdev *cdev,

static int logolamp_set(struct led_classdev *cdev,

			       enum led_brightness brightness)

{

	if (brightness >= LED_FULL) {

		call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);

		call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);

		return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);

	} else if (brightness >= LED_HALF) {

		call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);

		call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);

		return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);

	} else {

		call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);

		return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);

	}

}



static void kblamps_set(struct led_classdev *cdev,

static int kblamps_set(struct led_classdev *cdev,

			       enum led_brightness brightness)

{

	if (brightness >= LED_FULL)

		call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_ON);

		return call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_ON);

	else

		call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_OFF);

		return call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_OFF);

}



static void radio_led_set(struct led_classdev *cdev,

static int radio_led_set(struct led_classdev *cdev,

				enum led_brightness brightness)

{

	if (brightness >= LED_FULL)

		call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, RADIO_LED_ON);

		return call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, RADIO_LED_ON);

	else

		call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, 0x0);

		return call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, 0x0);

}



static void eco_led_set(struct led_classdev *cdev,

static int eco_led_set(struct led_classdev *cdev,

				enum led_brightness brightness)

{

	int curr;



	curr = call_fext_func(FUNC_LEDS, 0x2, ECO_LED, 0x0);

	if (brightness >= LED_FULL)

		call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr | ECO_LED_ON);

		return call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr | ECO_LED_ON);

	else

		call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr & ~ECO_LED_ON);

		return call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr & ~ECO_LED_ON);

}



static enum led_brightness logolamp_get(struct led_classdev *cdev)