luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thinkpad-acpi: remove uneeded tp_features.hotkey tests in hotkey_exit

Browse Source 
hotkey_exit() is only called if hotkey_init() finished sucessfully, or
by direct calls inside hotkey_init().  The tp_features.hotkey test is
always true, and just adds to the confusion, remove it.  Also, avoid
calling hotkey_mask_set() when it won't do anything useful.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Henrique de Moraes Holschuh 2009-09-20 14:09:23 -03:00 committed by Len Brown
parent 435c47e20b
commit 4be73005e4
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/platform/x86/thinkpad_acpi.c
View File

@ -2843,16 +2843,14 @@ static void hotkey_exit(void)
kfree(hotkey_keycode_map); kfree(hotkey_keycode_map);
if (tp_features.hotkey) { dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY,
dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY, "restoring original hot key mask\n");
"restoring original hot key mask\n"); /* no short-circuit boolean operator below! */
/* no short-circuit boolean operator below! */ if (((tp_features.hotkey_mask && hotkey_mask_set(hotkey_orig_mask))
if ((hotkey_mask_set(hotkey_orig_mask) | | hotkey_status_set(false)) != 0)
hotkey_status_set(false)) != 0) printk(TPACPI_ERR
printk(TPACPI_ERR "failed to restore hot key mask "
"failed to restore hot key mask " "to BIOS defaults\n");
"to BIOS defaults\n");
}
} }
static void __init hotkey_unmap(const unsigned int scancode) static void __init hotkey_unmap(const unsigned int scancode)