HID: huion: Use "tablet" instead of specific model

Use word "tablet" in identifiers and comments instead of referring to specific
Huion tablet model name, as the product ID is used by at least several tablet
models.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 8ed66fd1ea87616416310884de0793d32ffabb6d..84ed7d4ba03d1149c649877829f44cd1ca9984d2 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1782,7 +1782,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

diff --git a/drivers/hid/hid-huion.c b/drivers/hid/hid-huion.c
index cbf4da4689ba7f8650d2b19264368e56abe80bf2..25d01cdd3bbcfa13776918e22ed90367357daf8f 100644 (file)
--- a/drivers/hid/hid-huion.c
+++ b/drivers/hid/hid-huion.c
@@ -2,6 +2,7 @@
  *  HID driver for Huion devices not fully compliant with HID standard
  *
  *  Copyright (c) 2013 Martin Rusko
+ *  Copyright (c) 2014 Nikolai Kondrashov
  */
 
 /*
@@ -19,11 +20,11 @@
 
 #include "hid-ids.h"
 
-/* Original Huion 580 report descriptor size */
-#define HUION_580_RDESC_ORIG_SIZE      177
+/* Original tablet report descriptor size */
+#define HUION_TABLET_RDESC_ORIG_SIZE   177
 
-/* Fixed Huion 580 report descriptor */
-static __u8 huion_580_rdesc_fixed[] = {
+/* Fixed tablet report descriptor */
+static __u8 huion_tablet_rdesc_fixed[] = {
        0x05, 0x0D,         /*  Usage Page (Digitizer),             */
        0x09, 0x02,         /*  Usage (Pen),                        */
        0xA1, 0x01,         /*  Collection (Application),           */
@@ -72,10 +73,10 @@ static __u8 *huion_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                unsigned int *rsize)
 {
        switch (hdev->product) {
-       case USB_DEVICE_ID_HUION_580:
-               if (*rsize == HUION_580_RDESC_ORIG_SIZE) {
-                       rdesc = huion_580_rdesc_fixed;
-                       *rsize = sizeof(huion_580_rdesc_fixed);
+       case USB_DEVICE_ID_HUION_TABLET:
+               if (*rsize == HUION_TABLET_RDESC_ORIG_SIZE) {
+                       rdesc = huion_tablet_rdesc_fixed;
+                       *rsize = sizeof(huion_tablet_rdesc_fixed);
                }
                break;
        }
@@ -108,11 +109,11 @@ static int huion_probe(struct hid_device *hdev, const struct hid_device_id *id)
        int ret;
        struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
 
-       /* Ignore interfaces 1 (mouse) and 2 (keyboard) for Huion 580 tablet,
+       /* Ignore interfaces 1 (mouse) and 2 (keyboard) for tablet,
         * as they are not used
         */
        switch (id->product) {
-       case USB_DEVICE_ID_HUION_580:
+       case USB_DEVICE_ID_HUION_TABLET:
                if (intf->cur_altsetting->desc.bInterfaceNumber != 0x00)
                        return -ENODEV;
                break;
@@ -131,7 +132,7 @@ static int huion_probe(struct hid_device *hdev, const struct hid_device_id *id)
        }
 
        switch (id->product) {
-       case USB_DEVICE_ID_HUION_580:
+       case USB_DEVICE_ID_HUION_TABLET:
                ret = huion_tablet_enable(hdev);
                if (ret) {
                        hid_err(hdev, "tablet enabling failed\n");
@@ -158,7 +159,7 @@ static int huion_raw_event(struct hid_device *hdev, struct hid_report *report,
 }
 
 static const struct hid_device_id huion_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, huion_devices);

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 48b66bbffc94bf7b7fe10b7228b1e26c12829ff6..fe2f163b2b0c0cc09bab4785bd079cbb725504b0 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -448,7 +448,7 @@
 #define USB_DEVICE_ID_UGCI_FIGHTING    0x0030
 
 #define USB_VENDOR_ID_HUION            0x256c
-#define USB_DEVICE_ID_HUION_580                0x006e
+#define USB_DEVICE_ID_HUION_TABLET     0x006e
 
 #define USB_VENDOR_ID_IDEACOM          0x1cb6
 #define USB_DEVICE_ID_IDEACOM_IDC6650  0x6650