uclogic: Say "touch ring" not "dial"

Change *_frame_dial* names to *_frame_touch_ring* in UC-Logic driver to
leave space for actual dial wheel found on Huion Q620M.

Author: spbnick

hid-uclogic-params.c

@@ -751,33 +751,36 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
 				goto cleanup;
 			}
 
-			/* Create v2 frame dial parameters */
+			/* Create v2 frame touch ring parameters */
 			rc = uclogic_params_frame_init_with_desc(
 					&p.frame_list[1],
-					uclogic_rdesc_v2_frame_dial_arr,
-					uclogic_rdesc_v2_frame_dial_size,
-					UCLOGIC_RDESC_V2_FRAME_DIAL_ID);
+					uclogic_rdesc_v2_frame_touch_ring_arr,
+					uclogic_rdesc_v2_frame_touch_ring_size,
+					UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID);
 			if (rc != 0) {
 				hid_err(hdev,
-					"failed creating v2 frame dial "
+					"failed creating v2 frame touch ring "
 					"parameters: %d\n",
 					rc);
 				goto cleanup;
 			}
 			p.frame_list[1].suffix = "Touch Ring";
 			p.frame_list[1].dev_id_byte =
-				UCLOGIC_RDESC_V2_FRAME_DIAL_DEV_ID_BYTE;
+				UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_DEV_ID_BYTE;
 			p.frame_list[1].touch_ring_byte = 5;
 			p.frame_list[1].touch_ring_max = 12;
 			p.frame_list[1].touch_ring_flip_at = 6;
 
-			/* Link button and dial subreports from pen reports */
+			/*
+			 * Link button and touch ring subreports from pen
+			 * reports
+			 */
 			p.pen.subreport_list[0].value = 0xe0;
 			p.pen.subreport_list[0].id =
 				UCLOGIC_RDESC_V2_FRAME_BUTTONS_ID;
 			p.pen.subreport_list[1].value = 0xf0;
 			p.pen.subreport_list[1].id =
-				UCLOGIC_RDESC_V2_FRAME_DIAL_ID;
+				UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID;
 			goto output;
 		}
 		hid_dbg(hdev, "pen v2 parameters not found\n");

hid-uclogic-rdesc.c

@@ -713,12 +713,12 @@ const __u8 uclogic_rdesc_v2_frame_buttons_arr[] = {
 const size_t uclogic_rdesc_v2_frame_buttons_size =
 			sizeof(uclogic_rdesc_v2_frame_buttons_arr);
 
-/* Fixed report descriptor for (tweaked) v2 frame dial reports */
-const __u8 uclogic_rdesc_v2_frame_dial_arr[] = {
+/* Fixed report descriptor for (tweaked) v2 frame touch ring reports */
+const __u8 uclogic_rdesc_v2_frame_touch_ring_arr[] = {
 	0x05, 0x01,         /*  Usage Page (Desktop),               */
 	0x09, 0x07,         /*  Usage (Keypad),                     */
 	0xA1, 0x01,         /*  Collection (Application),           */
-	0x85, UCLOGIC_RDESC_V2_FRAME_DIAL_ID,
+	0x85, UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID,
 			    /*      Report ID (DIAL_ID),            */
 	0x14,               /*      Logical Minimum (0),            */
 	0x05, 0x0D,         /*      Usage Page (Digitizer),         */
@@ -758,8 +758,8 @@ const __u8 uclogic_rdesc_v2_frame_dial_arr[] = {
 	0xC0,               /*      End Collection,                 */
 	0xC0                /*  End Collection                      */
 };
-const size_t uclogic_rdesc_v2_frame_dial_size =
-			sizeof(uclogic_rdesc_v2_frame_dial_arr);
+const size_t uclogic_rdesc_v2_frame_touch_ring_size =
+			sizeof(uclogic_rdesc_v2_frame_touch_ring_arr);
 
 /* Fixed report descriptor for Ugee EX07 frame */
 const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {

hid-uclogic-rdesc.h

@@ -131,15 +131,15 @@ extern const size_t uclogic_rdesc_v1_frame_size;
 extern const __u8 uclogic_rdesc_v2_frame_buttons_arr[];
 extern const size_t uclogic_rdesc_v2_frame_buttons_size;
 
-/* Report ID for tweaked v2 frame dial reports */
-#define UCLOGIC_RDESC_V2_FRAME_DIAL_ID 0xf8
+/* Report ID for tweaked v2 frame touch ring reports */
+#define UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID 0xf8
 
-/* Fixed report descriptor for (tweaked) v2 frame dial reports */
-extern const __u8 uclogic_rdesc_v2_frame_dial_arr[];
-extern const size_t uclogic_rdesc_v2_frame_dial_size;
+/* Fixed report descriptor for (tweaked) v2 frame touch ring reports */
+extern const __u8 uclogic_rdesc_v2_frame_touch_ring_arr[];
+extern const size_t uclogic_rdesc_v2_frame_touch_ring_size;
 
-/* Device ID byte offset in v2 frame dial reports */
-#define UCLOGIC_RDESC_V2_FRAME_DIAL_DEV_ID_BYTE	0x4
+/* Device ID byte offset in v2 frame touch ring reports */
+#define UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_DEV_ID_BYTE	0x4
 
 /* Fixed report descriptor for Ugee EX07 frame */
 extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];