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

Commit b33c6ce5 authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

thinkpad-acpi: Port to new backlight interface selection API 



Port the backlight selection logic to the new backlight interface
selection API.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: default avatarDarren Hart <dvhart@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 56d5c34a

drivers/platform/x86/thinkpad_acpi.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ 
#include <sound/control.h>

#include <sound/control.h>

#include <sound/initval.h>

#include <sound/initval.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <acpi/video.h>





/* ThinkPad CMOS commands */

/* ThinkPad CMOS commands */

#define TP_CMOS_VOLUME_DOWN	0

#define TP_CMOS_VOLUME_DOWN	0
@@ -3487,7 +3488,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
	/* Do not issue duplicate brightness change events to

	/* Do not issue duplicate brightness change events to

	 * userspace. tpacpi_detect_brightness_capabilities() must have

	 * userspace. tpacpi_detect_brightness_capabilities() must have

	 * been called before this point  */

	 * been called before this point  */

	if (acpi_video_backlight_support()) {

	if (acpi_video_get_backlight_type() != acpi_backlight_vendor) {

		pr_info("This ThinkPad has standard ACPI backlight "

		pr_info("This ThinkPad has standard ACPI backlight "

			"brightness control, supported by the ACPI "

			"brightness control, supported by the ACPI "

			"video driver\n");

			"video driver\n");
@@ -6491,7 +6492,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm) 
		return 1;

		return 1;

	}

	}





	if (acpi_video_backlight_support()) {

	if (acpi_video_get_backlight_type() != acpi_backlight_vendor) {

		if (brightness_enable > 1) {

		if (brightness_enable > 1) {

			pr_info("Standard ACPI backlight interface "

			pr_info("Standard ACPI backlight interface "

				"available, not loading native one\n");

				"available, not loading native one\n");