Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 17:43:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

asus-wmi: minor cleanups

Browse Source 
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Corentin Chary 2011-02-26 10:20:32 +01:00 committed by Matthew Garrett
parent e12e6d94db
commit 57ab7dae27
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/platform/x86/asus-wmi.c
View File

@ -2,7 +2,7 @@
* Asus PC WMI hotkey driver * Asus PC WMI hotkey driver
* *
* Copyright(C) 2010 Intel Corporation. * Copyright(C) 2010 Intel Corporation.
* Copyright(C) 2010 Corentin Chary <corentin.chary@gmail.com> * Copyright(C) 2010-2011 Corentin Chary <corentin.chary@gmail.com>
* *
* Portions based on wistron_btns.c: * Portions based on wistron_btns.c:
* Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz> * Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz>
@ -87,7 +87,7 @@ MODULE_LICENSE("GPL");
#define ASUS_WMI_DEVID_CARDREADER 0x00080013 #define ASUS_WMI_DEVID_CARDREADER 0x00080013
/* Input */ /* Input */
#define ASUS_WMI_DEVID_TOUCHPAD 0x00100011 #define ASUS_WMI_DEVID_TOUCHPAD 0x00100011
#define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012 #define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012
/* DSTS masks */ /* DSTS masks */
@ -903,25 +903,25 @@ static void asus_wmi_notify(u32 value, void *context)
obj = (union acpi_object *)response.pointer; obj = (union acpi_object *)response.pointer;
if (obj && obj->type == ACPI_TYPE_INTEGER) { if (!obj || obj->type != ACPI_TYPE_INTEGER)
code = obj->integer.value; goto exit;
orig_code = code;
if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) code = obj->integer.value;
code = NOTIFY_BRNUP_MIN; orig_code = code;
else if (code >= NOTIFY_BRNDOWN_MIN &&
code <= NOTIFY_BRNDOWN_MAX)
code = NOTIFY_BRNDOWN_MIN;
if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) { if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
if (!acpi_video_backlight_support()) code = NOTIFY_BRNUP_MIN;
asus_wmi_backlight_notify(asus, orig_code); else if (code >= NOTIFY_BRNDOWN_MIN &&
} code <= NOTIFY_BRNDOWN_MAX)
code = NOTIFY_BRNDOWN_MIN;
if (!sparse_keymap_report_event(asus->inputdev, code, 1, true)) if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) {
pr_info("Unknown key %x pressed\n", code); if (!acpi_video_backlight_support())
} asus_wmi_backlight_notify(asus, orig_code);
} else if (!sparse_keymap_report_event(asus->inputdev, code, 1, true))
pr_info("Unknown key %x pressed\n", code);
exit:
kfree(obj); kfree(obj);
} }

2
drivers/platform/x86/eeepc-wmi.c
View File

@ -2,7 +2,7 @@
* Eee PC WMI hotkey driver * Eee PC WMI hotkey driver
* *
* Copyright(C) 2010 Intel Corporation. * Copyright(C) 2010 Intel Corporation.
* Copyright(C) 2010 Corentin Chary <corentin.chary@gmail.com> * Copyright(C) 2010-2011 Corentin Chary <corentin.chary@gmail.com>
* *
* Portions based on wistron_btns.c: * Portions based on wistron_btns.c:
* Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz> * Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz>