diff options
| author |  Andrzej Pietrasiewicz <andrzej.p@collabora.com>
| 2020-10-04 21:16:07 -0700 |
|---|---|---|
| committer |  Dmitry Torokhov <dmitry.torokhov@gmail.com>
| 2020-12-02 22:10:33 -0800 |
| commit | d69f0a43c677e8afc67a222e1e7b51b9acc69cd3 (patch) | |
| tree | 1b03a8d3ed76cb507f344c85cd0d0c474e6b7fa3 /drivers/input/keyboard/spear-keyboard.c | |
| parent | Input: add input_device_enabled() (diff) | |
| download | linux-d69f0a43c677e8afc67a222e1e7b51b9acc69cd3.tar.gz linux-d69f0a43c677e8afc67a222e1e7b51b9acc69cd3.tar.bz2 linux-d69f0a43c677e8afc67a222e1e7b51b9acc69cd3.zip | |
Input: use input_device_enabled()
Use the newly added helper in relevant input drivers.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Link: https://lore.kernel.org/r/20200608112211.12125-3-andrzej.p@collabora.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/spear-keyboard.c')
| -rw-r--r-- | drivers/input/keyboard/spear-keyboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c index 9b8d78f87253..9838c79cb288 100644 --- a/drivers/input/keyboard/spear-keyboard.c +++ b/drivers/input/keyboard/spear-keyboard.c @@ -318,7 +318,7 @@ static int __maybe_unused spear_kbd_suspend(struct device *dev) writel_relaxed(val, kbd->io_base + MODE_CTL_REG); } else { - if (input_dev->users) { + if (input_device_enabled(input_dev)) { writel_relaxed(mode_ctl_reg & ~MODE_CTL_START_SCAN, kbd->io_base + MODE_CTL_REG); clk_disable(kbd->clk); @@ -326,7 +326,7 @@ static int __maybe_unused spear_kbd_suspend(struct device *dev) } /* store current configuration */ - if (input_dev->users) + if (input_device_enabled(input_dev)) kbd->mode_ctl_reg = mode_ctl_reg; /* restore previous clk state */ @@ -351,12 +351,12 @@ static int __maybe_unused spear_kbd_resume(struct device *dev) disable_irq_wake(kbd->irq); } } else { - if (input_dev->users) + if (input_device_enabled(input_dev)) clk_enable(kbd->clk); } /* restore current configuration */ - if (input_dev->users) + if (input_device_enabled(input_dev)) writel_relaxed(kbd->mode_ctl_reg, kbd->io_base + MODE_CTL_REG); mutex_unlock(&input_dev->mutex); |