HID: roccat: cleanup of pyra module

Partially removed unneeded informations and data caching.
Moved code nearer to format of newer drivers.
Added "info" sysfs attribute to support device reset and deprecate
"firmware_version" attribute.

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

1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/hid/hid-roccat-pyra.h b/drivers/hid/hid-roccat-pyra.h
index eada7830fa99..93e494984976 100644
--- a/drivers/hid/hid-roccat-pyra.h
+++ b/drivers/hid/hid-roccat-pyra.h
@@ -14,11 +14,12 @@
 
 #include <linux/types.h>
 
-struct pyra_b {
-        uint8_t command; /* PYRA_COMMAND_B */
-        uint8_t size; /* always 3 */
-        uint8_t unknown; /* 1 */
-} __attribute__ ((__packed__));
+enum {
+        PYRA_SIZE_INFO = 0x06,
+        PYRA_SIZE_PROFILE_SETTINGS = 0x0d,
+        PYRA_SIZE_PROFILE_BUTTONS = 0x13,
+        PYRA_SIZE_SETTINGS = 0x03,
+};
 
 enum pyra_control_requests {
         PYRA_CONTROL_REQUEST_PROFILE_SETTINGS = 0x10,
@@ -46,14 +47,6 @@ struct pyra_profile_settings {
         uint16_t checksum; /* byte sum */
 } __attribute__ ((__packed__));
 
-struct pyra_profile_buttons {
-        uint8_t command; /* PYRA_COMMAND_PROFILE_BUTTONS */
-        uint8_t size; /* always 0x13 */
-        uint8_t number; /* Range 0-4 */
-        uint8_t buttons[14];
-        uint16_t checksum; /* byte sum */
-} __attribute__ ((__packed__));
-
 struct pyra_info {
         uint8_t command; /* PYRA_COMMAND_INFO */
         uint8_t size; /* always 6 */
@@ -148,13 +141,10 @@ struct pyra_roccat_report {
 struct pyra_device {
         int actual_profile;
         int actual_cpi;
-        int firmware_version;
         int roccat_claimed;
         int chrdev_minor;
         struct mutex pyra_lock;
-        struct pyra_settings settings;
         struct pyra_profile_settings profile_settings[5];
-        struct pyra_profile_buttons profile_buttons[5];
 };
 
 #endif