From: Gwendal Grignou <gwendal@chromium.org>
To: briannorris@chromium.org, jic23@kernel.org, knaack.h@gmx.de,
lars@metafoo.de, pmeerw@pmeerw.net, lee.jones@linaro.org,
bleung@chromium.org, enric.balletbo@collabora.com,
dianders@chromium.org, groeck@chromium.org,
fabien.lahoudere@collabora.com
Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
Gwendal Grignou <gwendal@chromium.org>
Subject: [PATCH v3 08/18] Revert "Input: cros_ec_keyb - add back missing mask for event_type"
Date: Sun, 27 Oct 2019 16:09:11 -0700 [thread overview]
Message-ID: <20191027230921.205251-9-gwendal@chromium.org> (raw)
In-Reply-To: <20191027230921.205251-1-gwendal@chromium.org>
This reverts commit 62c3801619e16b68a37ea899b76572145dfe41c9.
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>
---
No changes in v3.
New to v2.
drivers/input/keyboard/cros_ec_keyb.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 8d4d9786cc745..a29e81fdf1861 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -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;
--
2.23.0.866.gb869b98d4c-goog
next prev parent reply other threads:[~2019-10-27 23:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 23:09 [PATCH v3 00/18] cros_ec: Add sensorhub driver and FIFO processing Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 01/18] platform: chrome: Put docs with the code Gwendal Grignou
2019-11-03 12:34 ` Jonathan Cameron
2019-10-27 23:09 ` [PATCH v3 02/18] mfd: cros_ec: Add sensor_count and make check_features public Gwendal Grignou
2019-11-03 12:37 ` Jonathan Cameron
2019-10-27 23:09 ` [PATCH v3 03/18] platform: cros_ec: Add cros_ec_sensor_hub driver Gwendal Grignou
2019-11-03 12:45 ` Jonathan Cameron
2019-10-27 23:09 ` [PATCH v3 04/18] platform/mfd:iio: cros_ec: Register sensor through sensorhub Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 05/18] platform: chrome: cros-ec: record event timestamp in the hard irq Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 06/18] platform: chrome: cros_ec: Do not attempt to register a non-positive IRQ number Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 07/18] platform: chrome: cros_ec: handle MKBP more events flag Gwendal Grignou
2019-10-27 23:09 ` Gwendal Grignou [this message]
2019-10-27 23:09 ` [PATCH v3 09/18] Revert "Input: cros_ec_keyb: mask out extra flags in event_type" Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 10/18] platform: chrome: sensorhub: Add FIFO support Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 11/18] platform: chrome: sensorhub: Add code to spread timestmap Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 12/18] platform: chrome: sensorhub: Add median filter Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 13/18] iio: cros_ec: Move function description to .c file Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 14/18] iio: cros_ec: Register to cros_ec_sensorhub when EC supports FIFO Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 15/18] iio: cros_ec: Remove pm function Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 16/18] iio: cros_ec: Expose hwfifo_timeout Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 17/18] iio: cros_ec: Report hwfifo_watermark_max Gwendal Grignou
2019-10-27 23:09 ` [PATCH v3 18/18] iio: cros_ec: Use Hertz as unit for sampling frequency Gwendal Grignou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191027230921.205251-9-gwendal@chromium.org \
--to=gwendal@chromium.org \
--cc=bleung@chromium.org \
--cc=briannorris@chromium.org \
--cc=dianders@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=fabien.lahoudere@collabora.com \
--cc=groeck@chromium.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).