HID: roccat: deprecated some Pyra attributes

Introduced attribute "control" and made profile_settings and profile_buttons
readable, which makes profile[1-5]_settings and profile[1-5]_buttons obsolete.

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

2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c
index 76199fa727ed..d4f1e3bee590 100644
--- a/drivers/hid/hid-roccat-pyra.c
+++ b/drivers/hid/hid-roccat-pyra.c
@@ -177,9 +177,10 @@ PYRA_SYSFS_R(thingy, THINGY)
         .write = pyra_sysfs_write_ ## thingy \
 }
 
+PYRA_SYSFS_W(control, CONTROL)
 PYRA_SYSFS_RW(info, INFO)
-PYRA_SYSFS_W(profile_settings, PROFILE_SETTINGS)
-PYRA_SYSFS_W(profile_buttons, PROFILE_BUTTONS)
+PYRA_SYSFS_RW(profile_settings, PROFILE_SETTINGS)
+PYRA_SYSFS_RW(profile_buttons, PROFILE_BUTTONS)
 PYRA_SYSFS_R(settings, SETTINGS)
 
 static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp,
@@ -312,9 +313,10 @@ static struct device_attribute pyra_attributes[] = {
 };
 
 static struct bin_attribute pyra_bin_attributes[] = {
+        PYRA_BIN_ATTRIBUTE_W(control, CONTROL),
         PYRA_BIN_ATTRIBUTE_RW(info, INFO),
-        PYRA_BIN_ATTRIBUTE_W(profile_settings, PROFILE_SETTINGS),
-        PYRA_BIN_ATTRIBUTE_W(profile_buttons, PROFILE_BUTTONS),
+        PYRA_BIN_ATTRIBUTE_RW(profile_settings, PROFILE_SETTINGS),
+        PYRA_BIN_ATTRIBUTE_RW(profile_buttons, PROFILE_BUTTONS),
         PYRA_BIN_ATTRIBUTE_RW(settings, SETTINGS),
         {
                 .attr = { .name = "profile1_settings", .mode = 0440 },
diff --git a/drivers/hid/hid-roccat-pyra.h b/drivers/hid/hid-roccat-pyra.h
index 93e494984976..beedcf001ceb 100644
--- a/drivers/hid/hid-roccat-pyra.h
+++ b/drivers/hid/hid-roccat-pyra.h
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 
 enum {
+        PYRA_SIZE_CONTROL = 0x03,
         PYRA_SIZE_INFO = 0x06,
         PYRA_SIZE_PROFILE_SETTINGS = 0x0d,
         PYRA_SIZE_PROFILE_BUTTONS = 0x13,
@@ -57,6 +58,7 @@ struct pyra_info {
 } __attribute__ ((__packed__));
 
 enum pyra_commands {
+        PYRA_COMMAND_CONTROL = 0x4,
         PYRA_COMMAND_SETTINGS = 0x5,
         PYRA_COMMAND_PROFILE_SETTINGS = 0x6,
         PYRA_COMMAND_PROFILE_BUTTONS = 0x7,