HID: roccat: move functionality to roccat-common

Reduced code duplication by moving functions from individual drivers
to roccat-common module.

Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 10 insertions, 41 deletions

diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c
index df05c1b1064f..440cb1bd70d4 100644
--- a/drivers/hid/hid-roccat-pyra.c
+++ b/drivers/hid/hid-roccat-pyra.c
@@ -42,43 +42,19 @@ static void profile_activated(struct pyra_device *pyra,
 static int pyra_send_control(struct usb_device *usb_dev, int value,
                 enum pyra_control_requests request)
 {
-        struct pyra_control control;
+        struct roccat_common_control control;
 
         if ((request == PYRA_CONTROL_REQUEST_PROFILE_SETTINGS ||
                         request == PYRA_CONTROL_REQUEST_PROFILE_BUTTONS) &&
                         (value < 0 || value > 4))
                 return -EINVAL;
 
-        control.command = PYRA_COMMAND_CONTROL;
+        control.command = ROCCAT_COMMON_COMMAND_CONTROL;
         control.value = value;
         control.request = request;
 
-        return roccat_common_send(usb_dev, PYRA_COMMAND_CONTROL,
-                        &control, sizeof(struct pyra_control));
-}
-
-static int pyra_receive_control_status(struct usb_device *usb_dev)
-{
-        int retval;
-        struct pyra_control control;
-
-        do {
-                msleep(10);
-                retval = roccat_common_receive(usb_dev, PYRA_COMMAND_CONTROL,
-                                &control, sizeof(struct pyra_control));
-
-                /* requested too early, try again */
-        } while (retval == -EPROTO);
-
-        if (!retval && control.command == PYRA_COMMAND_CONTROL &&
-                        control.request == PYRA_CONTROL_REQUEST_STATUS &&
-                        control.value == 1)
-                return 0;
-        else {
-                hid_err(usb_dev, "receive control status: unknown response 0x%x 0x%x\n",
-                        control.request, control.value);
-                return retval ? retval : -EINVAL;
-        }
+        return roccat_common_send(usb_dev, ROCCAT_COMMON_COMMAND_CONTROL,
+                        &control, sizeof(struct roccat_common_control));
 }
 
 static int pyra_get_profile_settings(struct usb_device *usb_dev,
@@ -118,34 +94,27 @@ static int pyra_get_info(struct usb_device *usb_dev, struct pyra_info *buf)
                         buf, sizeof(struct pyra_info));
 }
 
-static int pyra_send(struct usb_device *usb_dev, uint command,
-                void const *buf, uint size)
-{
-        int retval;
-        retval = roccat_common_send(usb_dev, command, buf, size);
-        if (retval)
-                return retval;
-        return pyra_receive_control_status(usb_dev);
-}
-
 static int pyra_set_profile_settings(struct usb_device *usb_dev,
                 struct pyra_profile_settings const *settings)
 {
-        return pyra_send(usb_dev, PYRA_COMMAND_PROFILE_SETTINGS, settings,
+        return roccat_common_send_with_status(usb_dev,
+                        PYRA_COMMAND_PROFILE_SETTINGS, settings,
                         sizeof(struct pyra_profile_settings));
 }
 
 static int pyra_set_profile_buttons(struct usb_device *usb_dev,
                 struct pyra_profile_buttons const *buttons)
 {
-        return pyra_send(usb_dev, PYRA_COMMAND_PROFILE_BUTTONS, buttons,
+        return roccat_common_send_with_status(usb_dev,
+                        PYRA_COMMAND_PROFILE_BUTTONS, buttons,
                         sizeof(struct pyra_profile_buttons));
 }
 
 static int pyra_set_settings(struct usb_device *usb_dev,
                 struct pyra_settings const *settings)
 {
-        return pyra_send(usb_dev, PYRA_COMMAND_SETTINGS, settings,
+        return roccat_common_send_with_status(usb_dev,
+                        PYRA_COMMAND_SETTINGS, settings,
                         sizeof(struct pyra_settings));
 }