On Wed, Jun 10, 2015, at 10:01, Hans de Goede wrote: > Port the backlight selection logic to the new backlight interface > selection API. > > Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> Acked-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx> > --- > drivers/platform/x86/thinkpad_acpi.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c > b/drivers/platform/x86/thinkpad_acpi.c > index 28f3281..33e488c 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -83,6 +83,7 @@ > #include <sound/control.h> > #include <sound/initval.h> > #include <asm/uaccess.h> > +#include <acpi/video.h> > > /* ThinkPad CMOS commands */ > #define TP_CMOS_VOLUME_DOWN 0 > @@ -3487,7 +3488,7 @@ static int __init hotkey_init(struct > ibm_init_struct *iibm) > /* Do not issue duplicate brightness change events to > * userspace. tpacpi_detect_brightness_capabilities() must have > * been called before this point */ > - if (acpi_video_backlight_support()) { > + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) { > pr_info("This ThinkPad has standard ACPI backlight " > "brightness control, supported by the ACPI " > "video driver\n"); > @@ -6491,7 +6492,7 @@ static int __init brightness_init(struct > ibm_init_struct *iibm) > return 1; > } > > - if (acpi_video_backlight_support()) { > + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) { > if (brightness_enable > 1) { > pr_info("Standard ACPI backlight interface " > "available, not loading native one\n"); > -- > 2.4.2 -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh ------------------------------------------------------------------------------ _______________________________________________ ibm-acpi-devel mailing list ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel