openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hans de Goede 2015-06-16 16:28:08 +02:00 committed by Rafael J. Wysocki
parent 33a4edfba6
commit 6c072299b6
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/platform/x86/samsung-laptop.c
View File

@ -1720,27 +1720,14 @@ static int __init samsung_init(void)
samsung->handle_backlight = true; samsung->handle_backlight = true;
samsung->quirks = quirks; samsung->quirks = quirks;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
if (samsung->quirks->broken_acpi_video) if (samsung->quirks->broken_acpi_video)
acpi_video_dmi_promote_vendor(); acpi_video_set_dmi_backlight_type(acpi_backlight_vendor);
if (samsung->quirks->use_native_backlight)
acpi_video_set_dmi_backlight_type(acpi_backlight_native);
/* Don't handle backlight here if the acpi video already handle it */ if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
if (acpi_video_backlight_support()) {
samsung->handle_backlight = false; samsung->handle_backlight = false;
} else if (samsung->quirks->broken_acpi_video) {
pr_info("Disabling ACPI video driver\n");
acpi_video_unregister_backlight();
}
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 */
samsung->handle_backlight = false;
}
#endif #endif
ret = samsung_platform_init(samsung); ret = samsung_platform_init(samsung);
@ -1751,12 +1738,6 @@ static int __init samsung_init(void)
if (ret) if (ret)
goto error_sabi; 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); ret = samsung_sysfs_init(samsung);
if (ret) if (ret)
goto error_sysfs; goto error_sysfs;