HID: roccat: correction and cleanup of HID feature reports

Removed analog feature report enums and modified code in roccat_common
to reflect this. Non standard conform Kone got its own copy of the old
code. That helps extracting more generalizations for newer devices.

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

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 23cdb449d88e..33ecad50395b 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -50,7 +50,7 @@ static int koneplus_send_control(struct usb_device *usb_dev, uint value,
         control.value = value;
         control.request = request;
 
-        return roccat_common_send(usb_dev, KONEPLUS_USB_COMMAND_CONTROL,
+        return roccat_common_send(usb_dev, KONEPLUS_COMMAND_CONTROL,
                         &control, sizeof(struct koneplus_control));
 }
 
@@ -60,7 +60,7 @@ static int koneplus_receive_control_status(struct usb_device *usb_dev)
         struct koneplus_control control;
 
         do {
-                retval = roccat_common_receive(usb_dev, KONEPLUS_USB_COMMAND_CONTROL,
+                retval = roccat_common_receive(usb_dev, KONEPLUS_COMMAND_CONTROL,
                                 &control, sizeof(struct koneplus_control));
 
                 /* check if we get a completely wrong answer */
@@ -120,7 +120,7 @@ static int koneplus_select_profile(struct usb_device *usb_dev, uint number,
 static int koneplus_get_info(struct usb_device *usb_dev,
                 struct koneplus_info *buf)
 {
-        return roccat_common_receive(usb_dev, KONEPLUS_USB_COMMAND_INFO,
+        return roccat_common_receive(usb_dev, KONEPLUS_COMMAND_INFO,
                         buf, sizeof(struct koneplus_info));
 }
 
@@ -134,14 +134,14 @@ static int koneplus_get_profile_settings(struct usb_device *usb_dev,
         if (retval)
                 return retval;
 
-        return roccat_common_receive(usb_dev, KONEPLUS_USB_COMMAND_PROFILE_SETTINGS,
+        return roccat_common_receive(usb_dev, KONEPLUS_COMMAND_PROFILE_SETTINGS,
                         buf, sizeof(struct koneplus_profile_settings));
 }
 
 static int koneplus_set_profile_settings(struct usb_device *usb_dev,
                 struct koneplus_profile_settings const *settings)
 {
-        return koneplus_send(usb_dev, KONEPLUS_USB_COMMAND_PROFILE_SETTINGS,
+        return koneplus_send(usb_dev, KONEPLUS_COMMAND_PROFILE_SETTINGS,
                         settings, sizeof(struct koneplus_profile_settings));
 }
 
@@ -155,14 +155,14 @@ static int koneplus_get_profile_buttons(struct usb_device *usb_dev,
         if (retval)
                 return retval;
 
-        return roccat_common_receive(usb_dev, KONEPLUS_USB_COMMAND_PROFILE_BUTTONS,
+        return roccat_common_receive(usb_dev, KONEPLUS_COMMAND_PROFILE_BUTTONS,
                         buf, sizeof(struct koneplus_profile_buttons));
 }
 
 static int koneplus_set_profile_buttons(struct usb_device *usb_dev,
                 struct koneplus_profile_buttons const *buttons)
 {
-        return koneplus_send(usb_dev, KONEPLUS_USB_COMMAND_PROFILE_BUTTONS,
+        return koneplus_send(usb_dev, KONEPLUS_COMMAND_PROFILE_BUTTONS,
                         buttons, sizeof(struct koneplus_profile_buttons));
 }
 
@@ -172,7 +172,7 @@ static int koneplus_get_actual_profile(struct usb_device *usb_dev)
         struct koneplus_actual_profile buf;
         int retval;
 
-        retval = roccat_common_receive(usb_dev, KONEPLUS_USB_COMMAND_ACTUAL_PROFILE,
+        retval = roccat_common_receive(usb_dev, KONEPLUS_COMMAND_ACTUAL_PROFILE,
                         &buf, sizeof(struct koneplus_actual_profile));
 
         return retval ? retval : buf.actual_profile;
@@ -187,7 +187,7 @@ static int koneplus_set_actual_profile(struct usb_device *usb_dev,
         buf.size = sizeof(struct koneplus_actual_profile);
         buf.actual_profile = new_profile;
 
-        return koneplus_send(usb_dev, KONEPLUS_USB_COMMAND_ACTUAL_PROFILE,
+        return koneplus_send(usb_dev, KONEPLUS_COMMAND_ACTUAL_PROFILE,
                         &buf, sizeof(struct koneplus_actual_profile));
 }
 
@@ -245,7 +245,7 @@ static ssize_t koneplus_sysfs_write_talk(struct file *fp,
                 loff_t off, size_t count)
 {
         return koneplus_sysfs_write(fp, kobj, buf, off, count,
-                        sizeof(struct koneplus_talk), KONEPLUS_USB_COMMAND_TALK);
+                        sizeof(struct koneplus_talk), KONEPLUS_COMMAND_TALK);
 }
 
 static ssize_t koneplus_sysfs_write_macro(struct file *fp,
@@ -253,7 +253,7 @@ static ssize_t koneplus_sysfs_write_macro(struct file *fp,
                 loff_t off, size_t count)
 {
         return koneplus_sysfs_write(fp, kobj, buf, off, count,
-                        sizeof(struct koneplus_macro), KONEPLUS_USB_COMMAND_MACRO);
+                        sizeof(struct koneplus_macro), KONEPLUS_COMMAND_MACRO);
 }
 
 static ssize_t koneplus_sysfs_read_sensor(struct file *fp,
@@ -261,7 +261,7 @@ static ssize_t koneplus_sysfs_read_sensor(struct file *fp,
                 loff_t off, size_t count)
 {
         return koneplus_sysfs_read(fp, kobj, buf, off, count,
-                        sizeof(struct koneplus_sensor), KONEPLUS_USB_COMMAND_SENSOR);
+                        sizeof(struct koneplus_sensor), KONEPLUS_COMMAND_SENSOR);
 }
 
 static ssize_t koneplus_sysfs_write_sensor(struct file *fp,
@@ -269,7 +269,7 @@ static ssize_t koneplus_sysfs_write_sensor(struct file *fp,
                 loff_t off, size_t count)
 {
         return koneplus_sysfs_write(fp, kobj, buf, off, count,
-                        sizeof(struct koneplus_sensor), KONEPLUS_USB_COMMAND_SENSOR);
+                        sizeof(struct koneplus_sensor), KONEPLUS_COMMAND_SENSOR);
 }
 
 static ssize_t koneplus_sysfs_write_tcu(struct file *fp,
@@ -277,7 +277,7 @@ static ssize_t koneplus_sysfs_write_tcu(struct file *fp,
                 loff_t off, size_t count)
 {
         return koneplus_sysfs_write(fp, kobj, buf, off, count,
-                        sizeof(struct koneplus_tcu), KONEPLUS_USB_COMMAND_TCU);
+                        sizeof(struct koneplus_tcu), KONEPLUS_COMMAND_TCU);
 }
 
 static ssize_t koneplus_sysfs_read_tcu_image(struct file *fp,
@@ -285,7 +285,7 @@ static ssize_t koneplus_sysfs_read_tcu_image(struct file *fp,
                 loff_t off, size_t count)
 {
         return koneplus_sysfs_read(fp, kobj, buf, off, count,
-                        sizeof(struct koneplus_tcu_image), KONEPLUS_USB_COMMAND_TCU);
+                        sizeof(struct koneplus_tcu_image), KONEPLUS_COMMAND_TCU);
 }
 
 static ssize_t koneplus_sysfs_read_profilex_settings(struct file *fp,