diff mbox

intel-hid: support KEY_ROTATE_LOCK_TOGGLE

Message ID 1520987576-22037-1-git-send-email-alex.hung@canonical.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Alex Hung March 14, 2018, 12:32 a.m. UTC 
KEY_ROTATE_LOCK_TOGGLE is introduced in 4.16 rc1 and this key event is
emitted on Wacom MobileStudio Pro 13.

While here, clean up headers and sort headers alphabetically.

Signed-off-by: Alex Hung <alex.hung@canonical.com>
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
---
 drivers/platform/x86/intel-hid.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Comments

Andy Shevchenko March 15, 2018, 12:11 p.m. UTC | #1 
On Wed, Mar 14, 2018 at 2:32 AM, Alex Hung <alex.hung@canonical.com> wrote:
> KEY_ROTATE_LOCK_TOGGLE is introduced in 4.16 rc1 and this key event is
> emitted on Wacom MobileStudio Pro 13.
>

> While here, clean up headers and sort headers alphabetically.

No.
Please, split to two or more logically unified changes.
Thanks!

>
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
> ---
>  drivers/platform/x86/intel-hid.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
> index 5e3df194723e..b5adba227783 100644
> --- a/drivers/platform/x86/intel-hid.c
> +++ b/drivers/platform/x86/intel-hid.c
> @@ -16,16 +16,14 @@
>   *
>   */
>
> +#include <linux/acpi.h>
> +#include <linux/dmi.h>
> +#include <linux/input.h>
> +#include <linux/input/sparse-keymap.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> -#include <linux/init.h>
> -#include <linux/input.h>
>  #include <linux/platform_device.h>
> -#include <linux/input/sparse-keymap.h>
> -#include <linux/acpi.h>
>  #include <linux/suspend.h>
> -#include <acpi/acpi_bus.h>
> -#include <linux/dmi.h>
>
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Alex Hung");
> @@ -67,8 +65,8 @@ static const struct key_entry intel_array_keymap[] = {
>         { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } },                /* Release */
>         { KE_KEY,    0xC6, { KEY_VOLUMEDOWN } },              /* Press */
>         { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } },              /* Release */
> -       { KE_SW,     0xC8, { .sw = { SW_ROTATE_LOCK, 1 } } }, /* Press */
> -       { KE_SW,     0xC9, { .sw = { SW_ROTATE_LOCK, 0 } } }, /* Release */
> +       { KE_KEY,    0xC8, { KEY_ROTATE_LOCK_TOGGLE } },      /* Press */
> +       { KE_IGNORE, 0xC9, { KEY_ROTATE_LOCK_TOGGLE } },      /* Release */
>         { KE_KEY,    0xCE, { KEY_POWER } },                   /* Press */
>         { KE_IGNORE, 0xCF, { KEY_POWER } },                   /* Release */
>         { KE_END },
> --
> 2.16.2
>
diff mbox

Patch

diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index 5e3df194723e..b5adba227783 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -16,16 +16,14 @@ 
  *
  */
 
+#include <linux/acpi.h>
+#include <linux/dmi.h>
+#include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/input.h>
 #include <linux/platform_device.h>
-#include <linux/input/sparse-keymap.h>
-#include <linux/acpi.h>
 #include <linux/suspend.h>
-#include <acpi/acpi_bus.h>
-#include <linux/dmi.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alex Hung");
@@ -67,8 +65,8 @@  static const struct key_entry intel_array_keymap[] = {
 	{ KE_IGNORE, 0xC5, { KEY_VOLUMEUP } },                /* Release */
 	{ KE_KEY,    0xC6, { KEY_VOLUMEDOWN } },              /* Press */
 	{ KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } },              /* Release */
-	{ KE_SW,     0xC8, { .sw = { SW_ROTATE_LOCK, 1 } } }, /* Press */
-	{ KE_SW,     0xC9, { .sw = { SW_ROTATE_LOCK, 0 } } }, /* Release */
+	{ KE_KEY,    0xC8, { KEY_ROTATE_LOCK_TOGGLE } },      /* Press */
+	{ KE_IGNORE, 0xC9, { KEY_ROTATE_LOCK_TOGGLE } },      /* Release */
 	{ KE_KEY,    0xCE, { KEY_POWER } },                   /* Press */
 	{ KE_IGNORE, 0xCF, { KEY_POWER } },                   /* Release */
 	{ KE_END },