diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-27 22:48:04 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-27 22:48:04 +0300 |
| commit | 70f0ba9f2435c1f8693a6d958d8f9cf95e80d94e (patch) | |
| tree | 1d65c007c7b32c9a956d65c6f349c6f59ad525b7 /drivers/platform/surface/surface_gpe.c | |
| parent | cd07e536b0201fceffd90a701bfb1e1fc07fcd34 (diff) | |
| parent | 76c057c84d286140c6c416c3b4ba832cd1d8984e (diff) | |
| download | linux-70f0ba9f2435c1f8693a6d958d8f9cf95e80d94e.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/platform/surface/surface_gpe.c')
| -rw-r--r-- | drivers/platform/surface/surface_gpe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c index e49e5d6d5d4e..86f6991b1215 100644 --- a/drivers/platform/surface/surface_gpe.c +++ b/drivers/platform/surface/surface_gpe.c @@ -181,12 +181,12 @@ static int surface_lid_enable_wakeup(struct device *dev, bool enable) return 0; } -static int surface_gpe_suspend(struct device *dev) +static int __maybe_unused surface_gpe_suspend(struct device *dev) { return surface_lid_enable_wakeup(dev, true); } -static int surface_gpe_resume(struct device *dev) +static int __maybe_unused surface_gpe_resume(struct device *dev) { return surface_lid_enable_wakeup(dev, false); } |