HID: wacom: Move WAC_CMD_* into wacom_wac.h

Centralize our definition of report IDs by moving those for device commands
into wacom_wac.h alongside those for input reports.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index e1aa51abac30..4dd7b80ffca4 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -16,15 +16,7 @@
 #include <linux/input/mt.h>
 
 #define WAC_MSG_RETRIES         5
-
-#define WAC_CMD_WL_LED_CONTROL  0x03
-#define WAC_CMD_LED_CONTROL     0x20
-#define WAC_CMD_ICON_START      0x21
-#define WAC_CMD_ICON_XFER       0x23
-#define WAC_CMD_ICON_BT_XFER    0x26
 #define WAC_CMD_RETRIES         10
-#define WAC_CMD_DELETE_PAIRING  0x20
-#define WAC_CMD_UNPAIR_ALL      0xFF
 
 #define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP)
 #define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP)
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index fb0e50acb10d..804fda3e192a 100644
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -72,6 +72,15 @@
 #define WACOM_REPORT_REMOTE             17
 #define WACOM_REPORT_INTUOSHT2_ID       8
 
+/* wacom command report ids */
+#define WAC_CMD_WL_LED_CONTROL          0x03
+#define WAC_CMD_LED_CONTROL             0x20
+#define WAC_CMD_ICON_START              0x21
+#define WAC_CMD_ICON_XFER               0x23
+#define WAC_CMD_ICON_BT_XFER            0x26
+#define WAC_CMD_DELETE_PAIRING          0x20
+#define WAC_CMD_UNPAIR_ALL              0xFF
+
 /* device quirks */
 #define WACOM_QUIRK_BBTOUCH_LOWRES      0x0001
 #define WACOM_QUIRK_SENSE               0x0002