Revert "Input: cros_ec_keyb - add back missing mask for event_type" (3bcce2e8) · Commits · 戴 / test

This reverts commit . This patch is not needed anymore since we clear EC_MKBP_HAS_MORE_EVENTS flag before calling the notifiers in patch "9d9518f5b52a (platform: chrome: cros_ec: handle MKBP more events flag)" Signed-off-by:

Gwendal Grignou <gwendal@chromium.org> Acked-by:

Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by:

Enric Balletbo i Serra <enric.balletbo@collabora.com>

drivers/input/keyboard/cros_ec_keyb.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -226,8 +226,6 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
		{
		struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb,
		notifier);
		uint8_t mkbp_event_type = ckdev->ec->event_data.event_type &
		EC_MKBP_EVENT_TYPE_MASK;
		u32 val;
		unsigned int ev_type;

		@@ -239,7 +237,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
		if (queued_during_suspend && !device_may_wakeup(ckdev->dev))
		return NOTIFY_OK;

		switch (mkbp_event_type) {
		switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) {
		case EC_MKBP_EVENT_KEY_MATRIX:
		pm_wakeup_event(ckdev->dev, 0);

		@@ -266,7 +264,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
		case EC_MKBP_EVENT_SWITCH:
		pm_wakeup_event(ckdev->dev, 0);

		if (mkbp_event_type == EC_MKBP_EVENT_BUTTON) {
		if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) {
		val = get_unaligned_le32(
		&ckdev->ec->event_data.data.buttons);
		ev_type = EV_KEY;

Admin message