diff options
author | Stefan Achatz <stefan_achatz@web.de> | 2012-11-11 00:21:10 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-11-12 09:30:28 -0500 |
commit | ecbfe7aa55a3583238c0126bbc64f9043d390b50 (patch) | |
tree | 31fa20a4c86f624123e860f25c149bd5536a404b /drivers/hid/hid-roccat-pyra.c | |
parent | f1da71e1f658c3f1e5d08291258ac87c35e049a4 (diff) |
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>
Diffstat (limited to 'drivers/hid/hid-roccat-pyra.c')
-rw-r--r-- | drivers/hid/hid-roccat-pyra.c | 10 |
1 files changed, 6 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) | |||
177 | .write = pyra_sysfs_write_ ## thingy \ | 177 | .write = pyra_sysfs_write_ ## thingy \ |
178 | } | 178 | } |
179 | 179 | ||
180 | PYRA_SYSFS_W(control, CONTROL) | ||
180 | PYRA_SYSFS_RW(info, INFO) | 181 | PYRA_SYSFS_RW(info, INFO) |
181 | PYRA_SYSFS_W(profile_settings, PROFILE_SETTINGS) | 182 | PYRA_SYSFS_RW(profile_settings, PROFILE_SETTINGS) |
182 | PYRA_SYSFS_W(profile_buttons, PROFILE_BUTTONS) | 183 | PYRA_SYSFS_RW(profile_buttons, PROFILE_BUTTONS) |
183 | PYRA_SYSFS_R(settings, SETTINGS) | 184 | PYRA_SYSFS_R(settings, SETTINGS) |
184 | 185 | ||
185 | static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp, | 186 | static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp, |
@@ -312,9 +313,10 @@ static struct device_attribute pyra_attributes[] = { | |||
312 | }; | 313 | }; |
313 | 314 | ||
314 | static struct bin_attribute pyra_bin_attributes[] = { | 315 | static struct bin_attribute pyra_bin_attributes[] = { |
316 | PYRA_BIN_ATTRIBUTE_W(control, CONTROL), | ||
315 | PYRA_BIN_ATTRIBUTE_RW(info, INFO), | 317 | PYRA_BIN_ATTRIBUTE_RW(info, INFO), |
316 | PYRA_BIN_ATTRIBUTE_W(profile_settings, PROFILE_SETTINGS), | 318 | PYRA_BIN_ATTRIBUTE_RW(profile_settings, PROFILE_SETTINGS), |
317 | PYRA_BIN_ATTRIBUTE_W(profile_buttons, PROFILE_BUTTONS), | 319 | PYRA_BIN_ATTRIBUTE_RW(profile_buttons, PROFILE_BUTTONS), |
318 | PYRA_BIN_ATTRIBUTE_RW(settings, SETTINGS), | 320 | PYRA_BIN_ATTRIBUTE_RW(settings, SETTINGS), |
319 | { | 321 | { |
320 | .attr = { .name = "profile1_settings", .mode = 0440 }, | 322 | .attr = { .name = "profile1_settings", .mode = 0440 }, |