On Tue, Dec 22, 2015 at 07:09:49PM +0100, Hans de Goede wrote:
+ Pali
> Use the new acpi_video_handles_brightness_key_presses function to check
> if we should report brightness key-presses.
>
> This makes the code both easier to read and makes it properly report
> key-presses when acpi-video is not reporting them for reasons other
> then the backlight type being vendor.
>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> drivers/platform/x86/dell-wmi.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
> index f2d77fe..cb8a9c2 100644
> --- a/drivers/platform/x86/dell-wmi.c
> +++ b/drivers/platform/x86/dell-wmi.c
> @@ -43,8 +43,6 @@ MODULE_LICENSE("GPL");
>
> #define DELL_EVENT_GUID "9DBB5994-A997-11DA-B012-B622A1EF5492"
>
> -static int acpi_video;
> -
> MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
>
> /*
> @@ -159,7 +157,8 @@ static void dell_wmi_process_key(int reported_key)
>
> /* Don't report brightness notifications that will also come via ACPI */
> if ((key->keycode == KEY_BRIGHTNESSUP ||
> - key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video)
> + key->keycode == KEY_BRIGHTNESSDOWN) &&
> + acpi_video_handles_brightness_key_presses())
> return;
>
> sparse_keymap_report_entry(dell_wmi_input_dev, key, 1, true);
> @@ -398,7 +397,6 @@ static int __init dell_wmi_init(void)
> }
>
> dmi_walk(find_hk_type, NULL);
> - acpi_video = acpi_video_get_backlight_type() != acpi_backlight_vendor;
>
> err = dell_wmi_input_setup();
> if (err)
> --
> 2.5.0
>
>
--
Darren Hart
Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
