diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-08 06:41:40 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 06:41:40 +0200 |
| commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
| tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /drivers/platform/x86/surfacepro3_button.c | |
| parent | Merge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/... (diff) | |
| parent | Linux 5.9-rc4 (diff) | |
| download | linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.xz linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip | |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/platform/x86/surfacepro3_button.c')
| -rw-r--r-- | drivers/platform/x86/surfacepro3_button.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c index ec515223f654..d8afed5db94c 100644 --- a/drivers/platform/x86/surfacepro3_button.c +++ b/drivers/platform/x86/surfacepro3_button.c @@ -84,28 +84,28 @@ static void surface_button_notify(struct acpi_device *device, u32 event) /* Power button press,release handle */ case SURFACE_BUTTON_NOTIFY_PRESS_POWER: pressed = true; - /*fall through*/ + fallthrough; case SURFACE_BUTTON_NOTIFY_RELEASE_POWER: key_code = KEY_POWER; break; /* Home button press,release handle */ case SURFACE_BUTTON_NOTIFY_PRESS_HOME: pressed = true; - /*fall through*/ + fallthrough; case SURFACE_BUTTON_NOTIFY_RELEASE_HOME: key_code = KEY_LEFTMETA; break; /* Volume up button press,release handle */ case SURFACE_BUTTON_NOTIFY_PRESS_VOLUME_UP: pressed = true; - /*fall through*/ + fallthrough; case SURFACE_BUTTON_NOTIFY_RELEASE_VOLUME_UP: key_code = KEY_VOLUMEUP; break; /* Volume down button press,release handle */ case SURFACE_BUTTON_NOTIFY_PRESS_VOLUME_DOWN: pressed = true; - /*fall through*/ + fallthrough; case SURFACE_BUTTON_NOTIFY_RELEASE_VOLUME_DOWN: key_code = KEY_VOLUMEDOWN; break; |