Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

platform/x86: intel-vbtn: Simplify autorelease logic

Browse Source 
The new notify_handler logic determining if autorelease should be used or
not is a bit awkward, and can result in more than one call to
sparse_keymap_report_event for the same event (scancode). The nesting
and long lines also made it difficult to read.

Simplify the logic by eliminating a level of nesting with a goto and
always calculate autorelease and val so we can make a single call to
sparse_keymap_report_event.

Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Reviewed-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Tested-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Cc: AceLan Kao <acelan.kao@canonical.com>
This commit is contained in:
Darren Hart (VMware) 2017-12-08 14:57:54 -08:00
parent 9678d0ef77
commit 1c3fdf125e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/platform/x86/intel-vbtn.c
View File

@ -80,6 +80,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
{ {
struct platform_device *device = context; struct platform_device *device = context;
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev); struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
unsigned int val = !(event & 1); /* Even=press, Odd=release */
const struct key_entry *ke_rel; const struct key_entry *ke_rel;
bool autorelease; bool autorelease;
@ -88,20 +89,20 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
pm_wakeup_hard_event(&device->dev); pm_wakeup_hard_event(&device->dev);
return; return;
} }
} else { goto out_unknown;
/* Use the fact press/release come in even/odd pairs */
if ((event & 1) && sparse_keymap_report_event(priv->input_dev,
event, 0, false))
return;
ke_rel = sparse_keymap_entry_from_scancode(priv->input_dev,
event | 1);
autorelease = !ke_rel || ke_rel->type == KE_IGNORE;
if (sparse_keymap_report_event(priv->input_dev, event, 1,
autorelease))
return;
} }
/*
* Even press events are autorelease if there is no corresponding odd
* release event, or if the odd event is KE_IGNORE.
*/
ke_rel = sparse_keymap_entry_from_scancode(priv->input_dev, event | 1);
autorelease = val && (!ke_rel || ke_rel->type == KE_IGNORE);
if (sparse_keymap_report_event(priv->input_dev, event, val, autorelease))
return;
out_unknown:
dev_dbg(&device->dev, "unknown event index 0x%x\n", event); dev_dbg(&device->dev, "unknown event index 0x%x\n", event);
} }