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, 53 deletions

diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kovaplus.c
index 112d934132c8..c219cff91555 100644
--- a/drivers/hid/hid-roccat-kovaplus.c
+++ b/drivers/hid/hid-roccat-kovaplus.c
@@ -47,69 +47,23 @@ static int kovaplus_send_control(struct usb_device *usb_dev, uint value,
                 enum kovaplus_control_requests request)
 {
         int retval;
-        struct kovaplus_control control;
+        struct roccat_common_control control;
 
         if ((request == KOVAPLUS_CONTROL_REQUEST_PROFILE_SETTINGS ||
                         request == KOVAPLUS_CONTROL_REQUEST_PROFILE_BUTTONS) &&
                         value > 4)
                 return -EINVAL;
 
-        control.command = KOVAPLUS_COMMAND_CONTROL;
+        control.command = ROCCAT_COMMON_COMMAND_CONTROL;
         control.value = value;
         control.request = request;
 
-        retval = roccat_common_send(usb_dev, KOVAPLUS_COMMAND_CONTROL,
-                        &control, sizeof(struct kovaplus_control));
+        retval = roccat_common_send(usb_dev, ROCCAT_COMMON_COMMAND_CONTROL,
+                        &control, sizeof(struct roccat_common_control));
 
         return retval;
 }
 
-static int kovaplus_receive_control_status(struct usb_device *usb_dev)
-{
-        int retval;
-        struct kovaplus_control control;
-
-        do {
-                retval = roccat_common_receive(usb_dev, KOVAPLUS_COMMAND_CONTROL,
-                                &control, sizeof(struct kovaplus_control));
-
-                /* check if we get a completely wrong answer */
-                if (retval)
-                        return retval;
-
-                if (control.value == KOVAPLUS_CONTROL_REQUEST_STATUS_OK)
-                        return 0;
-
-                /* indicates that hardware needs some more time to complete action */
-                if (control.value == KOVAPLUS_CONTROL_REQUEST_STATUS_WAIT) {
-                        msleep(500); /* windows driver uses 1000 */
-                        continue;
-                }
-
-                /* seems to be critical - replug necessary */
-                if (control.value == KOVAPLUS_CONTROL_REQUEST_STATUS_OVERLOAD)
-                        return -EINVAL;
-
-                hid_err(usb_dev, "roccat_common_receive_control_status: "
-                                "unknown response value 0x%x\n", control.value);
-                return -EINVAL;
-        } while (1);
-}
-
-static int kovaplus_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;
-
-        msleep(100);
-
-        return kovaplus_receive_control_status(usb_dev);
-}
-
 static int kovaplus_select_profile(struct usb_device *usb_dev, uint number,
                 enum kovaplus_control_requests request)
 {
@@ -140,7 +94,8 @@ static int kovaplus_get_profile_settings(struct usb_device *usb_dev,
 static int kovaplus_set_profile_settings(struct usb_device *usb_dev,
                 struct kovaplus_profile_settings const *settings)
 {
-        return kovaplus_send(usb_dev, KOVAPLUS_COMMAND_PROFILE_SETTINGS,
+        return roccat_common_send_with_status(usb_dev,
+                        KOVAPLUS_COMMAND_PROFILE_SETTINGS,
                         settings, sizeof(struct kovaplus_profile_settings));
 }
 
@@ -161,7 +116,8 @@ static int kovaplus_get_profile_buttons(struct usb_device *usb_dev,
 static int kovaplus_set_profile_buttons(struct usb_device *usb_dev,
                 struct kovaplus_profile_buttons const *buttons)
 {
-        return kovaplus_send(usb_dev, KOVAPLUS_COMMAND_PROFILE_BUTTONS,
+        return roccat_common_send_with_status(usb_dev,
+                        KOVAPLUS_COMMAND_PROFILE_BUTTONS,
                         buttons, sizeof(struct kovaplus_profile_buttons));
 }
 
@@ -186,7 +142,8 @@ static int kovaplus_set_actual_profile(struct usb_device *usb_dev,
         buf.size = sizeof(struct kovaplus_actual_profile);
         buf.actual_profile = new_profile;
 
-        return kovaplus_send(usb_dev, KOVAPLUS_COMMAND_ACTUAL_PROFILE,
+        return roccat_common_send_with_status(usb_dev,
+                        KOVAPLUS_COMMAND_ACTUAL_PROFILE,
                         &buf, sizeof(struct kovaplus_actual_profile));
 }