Re: [PATCH 2/3] Revert "Input: hyperv-keyboard - register as a wakeup source"

From: Dmitry Torokhov
Date: Fri Oct 04 2024 - 04:15:20 EST


On Tue, Sep 24, 2024 at 03:28:51AM +0000, Srivatsa S. Bhat wrote:
> [+linux-pm, Rafael, Len, Pavel]
>
> On Thu, Sep 12, 2024 at 02:27:49PM -0700, Erni Sri Satya Vennela wrote:
> > This reverts commit 62238f3aadc9bc56da70100e19ec61b9f8d72a5f.
> >
> > Remove keyboard as wakeup source since Suspend-to-Idle feature
> > is disabled.
> >
> > Signed-off-by: Erni Sri Satya Vennela <ernis@xxxxxxxxxxxxxxxxxxx>
> > ---
> > drivers/input/serio/hyperv-keyboard.c | 12 ------------
> > 1 file changed, 12 deletions(-)
> >
> > diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
> > index 31d9dacd2fd1..b42c546636bf 100644
> > --- a/drivers/input/serio/hyperv-keyboard.c
> > +++ b/drivers/input/serio/hyperv-keyboard.c
> > @@ -162,15 +162,6 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev,
> > serio_interrupt(kbd_dev->hv_serio, scan_code, 0);
> > }
> > spin_unlock_irqrestore(&kbd_dev->lock, flags);
> > -
> > - /*
> > - * Only trigger a wakeup on key down, otherwise
> > - * "echo freeze > /sys/power/state" can't really enter the
> > - * state because the Enter-UP can trigger a wakeup at once.
> > - */
> > - if (!(info & IS_BREAK))
> > - pm_wakeup_hard_event(&hv_dev->device);
> > -
> > break;
> >
> > default:
> > @@ -356,9 +347,6 @@ static int hv_kbd_probe(struct hv_device *hv_dev,
> > goto err_close_vmbus;
> >
> > serio_register_port(kbd_dev->hv_serio);
> > -
> > - device_init_wakeup(&hv_dev->device, true);

If you do not want the keyboard to be a wakeup source by default maybe
change this to:

device_set_wakeup_capable(&hv_dev->device, true);

and leave the rest of the driver alone?

Same for the HID change.

Thanks.

--
Dmitry