HID: uclogic: Rename Huion HS64 PID to Huion Tablet 2

Since the 006d Huion PID is used by multiple tablets (at least HS64 and
HS610), rename its constant to a more general
"USB_DEVICE_ID_HUION_TABLET2".

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 78bd3ddda442623e61651b6bea0987f05e79b680..cef51e93e220869649d871453626183a7916c01b 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -606,7 +606,7 @@
 
 #define USB_VENDOR_ID_HUION            0x256c
 #define USB_DEVICE_ID_HUION_TABLET     0x006e
-#define USB_DEVICE_ID_HUION_HS64       0x006d
+#define USB_DEVICE_ID_HUION_TABLET2    0x006d
 
 #define USB_VENDOR_ID_IBM                                      0x04b3
 #define USB_DEVICE_ID_IBM_SCROLLPOINT_III                      0x3100

diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index 823704bc02ef8aa7d60f3e9c378a260de8e45293..850c660ec2ab62a2a17e620ce875de56aaabce18 100644 (file)
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -376,7 +376,7 @@ static const struct hid_device_id uclogic_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_HUION,
                                USB_DEVICE_ID_HUION_TABLET) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HUION,
-                               USB_DEVICE_ID_HUION_HS64) },
+                               USB_DEVICE_ID_HUION_TABLET2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TRUST,
                                USB_DEVICE_ID_TRUST_PANORA_TABLET) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index 30e0f69ed5af9ff2dc3052ea4e08935420020e9d..98910d8dae92b854e074fa6d2614527ba22c3592 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -993,7 +993,7 @@ int uclogic_params_init(struct uclogic_params *params,
        case VID_PID(USB_VENDOR_ID_HUION,
                     USB_DEVICE_ID_HUION_TABLET):
        case VID_PID(USB_VENDOR_ID_HUION,
-                    USB_DEVICE_ID_HUION_HS64):
+                    USB_DEVICE_ID_HUION_TABLET2):
        case VID_PID(USB_VENDOR_ID_UCLOGIC,
                     USB_DEVICE_ID_HUION_TABLET):
        case VID_PID(USB_VENDOR_ID_UCLOGIC,