diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-02-17 18:39:39 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-17 18:39:39 -0500 |
commit | 490051ad164ac53a96ca41f6edc270640bfc499d (patch) | |
tree | dc7a985afaeb98ae173b92af5a7936b179de18f9 /drivers/hid/hid-cp2112.c | |
parent | d6a611f5e39fa3bc1243b0f14399340021906751 (diff) |
HID: cp2112: convert to use hid_hw_raw_request()
Commit cafebc0 ("HID: remove hid_get_raw_report in struct hid_device")
obsoletes the use of hdev->hid_get_raw_report(), as calling
hid_hw_raw_request() is functionally equivalent.
Convert cp2112 to use this notation.
Reported-by: fengguang.wu@intel.com
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-cp2112.c')
-rw-r--r-- | drivers/hid/hid-cp2112.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index f32672624691..6d679f1840a7 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c | |||
@@ -174,8 +174,9 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | |||
174 | u8 buf[5]; | 174 | u8 buf[5]; |
175 | int ret; | 175 | int ret; |
176 | 176 | ||
177 | ret = hdev->hid_get_raw_report(hdev, CP2112_GPIO_CONFIG, buf, | 177 | ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, |
178 | sizeof(buf), HID_FEATURE_REPORT); | 178 | sizeof(buf), HID_FEATURE_REPORT, |
179 | HID_REQ_GET_REPORT); | ||
179 | if (ret != sizeof(buf)) { | 180 | if (ret != sizeof(buf)) { |
180 | hid_err(hdev, "error requesting GPIO config: %d\n", ret); | 181 | hid_err(hdev, "error requesting GPIO config: %d\n", ret); |
181 | return ret; | 182 | return ret; |
@@ -220,8 +221,8 @@ static int cp2112_gpio_get(struct gpio_chip *chip, unsigned offset) | |||
220 | u8 buf[2]; | 221 | u8 buf[2]; |
221 | int ret; | 222 | int ret; |
222 | 223 | ||
223 | ret = hdev->hid_get_raw_report(hdev, CP2112_GPIO_GET, buf, sizeof(buf), | 224 | ret = hid_hw_raw_request(hdev, CP2112_GPIO_GET, buf, sizeof(buf), |
224 | HID_FEATURE_REPORT); | 225 | HID_FEATURE_REPORT, HID_REQ_GET_REPORT); |
225 | if (ret != sizeof(buf)) { | 226 | if (ret != sizeof(buf)) { |
226 | hid_err(hdev, "error requesting GPIO values: %d\n", ret); | 227 | hid_err(hdev, "error requesting GPIO values: %d\n", ret); |
227 | return ret; | 228 | return ret; |
@@ -241,8 +242,9 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip, | |||
241 | 242 | ||
242 | cp2112_gpio_set(chip, offset, value); | 243 | cp2112_gpio_set(chip, offset, value); |
243 | 244 | ||
244 | ret = hdev->hid_get_raw_report(hdev, CP2112_GPIO_CONFIG, buf, | 245 | ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, |
245 | sizeof(buf), HID_FEATURE_REPORT); | 246 | sizeof(buf), HID_FEATURE_REPORT, |
247 | HID_REQ_GET_REPORT); | ||
246 | if (ret != sizeof(buf)) { | 248 | if (ret != sizeof(buf)) { |
247 | hid_err(hdev, "error requesting GPIO config: %d\n", ret); | 249 | hid_err(hdev, "error requesting GPIO config: %d\n", ret); |
248 | return ret; | 250 | return ret; |
@@ -271,8 +273,8 @@ static int cp2112_hid_get(struct hid_device *hdev, unsigned char report_number, | |||
271 | if (!buf) | 273 | if (!buf) |
272 | return -ENOMEM; | 274 | return -ENOMEM; |
273 | 275 | ||
274 | ret = hdev->hid_get_raw_report(hdev, report_number, buf, count, | 276 | ret = hid_hw_raw_request(hdev, report_number, buf, count, |
275 | report_type); | 277 | report_type, HID_REQ_GET_REPORT); |
276 | memcpy(data, buf, count); | 278 | memcpy(data, buf, count); |
277 | kfree(buf); | 279 | kfree(buf); |
278 | return ret; | 280 | return ret; |