aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-16 10:27:57 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-18 19:11:30 -0400
commit8b9e6b70a14aa52f9de95e8e0fac543a8ae1a1c3 (patch)
treedccc5d63c0cea1b22ff983d645bc3f42e14e1d34
parent86ac056a30ef6af933c33f096c8275dc4977244c (diff)
asus-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>
-rw-r--r--drivers/platform/x86/asus-laptop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 46b274693872..58d29c4f2840 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -54,6 +54,7 @@
54#include <linux/slab.h> 54#include <linux/slab.h>
55#include <linux/dmi.h> 55#include <linux/dmi.h>
56#include <linux/acpi.h> 56#include <linux/acpi.h>
57#include <acpi/video.h>
57 58
58#define ASUS_LAPTOP_VERSION "0.42" 59#define ASUS_LAPTOP_VERSION "0.42"
59 60
@@ -1884,12 +1885,11 @@ static int asus_acpi_add(struct acpi_device *device)
1884 if (result) 1885 if (result)
1885 goto fail_platform; 1886 goto fail_platform;
1886 1887
1887 if (!acpi_video_backlight_support()) { 1888 if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {
1888 result = asus_backlight_init(asus); 1889 result = asus_backlight_init(asus);
1889 if (result) 1890 if (result)
1890 goto fail_backlight; 1891 goto fail_backlight;
1891 } else 1892 }
1892 pr_info("Backlight controlled by ACPI video driver\n");
1893 1893
1894 result = asus_input_init(asus); 1894 result = asus_input_init(asus);
1895 if (result) 1895 if (result)