On Tue, Jun 05, 2018 at 03:44:57PM -0700, Ravi Chandra Sadineni wrote:
> Remove the unnecessary check before calling pm_wakeup_event. If the
> device is not wake enabled, this call is no-op anyway.
>
> Signed-off-by: Ravi Chandra Sadineni <ravisadin...@chromium.org>
Applied, thank you.
> ---
> drivers/input/keyboard/cros_ec_keyb.c | 30 ++++++++++-----------------
> 1 file changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/input/keyboard/cros_ec_keyb.c
> b/drivers/input/keyboard/cros_ec_keyb.c
> index 489ddd37bd4ee..c5e32544130dc 100644
> --- a/drivers/input/keyboard/cros_ec_keyb.c
> +++ b/drivers/input/keyboard/cros_ec_keyb.c
> @@ -242,19 +242,17 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
> u32 val;
> unsigned int ev_type;
>
> + /*
> + * If not wake enabled, discard key state changes during
> + * suspend. Switches will be re-checked in
> + * cros_ec_keyb_resume() to be sure nothing is lost.
> + */
> + if (queued_during_suspend && !device_may_wakeup(ckdev->dev))
> + return NOTIFY_OK;
> +
> switch (ckdev->ec->event_data.event_type) {
> case EC_MKBP_EVENT_KEY_MATRIX:
> - if (device_may_wakeup(ckdev->dev)) {
> - pm_wakeup_event(ckdev->dev, 0);
> - } else {
> - /*
> - * If keyboard is not wake enabled, discard key state
> - * changes during suspend. Switches will be re-checked
> - * in cros_ec_keyb_resume() to be sure nothing is lost.
> - */
> - if (queued_during_suspend)
> - return NOTIFY_OK;
> - }
> + pm_wakeup_event(ckdev->dev, 0);
>
> if (ckdev->ec->event_size != ckdev->cols) {
> dev_err(ckdev->dev,
> @@ -268,10 +266,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
> break;
>
> case EC_MKBP_EVENT_SYSRQ:
> - if (device_may_wakeup(ckdev->dev))
> - pm_wakeup_event(ckdev->dev, 0);
> - else if (queued_during_suspend)
> - return NOTIFY_OK;
> + pm_wakeup_event(ckdev->dev, 0);
>
> val = get_unaligned_le32(&ckdev->ec->event_data.data.sysrq);
> dev_dbg(ckdev->dev, "sysrq code from EC: %#x\n", val);
> @@ -280,10 +275,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
>
> case EC_MKBP_EVENT_BUTTON:
> case EC_MKBP_EVENT_SWITCH:
> - if (device_may_wakeup(ckdev->dev))
> - pm_wakeup_event(ckdev->dev, 0);
> - else if (queued_during_suspend)
> - return NOTIFY_OK;
> + pm_wakeup_event(ckdev->dev, 0);
>
> if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) {
> val = get_unaligned_le32(
> --
> 2.18.0.rc1.242.g61856ae69a-goog
>
--
Dmitry
