HID: uclogic: Refactor UGEE v2 frame initialization

At the moment, the driver only supports UGEE v2 devices that have
buttons in their frames.

In order to support other types of frames in the future, move the code
used to initialize this kind of frames to its own function.

Tested-by: Jouke Witteveen <j.witteveen@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-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index 07c5a21112cee8b803c4ea71946922dfa3732938..182e6f8f027a3287b22ef3b1ed4d87e19808a808 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -1112,6 +1112,41 @@ static int uclogic_params_parse_ugee_v2_desc(const __u8 *str_desc,
        return 0;
 }
 
+/**
+ * uclogic_params_ugee_v2_init_frame_buttons() - initialize a UGEE v2 frame with
+ * buttons.
+ * @p:                 Parameters to fill in, cannot be NULL.
+ * @desc_params:       Device description params list.
+ * @desc_params_size:  Size of the description params list.
+ *
+ * Returns:
+ *     Zero, if successful. A negative errno code on error.
+ */
+static int uclogic_params_ugee_v2_init_frame_buttons(struct uclogic_params *p,
+                                                    const s32 *desc_params,
+                                                    size_t desc_params_size)
+{
+       __u8 *rdesc_frame = NULL;
+       int rc = 0;
+
+       if (!p || desc_params_size != UCLOGIC_RDESC_PH_ID_NUM)
+               return -EINVAL;
+
+       rdesc_frame = uclogic_rdesc_template_apply(
+                               uclogic_rdesc_ugee_v2_frame_btn_template_arr,
+                               uclogic_rdesc_ugee_v2_frame_btn_template_size,
+                               desc_params, UCLOGIC_RDESC_PH_ID_NUM);
+       if (!rdesc_frame)
+               return -ENOMEM;
+
+       rc = uclogic_params_frame_init_with_desc(&p->frame_list[0],
+                                                rdesc_frame,
+                                                uclogic_rdesc_ugee_v2_frame_btn_template_size,
+                                                UCLOGIC_RDESC_V1_FRAME_ID);
+       kfree(rdesc_frame);
+       return rc;
+}
+
 /**
  * uclogic_params_ugee_v2_init() - initialize a UGEE graphics tablets by
  * discovering their parameters.
@@ -1140,7 +1175,6 @@ static int uclogic_params_ugee_v2_init(struct uclogic_params *params,
        const int str_desc_len = 12;
        __u8 *str_desc = NULL;
        __u8 *rdesc_pen = NULL;
-       __u8 *rdesc_frame = NULL;
        s32 desc_params[UCLOGIC_RDESC_PH_ID_NUM];
        __u8 magic_arr[] = {
                0x02, 0xb0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -1209,24 +1243,10 @@ static int uclogic_params_ugee_v2_init(struct uclogic_params *params,
        p.pen.subreport_list[0].id = UCLOGIC_RDESC_V1_FRAME_ID;
 
        /* Initialize the frame interface */
-       rdesc_frame = uclogic_rdesc_template_apply(
-                               uclogic_rdesc_ugee_v2_frame_btn_template_arr,
-                               uclogic_rdesc_ugee_v2_frame_btn_template_size,
-                               desc_params, ARRAY_SIZE(desc_params));
-       if (!rdesc_frame) {
-               rc = -ENOMEM;
+       rc = uclogic_params_ugee_v2_init_frame_buttons(&p, desc_params,
+                                                      ARRAY_SIZE(desc_params));
+       if (rc)
                goto cleanup;
-       }
-
-       rc = uclogic_params_frame_init_with_desc(&p.frame_list[0],
-                                                rdesc_frame,
-                                                uclogic_rdesc_ugee_v2_frame_btn_template_size,
-                                                UCLOGIC_RDESC_V1_FRAME_ID);
-       kfree(rdesc_frame);
-       if (rc) {
-               uclogic_params_init_invalid(&p);
-               goto output;
-       }
 
 output:
        /* Output parameters */