2019-11-05 22:29:35

by Gwendal Grignou

Subject: [PATCH v4 07/17] Revert "Input: cros_ec_keyb - add back missing mask for event_type"

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 <[email protected]>
---
No changes in v4, 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 8d4d9786cc74..a29e81fdf186 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.24.0.rc1.363.gb1bccd3e3d-goog

2019-11-11 09:21:14

by Enric Balletbo i Serra

Subject: Re: [PATCH v4 07/17] Revert "Input: cros_ec_keyb - add back missing mask for event_type"

Hi,

cc'in Dmitry and linux-input list which is missing

On 5/11/19 23:26, Gwendal Grignou wrote:
> 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 <[email protected]>
> ---
> No changes in v4, 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 8d4d9786cc74..a29e81fdf186 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;
>

2019-11-11 19:24:43

by Dmitry Torokhov

Subject: Re: [PATCH v4 07/17] Revert "Input: cros_ec_keyb - add back missing mask for event_type"

On Mon, Nov 11, 2019 at 10:20:05AM +0100, Enric Balletbo i Serra wrote:
> Hi,
>
> cc'in Dmitry and linux-input list which is missing

Acked-by: Dmitry Torokhov <[email protected]>

Enric, please use my @gmail address for upstream stuff. Thanks!

--
Dmitry