toshiba-acpi: Port to new backlight interface selection API

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Azael Avalos <coproscefalo@gmail.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 9956b9902bb4..59bf27ed72d6 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -2640,14 +2640,11 @@ static int toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
          */
         if (dev->tr_backlight_supported ||
             dmi_check_system(toshiba_vendor_backlight_dmi))
-                acpi_video_dmi_promote_vendor();
+                acpi_video_set_dmi_backlight_type(acpi_backlight_vendor);
 
-        if (acpi_video_backlight_support())
+        if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
                 return 0;
 
-        /* acpi-video may have loaded before we called dmi_promote_vendor() */
-        acpi_video_unregister_backlight();
-
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_PLATFORM;
         props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;