From: Dmitry Torokhov <dmitry.torokhov@gmail.com> To: Ravi Chandra Sadineni <ravisadineni@chromium.org> Cc: ravisadineni@google.com, dtor@google.com, tbroch@google.com, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: Re: [PATCH] Input: cros_ec_keyb: Remove check before calling pm_wakeup_event. Date: Tue, 12 Jun 2018 16:32:16 -0700 [thread overview] Message-ID: <20180612233216.GG38773@dtor-ws> (raw) In-Reply-To: <20180605224458.62692-1-ravisadineni@chromium.org> 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 <ravisadineni@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
next prev parent reply other threads:[~2018-06-12 23:32 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-05 22:44 Ravi Chandra Sadineni 2018-06-12 23:32 ` Dmitry Torokhov [this message] [not found] ` <CGME20180803072628eucas1p26abe0cb121b974401759502f8807bb96@eucas1p2.samsung.com> 2018-08-03 7:26 ` Marek Szyprowski [not found] ` <CAEZbON7qLheHFuU6zwArCz=CG03JvnFjcehBGjE4RqROYrMLhQ@mail.gmail.com> 2018-08-03 16:07 ` Dmitry Torokhov [not found] ` <CAEZbON4O0X8Fo6eAbmPOSiB1_Tw7x+Ox3ROoGfZQn72uQGQLkg@mail.gmail.com> 2018-08-06 5:29 ` Marek Szyprowski 2018-08-06 6:16 ` Dmitry Torokhov 2018-08-06 7:15 ` Marek Szyprowski 2018-08-06 23:05 ` Ravi Chandra Sadineni 2018-08-07 21:59 ` Ravi Chandra Sadineni 2018-08-08 5:03 ` Marek Szyprowski [not found] ` <85a59afc-9dc0-b9fb-7e8f-32731337884c@samsung.com> 2018-08-10 8:23 ` Marek Szyprowski 2018-08-17 21:21 ` RaviChandra Sadineni 2018-08-20 8:52 ` Marek Szyprowski
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=20180612233216.GG38773@dtor-ws \ --to=dmitry.torokhov@gmail.com \ --cc=dtor@google.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ravisadineni@chromium.org \ --cc=ravisadineni@google.com \ --cc=tbroch@google.com \ --subject='Re: [PATCH] Input: cros_ec_keyb: Remove check before calling pm_wakeup_event.' \ /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
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).