diff options
author | Hans de Goede <hdegoede@redhat.com> | 2015-06-16 10:28:06 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-18 19:12:16 -0400 |
commit | 2cc6c717799f0ab3e8309fa9e43757f0c1906f14 (patch) | |
tree | a675074af49294ac6d7e6c2dd0d3b8a269da08e1 | |
parent | 76d0a35100b932fc8b6e006ce5697ad88028c0c3 (diff) |
msi-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/msi-laptop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 085987730aab..42317704629d 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c | |||
@@ -64,6 +64,7 @@ | |||
64 | #include <linux/i8042.h> | 64 | #include <linux/i8042.h> |
65 | #include <linux/input.h> | 65 | #include <linux/input.h> |
66 | #include <linux/input/sparse-keymap.h> | 66 | #include <linux/input/sparse-keymap.h> |
67 | #include <acpi/video.h> | ||
67 | 68 | ||
68 | #define MSI_DRIVER_VERSION "0.5" | 69 | #define MSI_DRIVER_VERSION "0.5" |
69 | 70 | ||
@@ -1069,9 +1070,8 @@ static int __init msi_init(void) | |||
1069 | 1070 | ||
1070 | /* Register backlight stuff */ | 1071 | /* Register backlight stuff */ |
1071 | 1072 | ||
1072 | if (!quirks->old_ec_model || acpi_video_backlight_support()) { | 1073 | if (quirks->old_ec_model || |
1073 | pr_info("Brightness ignored, must be controlled by ACPI video driver\n"); | 1074 | acpi_video_get_backlight_type() == acpi_backlight_vendor) { |
1074 | } else { | ||
1075 | struct backlight_properties props; | 1075 | struct backlight_properties props; |
1076 | memset(&props, 0, sizeof(struct backlight_properties)); | 1076 | memset(&props, 0, sizeof(struct backlight_properties)); |
1077 | props.type = BACKLIGHT_PLATFORM; | 1077 | props.type = BACKLIGHT_PLATFORM; |