samsung-laptop: Port to new backlight interface selection API

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

This commit also removes various obsolete pr_xxx messages related to
backlight interface selection. These are obsolete because they assume
there is only a vendor or acpi backlight driver and no other choice.
Also they are not necessary, if the user wants to know which backlight
interfaces are registered a simple "ls /sys/class/backlight" suffices.

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

1 files changed, 4 insertions, 23 deletions

diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 0df03e2c1e91..8c146e2b6727 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -1720,27 +1720,14 @@ static int __init samsung_init(void)
         samsung->handle_backlight = true;
         samsung->quirks = quirks;
 
-
 #ifdef CONFIG_ACPI
         if (samsung->quirks->broken_acpi_video)
-                acpi_video_dmi_promote_vendor();
-
-        /* Don't handle backlight here if the acpi video already handle it */
-        if (acpi_video_backlight_support()) {
-                samsung->handle_backlight = false;
-        } else if (samsung->quirks->broken_acpi_video) {
-                pr_info("Disabling ACPI video driver\n");
-                acpi_video_unregister_backlight();
-        }
+                acpi_video_set_dmi_backlight_type(acpi_backlight_vendor);
+        if (samsung->quirks->use_native_backlight)
+                acpi_video_set_dmi_backlight_type(acpi_backlight_native);
 
-        if (samsung->quirks->use_native_backlight) {
-                pr_info("Using native backlight driver\n");
-                /* Tell acpi-video to not handle the backlight */
-                acpi_video_dmi_promote_vendor();
-                acpi_video_unregister_backlight();
-                /* And also do not handle it ourselves */
+        if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
                 samsung->handle_backlight = false;
-        }
 #endif
 
         ret = samsung_platform_init(samsung);
@@ -1751,12 +1738,6 @@ static int __init samsung_init(void)
         if (ret)
                 goto error_sabi;
 
-#ifdef CONFIG_ACPI
-        /* Only log that if we are really on a sabi platform */
-        if (acpi_video_backlight_support())
-                pr_info("Backlight controlled by ACPI video driver\n");
-#endif
-
         ret = samsung_sysfs_init(samsung);
         if (ret)
                 goto error_sysfs;