Commit 1c3fdf12 authored by Darren Hart (VMware)'s avatar Darren Hart (VMware)
Browse files

platform/x86: intel-vbtn: Simplify autorelease logic 



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: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Reviewed-by: default avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
Tested-by: default avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
Cc: AceLan Kao <acelan.kao@canonical.com>
parent 9678d0ef

drivers/platform/x86/intel-vbtn.c

+13 −12
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context) 
{

	struct platform_device *device = context;

	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;

	bool autorelease;
@@ -88,20 +89,20 @@ static void notify_handler(acpi_handle handle, u32 event, void *context) 
			pm_wakeup_hard_event(&device->dev);

			return;

		}

	} else {

		/* Use the fact press/release come in even/odd pairs */

		if ((event & 1) && sparse_keymap_report_event(priv->input_dev,

							      event, 0, false))

			return;

		goto out_unknown;

	}



		ke_rel = sparse_keymap_entry_from_scancode(priv->input_dev,

							   event | 1);

		autorelease = !ke_rel || ke_rel->type == KE_IGNORE;

	/*

	 * 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, 1,

					       autorelease))

	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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE