2022-10-24 12:03:13

by Akihiko Odaki

[permalink] [raw]
Subject: [PATCH 17/22] platform/x86: thinkpad_acpi: Use acpi_video_get_backlight_types()

acpi_video_get_backlight_type() is now deprecated.

Signed-off-by: Akihiko Odaki <[email protected]>
---
drivers/platform/x86/thinkpad_acpi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 6a823b850a77..d756d2ce54d1 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3547,7 +3547,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
/* Do not issue duplicate brightness change events to
* userspace. tpacpi_detect_brightness_capabilities() must have
* been called before this point */
- if (acpi_video_get_backlight_type() != acpi_backlight_vendor) {
+ if (!(acpi_video_get_backlight_types() & ACPI_BACKLIGHT_VENDOR)) {
pr_info("This ThinkPad has standard ACPI backlight brightness control, supported by the ACPI video driver\n");
pr_notice("Disabling thinkpad-acpi brightness events by default...\n");

@@ -6983,7 +6983,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
return -ENODEV;
}

- if (acpi_video_get_backlight_type() != acpi_backlight_vendor) {
+ if (!(acpi_video_get_backlight_types() & ACPI_BACKLIGHT_VENDOR)) {
if (brightness_enable > 1) {
pr_info("Standard ACPI backlight interface available, not loading native one\n");
return -ENODEV;
--
2.37.3