diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2012-05-20 16:45:04 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-28 04:34:01 -0400 |
commit | 7392d73be2b3c907d65126f072c313215e1907b3 (patch) | |
tree | a10a80d29a8f17e1e330e4b50db48aff468e9c3c /drivers/hid/hid-roccat-arvo.c | |
parent | 4ec141ad4e470485803a98ddb250aa7df030e8df (diff) |
HID: roccat: rename roccat_common functions to roccat_common2
Did this to illustrate my understanding of the firmware generations:
Valo and Kone were 1st generation
Arvo was externaly developed and lies in the middle
All others until now are considered 2nd generation
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-arvo.c')
-rw-r--r-- | drivers/hid/hid-roccat-arvo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c index 093bfad00b02..327f9b8ed1f4 100644 --- a/drivers/hid/hid-roccat-arvo.c +++ b/drivers/hid/hid-roccat-arvo.c | |||
@@ -39,7 +39,7 @@ static ssize_t arvo_sysfs_show_mode_key(struct device *dev, | |||
39 | int retval; | 39 | int retval; |
40 | 40 | ||
41 | mutex_lock(&arvo->arvo_lock); | 41 | mutex_lock(&arvo->arvo_lock); |
42 | retval = roccat_common_receive(usb_dev, ARVO_COMMAND_MODE_KEY, | 42 | retval = roccat_common2_receive(usb_dev, ARVO_COMMAND_MODE_KEY, |
43 | &temp_buf, sizeof(struct arvo_mode_key)); | 43 | &temp_buf, sizeof(struct arvo_mode_key)); |
44 | mutex_unlock(&arvo->arvo_lock); | 44 | mutex_unlock(&arvo->arvo_lock); |
45 | if (retval) | 45 | if (retval) |
@@ -67,7 +67,7 @@ static ssize_t arvo_sysfs_set_mode_key(struct device *dev, | |||
67 | temp_buf.state = state; | 67 | temp_buf.state = state; |
68 | 68 | ||
69 | mutex_lock(&arvo->arvo_lock); | 69 | mutex_lock(&arvo->arvo_lock); |
70 | retval = roccat_common_send(usb_dev, ARVO_COMMAND_MODE_KEY, | 70 | retval = roccat_common2_send(usb_dev, ARVO_COMMAND_MODE_KEY, |
71 | &temp_buf, sizeof(struct arvo_mode_key)); | 71 | &temp_buf, sizeof(struct arvo_mode_key)); |
72 | mutex_unlock(&arvo->arvo_lock); | 72 | mutex_unlock(&arvo->arvo_lock); |
73 | if (retval) | 73 | if (retval) |
@@ -87,7 +87,7 @@ static ssize_t arvo_sysfs_show_key_mask(struct device *dev, | |||
87 | int retval; | 87 | int retval; |
88 | 88 | ||
89 | mutex_lock(&arvo->arvo_lock); | 89 | mutex_lock(&arvo->arvo_lock); |
90 | retval = roccat_common_receive(usb_dev, ARVO_COMMAND_KEY_MASK, | 90 | retval = roccat_common2_receive(usb_dev, ARVO_COMMAND_KEY_MASK, |
91 | &temp_buf, sizeof(struct arvo_key_mask)); | 91 | &temp_buf, sizeof(struct arvo_key_mask)); |
92 | mutex_unlock(&arvo->arvo_lock); | 92 | mutex_unlock(&arvo->arvo_lock); |
93 | if (retval) | 93 | if (retval) |
@@ -115,7 +115,7 @@ static ssize_t arvo_sysfs_set_key_mask(struct device *dev, | |||
115 | temp_buf.key_mask = key_mask; | 115 | temp_buf.key_mask = key_mask; |
116 | 116 | ||
117 | mutex_lock(&arvo->arvo_lock); | 117 | mutex_lock(&arvo->arvo_lock); |
118 | retval = roccat_common_send(usb_dev, ARVO_COMMAND_KEY_MASK, | 118 | retval = roccat_common2_send(usb_dev, ARVO_COMMAND_KEY_MASK, |
119 | &temp_buf, sizeof(struct arvo_key_mask)); | 119 | &temp_buf, sizeof(struct arvo_key_mask)); |
120 | mutex_unlock(&arvo->arvo_lock); | 120 | mutex_unlock(&arvo->arvo_lock); |
121 | if (retval) | 121 | if (retval) |
@@ -130,7 +130,7 @@ static int arvo_get_actual_profile(struct usb_device *usb_dev) | |||
130 | struct arvo_actual_profile temp_buf; | 130 | struct arvo_actual_profile temp_buf; |
131 | int retval; | 131 | int retval; |
132 | 132 | ||
133 | retval = roccat_common_receive(usb_dev, ARVO_COMMAND_ACTUAL_PROFILE, | 133 | retval = roccat_common2_receive(usb_dev, ARVO_COMMAND_ACTUAL_PROFILE, |
134 | &temp_buf, sizeof(struct arvo_actual_profile)); | 134 | &temp_buf, sizeof(struct arvo_actual_profile)); |
135 | 135 | ||
136 | if (retval) | 136 | if (retval) |
@@ -170,7 +170,7 @@ static ssize_t arvo_sysfs_set_actual_profile(struct device *dev, | |||
170 | temp_buf.actual_profile = profile; | 170 | temp_buf.actual_profile = profile; |
171 | 171 | ||
172 | mutex_lock(&arvo->arvo_lock); | 172 | mutex_lock(&arvo->arvo_lock); |
173 | retval = roccat_common_send(usb_dev, ARVO_COMMAND_ACTUAL_PROFILE, | 173 | retval = roccat_common2_send(usb_dev, ARVO_COMMAND_ACTUAL_PROFILE, |
174 | &temp_buf, sizeof(struct arvo_actual_profile)); | 174 | &temp_buf, sizeof(struct arvo_actual_profile)); |
175 | if (!retval) { | 175 | if (!retval) { |
176 | arvo->actual_profile = profile; | 176 | arvo->actual_profile = profile; |
@@ -194,7 +194,7 @@ static ssize_t arvo_sysfs_write(struct file *fp, | |||
194 | return -EINVAL; | 194 | return -EINVAL; |
195 | 195 | ||
196 | mutex_lock(&arvo->arvo_lock); | 196 | mutex_lock(&arvo->arvo_lock); |
197 | retval = roccat_common_send(usb_dev, command, buf, real_size); | 197 | retval = roccat_common2_send(usb_dev, command, buf, real_size); |
198 | mutex_unlock(&arvo->arvo_lock); | 198 | mutex_unlock(&arvo->arvo_lock); |
199 | 199 | ||
200 | return (retval ? retval : real_size); | 200 | return (retval ? retval : real_size); |
@@ -217,7 +217,7 @@ static ssize_t arvo_sysfs_read(struct file *fp, | |||
217 | return -EINVAL; | 217 | return -EINVAL; |
218 | 218 | ||
219 | mutex_lock(&arvo->arvo_lock); | 219 | mutex_lock(&arvo->arvo_lock); |
220 | retval = roccat_common_receive(usb_dev, command, buf, real_size); | 220 | retval = roccat_common2_receive(usb_dev, command, buf, real_size); |
221 | mutex_unlock(&arvo->arvo_lock); | 221 | mutex_unlock(&arvo->arvo_lock); |
222 | 222 | ||
223 | return (retval ? retval : real_size); | 223 | return (retval ? retval : real_size); |