Hi Nick,
On Thu, Dec 27, 2018 at 6:17 PM Nikolai Kondrashov <spbnick@xxxxxxxxx> wrote:
>
> Add "_UCLOGIC" to Ugee tablet device ID macros so it's clear they come
> with UC-Logic vendor ID.
Patch looks good, but while you have users to test it, could you also
drop the hid_have_special_driver[] hunk?
Cheers,
Benjamin
>
> Signed-off-by: Nikolai Kondrashov <spbnick@xxxxxxxxx>
> ---
> drivers/hid/hid-ids.h | 4 ++--
> drivers/hid/hid-quirks.c | 4 ++--
> drivers/hid/hid-uclogic.c | 8 ++++----
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 19f62c187e9c..63cc7a2acaab 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -1129,8 +1129,8 @@
> #define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850 0x0522
> #define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 0x0781
> #define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 0x3031
> -#define USB_DEVICE_ID_UGEE_TABLET_81 0x0081
> -#define USB_DEVICE_ID_UGEE_TABLET_45 0x0045
> +#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81 0x0081
> +#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45 0x0045
> #define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d
>
> #define USB_VENDOR_ID_UGEE 0x28bd
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 9641a556822c..f473a3b3cd79 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -686,8 +686,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) },
> diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
> index 56b196d60041..fdc4d1ea7049 100644
> --- a/drivers/hid/hid-uclogic.c
> +++ b/drivers/hid/hid-uclogic.c
> @@ -957,9 +957,9 @@ static int uclogic_probe(struct hid_device *hdev,
> switch (id->product) {
> case USB_DEVICE_ID_HUION_TABLET:
> case USB_DEVICE_ID_YIYNOVA_TABLET:
> - case USB_DEVICE_ID_UGEE_TABLET_81:
> + case USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81:
> case USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3:
> - case USB_DEVICE_ID_UGEE_TABLET_45:
> + case USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45:
> /* If this is the pen interface */
> if (intf->cur_altsetting->desc.bInterfaceNumber == 0) {
> rc = uclogic_tablet_enable(hdev);
> @@ -1065,8 +1065,8 @@ 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_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) },
> --
> 2.19.2
>
